fix: add correct token to new requests when a user is signed in

Author: Andrew Smith

supabase/_async/client.py

@@ -1,7 +1,7 @@
 import re
 from typing import Any, Dict, Union
 
-from gotrue._async.storage import AsyncMemoryStorage
+from gotrue import AsyncMemoryStorage
 from gotrue.types import AuthChangeEvent, Session
 from httpx import Timeout
 from postgrest import (
@@ -240,6 +240,11 @@ def _init_postgrest_client(
             rest_url, headers=headers, schema=schema, timeout=timeout
         )
 
+    def _create_auth_header(self, token: str):
+        return {
+            "Authorization": f"Bearer {token}",
+        }
+
     def _get_auth_headers(self) -> Dict[str, str]:
         """Helper method to get auth headers."""
         return {
@@ -254,16 +259,20 @@ async def _get_token_header(self):
         except Exception as err:
             access_token = self.supabase_key
 
-        return {
-            "Authorization": f"Bearer {access_token}",
-        }
+        return self._create_auth_header(access_token)
 
-    def _listen_to_auth_events(self, event: AuthChangeEvent, session: Session):
+    def _listen_to_auth_events(
+        self, event: AuthChangeEvent, session: Union[Session, None]
+    ):
+        access_token = self.supabase_key
         if event in ["SIGNED_IN", "TOKEN_REFRESHED", "SIGNED_OUT"]:
             # reset postgrest and storage instance on event change
             self._postgrest = None
             self._storage = None
             self._functions = None
+            access_token = session.access_token if session else self.supabase_key
+
+        self._auth_token = self._create_auth_header(access_token)
 
 
 async def create_client(

supabase/_sync/client.py

@@ -1,6 +1,7 @@
 import re
 from typing import Any, Dict, Union
 
+from gotrue import SyncMemoryStorage
 from gotrue.types import AuthChangeEvent, Session
 from httpx import Timeout
 from postgrest import SyncFilterRequestBuilder, SyncPostgrestClient, SyncRequestBuilder
@@ -27,7 +28,7 @@ def __init__(
         self,
         supabase_url: str,
         supabase_key: str,
-        options: ClientOptions = ClientOptions(),
+        options: ClientOptions = ClientOptions(storage=SyncMemoryStorage()),
     ):
         """Instantiate the client.
 
@@ -235,6 +236,11 @@ def _init_postgrest_client(
             rest_url, headers=headers, schema=schema, timeout=timeout
         )
 
+    def _create_auth_header(self, token: str):
+        return {
+            "Authorization": f"Bearer {token}",
+        }
+
     def _get_auth_headers(self) -> Dict[str, str]:
         """Helper method to get auth headers."""
         return {
@@ -249,22 +255,26 @@ def _get_token_header(self):
         except Exception as err:
             access_token = self.supabase_key
 
-        return {
-            "Authorization": f"Bearer {access_token}",
-        }
+        return self._create_auth_header(access_token)
 
-    def _listen_to_auth_events(self, event: AuthChangeEvent, session: Session):
+    def _listen_to_auth_events(
+        self, event: AuthChangeEvent, session: Union[Session, None]
+    ):
+        access_token = self.supabase_key
         if event in ["SIGNED_IN", "TOKEN_REFRESHED", "SIGNED_OUT"]:
             # reset postgrest and storage instance on event change
             self._postgrest = None
             self._storage = None
             self._functions = None
+            access_token = session.access_token if session else self.supabase_key
+
+        self._auth_token = self._create_auth_header(access_token)
 
 
 def create_client(
     supabase_url: str,
     supabase_key: str,
-    options: ClientOptions = ClientOptions(),
+    options: ClientOptions = ClientOptions(storage=SyncMemoryStorage()),
 ) -> SyncClient:
     """Create client function to instantiate supabase client like JS runtime.