Make it possible to include nonce in authorization code data

aliev · Mar 27, 2023 · c9187c9 · c9187c9
1 parent d897f85
commit c9187c9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/aioauth/response_type.py b/aioauth/response_type.py
@@ -125,14 +125,15 @@ async def create_authorization_response(
         self, request: TRequest, client: Client
     ) -> AuthorizationCodeResponse:
         authorization_code = await self.storage.create_authorization_code(
-            request,
-            client.client_id,
-            request.query.scope,
-            request.query.response_type,  # type: ignore
-            request.query.redirect_uri,
-            request.query.code_challenge_method,
-            request.query.code_challenge,
-            generate_token(42),
+            client_id=client.client_id,
+            code=generate_token(42),
+            code_challenge=request.query.code_challenge,
+            code_challenge_method=request.query.code_challenge_method,
+            nonce=request.query.nonce,
+            redirect_uri=request.query.redirect_uri,
+            request=request,
+            response_type=request.query.response_type,  # type: ignore
+            scope=request.query.scope,
         )
         return AuthorizationCodeResponse(
             code=authorization_code.code,

diff --git a/aioauth/storage.py b/aioauth/storage.py
@@ -76,6 +76,7 @@ async def create_authorization_code(
         code_challenge_method: Optional[CodeChallengeMethod],
         code_challenge: Optional[str],
         code: str,
+        nonce: Optional[str],
     ) -> TAuthorizationCode:
         """Generates an authorization token and stores it in the database.
 

diff --git a/tests/classes.py b/tests/classes.py
@@ -117,17 +117,19 @@ async def create_authorization_code(
         code_challenge_method: Optional[CodeChallengeMethod],
         code_challenge: Optional[str],
         code: str,
+        nonce: Optional[str],
     ):
         authorization_code = AuthorizationCode(
-            code=code,
+            auth_time=int(time.time()),
             client_id=client_id,
+            code=code,
+            code_challenge=code_challenge,
+            code_challenge_method=code_challenge_method,
+            expires_in=request.settings.AUTHORIZATION_CODE_EXPIRES_IN,
+            nonce=nonce,
             redirect_uri=redirect_uri,
             response_type=response_type,
             scope=scope,
-            auth_time=int(time.time()),
-            code_challenge_method=code_challenge_method,
-            code_challenge=code_challenge,
-            expires_in=request.settings.AUTHORIZATION_CODE_EXPIRES_IN,
         )
         self.storage["authorization_codes"].append(authorization_code)
 

diff --git a/tests/test_db.py b/tests/test_db.py
@@ -24,14 +24,15 @@ async def test_storage_class(storage):
 
     with pytest.raises(NotImplementedError):
         await db.create_authorization_code(
-            request=request,
             client_id=client.client_id,
-            scope="",
-            response_type="",
-            redirect_uri="",
-            code_challenge_method=None,
-            code_challenge=None,
             code="123",
+            code_challenge=None,
+            code_challenge_method=None,
+            nonce="nonce",
+            redirect_uri="",
+            request=request,
+            response_type="",
+            scope="",
         )
 
     with pytest.raises(NotImplementedError):