Fixes tox tests

Author: AngellusMortis

oidc_provider/lib/endpoints/token.py

@@ -11,10 +11,7 @@
     UserAuthError,
 )
 from oidc_provider.lib.utils.oauth2 import extract_client_auth
-from oidc_provider.lib.utils.token import (
-    create_id_token,
-    create_token,
-)
+from oidc_provider.lib.utils.token import create_token
 from oidc_provider.models import (
     Client,
     Code,
@@ -160,6 +157,7 @@ def create_access_token_response_dic(self):
         )
 
         id_token_dic = create_id_token_hook(
+            token=token,
             user=self.user,
             aud=self.client.client_id,
             nonce='self.code.nonce',
@@ -269,35 +267,6 @@ def create_refresh_response_dic(self):
 
         return dic
 
-    def create_access_token_response_dic(self):
-        # See https://tools.ietf.org/html/rfc6749#section-4.3
-
-        token = create_token(
-            self.user,
-            self.client,
-            self.params['scope'].split(' '))
-
-        id_token_dic = create_id_token(
-            token=token,
-            user=self.user,
-            aud=self.client.client_id,
-            nonce='self.code.nonce',
-            at_hash=token.at_hash,
-            request=self.request,
-            scope=token.scope,
-        )
-
-        token.id_token = id_token_dic
-        token.save()
-
-        return {
-            'access_token': token.access_token,
-            'refresh_token': token.refresh_token,
-            'expires_in': settings.get('OIDC_TOKEN_EXPIRE'),
-            'token_type': 'bearer',
-            'id_token': encode_id_token(id_token_dic, token.client),
-        }
-
     def create_client_credentials_response_dic(self):
         # See https://tools.ietf.org/html/rfc6749#section-4.4.3
 

oidc_provider/lib/utils/oauth2.py

@@ -21,7 +21,7 @@ def extract_access_token(request):
     """
     auth_header = request.META.get('HTTP_AUTHORIZATION', '')
 
-    if re.compile('^[Bb]earer\s{1}.+$').match(auth_header):
+    if re.compile(r'^[Bb]earer\s{1}.+$').match(auth_header):
         access_token = auth_header.split()[1]
     else:
         access_token = request.GET.get('access_token', '')
@@ -39,7 +39,7 @@ def extract_client_auth(request):
     """
     auth_header = request.META.get('HTTP_AUTHORIZATION', '')
 
-    if re.compile('^Basic\s{1}.+$').match(auth_header):
+    if re.compile(r'^Basic\s{1}.+$').match(auth_header):
         b64_user_pass = auth_header.split()[1]
         try:
             user_pass = b64decode(b64_user_pass).decode('utf-8').split(':')

oidc_provider/settings.py

@@ -154,6 +154,7 @@ def OIDC_IDTOKEN_ENCODE_HOOK(self):
         """
         return 'oidc_provider.lib.utils.token.encode_id_token'
 
+    @property
     def OIDC_INTROSPECTION_PROCESSING_HOOK(self):
         """
         OPTIONAL. A string with the location of your function.