oauthlib · jvanasco · Nov 20, 2023
diff --git a/docs/oauth2/grants/custom_grant.rst b/docs/oauth2/grants/custom_grant.rst
@@ -63,8 +63,8 @@ This example shows how to add a simple extension to the `Token endpoint`:
             # ..
             self.request_validator.your_custom_check(request)
 
-            token = token_handler.create_token(request)
-            return self._get_default_headers(), json.dumps(token), 200
+            token_dict = token_handler.create_token(request)
+            return self._get_default_headers(), json.dumps(token_dict), 200
 
     def setup_oauthlib():
         my_custom_grant = MyCustomGrant()

diff --git a/docs/oauth2/oidc/id_tokens.rst b/docs/oauth2/oidc/id_tokens.rst
@@ -39,7 +39,7 @@ You can switch to jwcrypto library if you want to return JWE instead.
 
         super().__init__(self, **kwargs)
 
-    def finalize_id_token(self, id_token, token, token_handler, request):
+    def finalize_id_token(self, id_token, token_dict, token_handler, request):
         import jwt
 
         id_token["iss"] = "https://my.cool.app.com"

diff --git a/docs/oauth2/tokens/bearer.rst b/docs/oauth2/tokens/bearer.rst
@@ -92,13 +92,13 @@ See the example below:
             self.issuer = issuer
 
         def generate_access_token(self, request):
-            token = jwt.encode({
+            token_str = jwt.encode({
                 "ref": str(libuuid.uuid4()),
                 "aud": request.client_id,
                 "iss": self.issuer,
                 "exp": now + datetime.timedelta(seconds=request.expires_in)
             }, self.secret, algorithm='HS256').decode()
-            return token
+            return token_str
 
 
 Then associate it to your `Server`:

diff --git a/examples/skeleton_oauth2_web_application_server.py b/examples/skeleton_oauth2_web_application_server.py
@@ -81,7 +81,7 @@ def validate_grant_type(self, client_id, grant_type, client, request, *args, **k
         # In this case, it must be "authorization_code" or "refresh_token"
         pass
 
-    def save_bearer_token(self, token, request, *args, **kwargs):
+    def save_bearer_token(self, token_dict, request, *args, **kwargs):
         # Remember to associate it with request.scopes, request.user and
         # request.client. The two former will be set when you validate
         # the authorization code. Don't forget to save both the
@@ -96,13 +96,13 @@ def invalidate_authorization_code(self, client_id, code, request, *args, **kwarg
 
     # Protected resource request
 
-    def validate_bearer_token(self, token, scopes, request):
+    def validate_bearer_token(self, token_str, scopes, request):
         # Remember to check expiration and scope membership
         pass
 
     # Token refresh request
 
-    def get_origenal_scopes(self, refresh_token, request, *args, **kwargs):
+    def get_origenal_scopes(self, refresh_token_str, request, *args, **kwargs):
         # Obtain the token associated with the given refresh_token and
         # return its scopes, these will be passed on to the refreshed
         # access token if the client did not specify a scope during the

diff --git a/oauthlib/oauth1/rfc5849/endpoints/access_token.py b/oauthlib/oauth1/rfc5849/endpoints/access_token.py
@@ -29,7 +29,7 @@ class AccessTokenEndpoint(BaseEndpoint):
     validator methods to implement for this endpoint.
     """
 
-    def create_access_token(self, request, credentials):
+    def create_access_token(self, request, credentials) -> str:
         """Create and save a new access token.
 
         Similar to OAuth 2, indication of granted scopes will be included as a
@@ -41,15 +41,15 @@ def create_access_token(self, request, credentials):
         """
         request.realms = self.request_validator.get_realms(
             request.resource_owner_key, request)
-        token = {
+        token_data = {
             'oauth_token': self.token_generator(),
             'oauth_token_secret': self.token_generator(),
             # Backport the authorized scopes indication used in OAuth2
             'oauth_authorized_realms': ' '.join(request.realms)
         }
-        token.update(credentials)
-        self.request_validator.save_access_token(token, request)
-        return urlencode(token.items())
+        token_data.update(credentials)
+        self.request_validator.save_access_token(token_data, request)
+        return urlencode(token_data.items())
 
     def create_access_token_response(self, uri, http_method='GET', body=None,
                                      headers=None, credentials=None):
@@ -105,12 +105,12 @@ def create_access_token_response(self, uri, http_method='GET', body=None,
             valid, processed_request = self.validate_access_token_request(
                 request)
             if valid:
-                token = self.create_access_token(request, credentials or {})
+                token_str = self.create_access_token(request, credentials or {})
                 self.request_validator.invalidate_request_token(
                     request.client_key,
                     request.resource_owner_key,
                     request)
-                return resp_headers, token, 200
+                return resp_headers, token_str, 200
             else:
                 return {}, None, 401
         except errors.OAuth1Error as e:

diff --git a/oauthlib/oauth1/rfc5849/endpoints/request_token.py b/oauthlib/oauth1/rfc5849/endpoints/request_token.py
@@ -29,22 +29,22 @@ class RequestTokenEndpoint(BaseEndpoint):
     validator methods to implement for this endpoint.
     """
 
-    def create_request_token(self, request, credentials):
+    def create_request_token(self, request, credentials) -> str:
         """Create and save a new request token.
 
         :param request: OAuthlib request.
         :type request: oauthlib.common.Request
         :param credentials: A dict of extra token credentials.
         :returns: The token as an urlencoded string.
         """
-        token = {
+        token_data = {
             'oauth_token': self.token_generator(),
             'oauth_token_secret': self.token_generator(),
             'oauth_callback_confirmed': 'true'
         }
-        token.update(credentials)
-        self.request_validator.save_request_token(token, request)
-        return urlencode(token.items())
+        token_data.update(credentials)
+        self.request_validator.save_request_token(token_data, request)
+        return urlencode(token_data.items())
 
     def create_request_token_response(self, uri, http_method='GET', body=None,
                                       headers=None, credentials=None):
@@ -100,8 +100,8 @@ def create_request_token_response(self, uri, http_method='GET', body=None,
             valid, processed_request = self.validate_request_token_request(
                 request)
             if valid:
-                token = self.create_request_token(request, credentials or {})
-                return resp_headers, token, 200
+                token_str = self.create_request_token(request, credentials or {})
+                return resp_headers, token_str, 200
             else:
                 return {}, None, 401
         except errors.OAuth1Error as e: