diff --git a/flask_discord/_http.py b/flask_discord/_http.py index 918d4e3..5d066d9 100644 --- a/flask_discord/_http.py +++ b/flask_discord/_http.py @@ -32,7 +32,7 @@ class DiscordOAuth2HttpClient(abc.ABC): @staticmethod def _token_updater(token): - session["oauth2_token"] = token + session["discord_oauth2_token"] = token def _make_session(self, token: str = None, state: str = None, scope: list = None) -> OAuth2Session: """A low level method used for creating OAuth2 session. @@ -55,7 +55,7 @@ class DiscordOAuth2HttpClient(abc.ABC): """ return OAuth2Session( client_id=self.client_id, - token=token or session.get("oauth2_token"), + token=token or session.get("discord_oauth2_token"), state=state, scope=scope, redirect_uri=self.redirect_uri, @@ -86,7 +86,7 @@ class DiscordOAuth2HttpClient(abc.ABC): return self._make_session().get(configs.API_BASE_URL + route).json() def get_json(self): - discord_session = self._make_session(token=session.get("oauth2_token")) + discord_session = self._make_session(token=session.get("discord_oauth2_token")) user = discord_session.get(configs.API_BASE_URL + '/users/@me').json() guilds = discord_session.get(configs.API_BASE_URL + '/users/@me/guilds').json() connections = discord_session.get(configs.API_BASE_URL + '/users/@me/connections').json() diff --git a/flask_discord/client.py b/flask_discord/client.py index 3ae1d90..d03e6aa 100644 --- a/flask_discord/client.py +++ b/flask_discord/client.py @@ -39,7 +39,7 @@ class DiscordOAuth2Session(_http.DiscordOAuth2HttpClient): scope = scope or request.args.get("scope", str()).split() or configs.DEFAULT_SCOPES discord_session = self._make_session(scope=scope) authorization_url, state = discord_session.authorization_url(configs.AUTHORIZATION_BASE_URL) - session["oauth2_state"] = state + session["discord_oauth2_state"] = state return redirect(authorization_url) def callback(self): @@ -51,13 +51,13 @@ class DiscordOAuth2Session(_http.DiscordOAuth2HttpClient): """ if request.values.get("error"): return request.values["error"] - discord = self._make_session(state=session.get("oauth2_state")) + discord = self._make_session(state=session.get("discord_oauth2_state")) token = discord.fetch_token( configs.TOKEN_URL, client_secret=self.client_secret, authorization_response=request.url ) - session["oauth2_token"] = token + session["discord_oauth2_token"] = token def fetch_user(self): return models.User(self.get("/users/@me"))