feat: exchange code for session now fully async (#378)

supabase · Nov 30, 2023 · c294568 · c294568
2 parents e6b3d46 + a249ba0
commit c294568
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/gotrue/_async/gotrue_client.py b/gotrue/_async/gotrue_client.py
@@ -46,6 +46,7 @@
     AuthMFAUnenrollResponse,
     AuthMFAVerifyResponse,
     AuthResponse,
+    CodeExchangeParams,
     DecodedJWTDict,
     MFAChallengeAndVerifyParams,
     MFAChallengeParams,
@@ -269,7 +270,7 @@ async def sign_in_with_oauth(
             params["redirect_to"] = redirect_to
         if scopes:
             params["scopes"] = scopes
-        url = self._get_url_for_provider(provider, params)
+        url = await self._get_url_for_provider(provider, params)
         return OAuthResponse(provider=provider, url=url)
 
     async def sign_in_with_otp(
@@ -844,15 +845,17 @@ def _is_implicit_grant_flow(self, url: str) -> bool:
         params = parse_qs(result.query)
         return "access_token" in params or "error_description" in params
 
-    def _get_url_for_provider(
+    async def _get_url_for_provider(
         self,
         provider: Provider,
         params: Dict[str, str],
     ) -> str:
         if self._flow_type == "pkce":
             code_verifier = generate_pkce_verifier()
             code_challenge = generate_pkce_challenge(code_verifier)
-            self._storage.set_item(f"{self._storage_key}-code-verifier", code_verifier)
+            await self._storage.set_item(
+                f"{self._storage_key}-code-verifier", code_verifier
+            )
             code_challenge_method = (
                 "plain" if code_verifier == code_challenge else "s256"
             )
@@ -869,11 +872,11 @@ def _decode_jwt(self, jwt: str) -> DecodedJWTDict:
         """
         return decode_jwt_payload(jwt)
 
-    def exchange_code_for_session(self, params: CodeExchangeParams):
-        code_verifier = params.get("code_verifier") or self._storage.get_item(
+    async def exchange_code_for_session(self, params: CodeExchangeParams):
+        code_verifier = params.get("code_verifier") or await self._storage.get_item(
             f"{self._storage_key}-code-verifier"
         )
-        response = self._request(
+        response = await self._request(
             "POST",
             "token?grant_type=pkce",
             body={
@@ -883,8 +886,8 @@ def exchange_code_for_session(self, params: CodeExchangeParams):
             redirect_to=params.get("redirect_to"),
             xform=parse_auth_response,
         )
-        self._storage.remove_item(f"{self._storage_key}-code-verifier")
+        await self._storage.remove_item(f"{self._storage_key}-code-verifier")
         if response.session:
-            self._save_session(response.session)
+            await self._save_session(response.session)
             self._notify_all_subscribers("SIGNED_IN", response.session)
         return response
diff --git a/gotrue/_sync/gotrue_client.py b/gotrue/_sync/gotrue_client.py
@@ -46,6 +46,7 @@
     AuthMFAUnenrollResponse,
     AuthMFAVerifyResponse,
     AuthResponse,
+    CodeExchangeParams,
     DecodedJWTDict,
     MFAChallengeAndVerifyParams,
     MFAChallengeParams,