Fix race condition with supabase auth and init client via Blazor's auth state provider.

acupofjose · acupofjose · commit ec535206509d · 2022-11-22T18:55:56.000-06:00
diff --git a/Examples/BlazorWebAssemblySupabaseTemplate/Program.cs b/Examples/BlazorWebAssemblySupabaseTemplate/Program.cs
@@ -28,30 +28,34 @@
 
 
 // ---------- BLAZOR AUTH
-builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>();
+builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>(
+	provider => new CustomAuthStateProvider(
+		provider.GetRequiredService<ILocalStorageService>(),
+		provider.GetRequiredService<Supabase.Client>()
+	)
+)
+	;
 builder.Services.AddAuthorizationCore();
 
-
-
 // ---------- SUPABASE
 var url = "https://pylnesfgmytjegzzculn.supabase.co";
 var key = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InB5bG5lc2ZnbXl0amVnenpjdWxuIiwicm9sZSI6ImFub24iLCJpYXQiOjE2NjgyOTMwMzcsImV4cCI6MTk4Mzg2OTAzN30.kI29Q_qYWDH5SD6oi5NTwHG6Pxy1e1AUfR8s_ga45lE";
 
-builder.Services.AddScoped<ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject>>(
-    provider => new Supabase.Client(
-        url,
-        key,
-        new Supabase.SupabaseOptions
-        {
-            AutoRefreshToken = true,
-            AutoConnectRealtime = true,
-            PersistSession = true,
-            SessionHandler = new CustomSupabaseSessionHandler(
-                provider.GetRequiredService<ILocalStorageService>(),
-                provider.GetRequiredService<ILogger<CustomSupabaseSessionHandler>>()
-            )
-        }
-    )
+builder.Services.AddScoped<Supabase.Client>(
+	provider => new Supabase.Client(
+		url,
+		key,
+		new Supabase.SupabaseOptions
+		{
+			AutoRefreshToken = true,
+			AutoConnectRealtime = true,
+			PersistSession = true,
+			SessionHandler = new CustomSupabaseSessionHandler(
+				provider.GetRequiredService<ILocalStorageService>(),
+				provider.GetRequiredService<ILogger<CustomSupabaseSessionHandler>>()
+			)
+		}
+	)
 );
 
 // builder.Services.AddScoped<ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject>>(args => new Supabase.Client(url, key, new Supabase.SupabaseOptions { AutoConnectRealtime = true }));
diff --git a/Examples/BlazorWebAssemblySupabaseTemplate/Providers/CustomAuthStateProvider.cs b/Examples/BlazorWebAssemblySupabaseTemplate/Providers/CustomAuthStateProvider.cs
@@ -11,32 +11,35 @@ namespace BlazorWebAssemblySupabaseTemplate.Providers;
 public class CustomAuthStateProvider : AuthenticationStateProvider
 {
     private readonly ILocalStorageService _localStorage;
+    private readonly Supabase.Client _client;
     // private readonly IHttpClientFactory httpClientFactory;
 
     // private readonly HttpClient _http;
 
     public CustomAuthStateProvider(
-        ILocalStorageService localStorage
+        ILocalStorageService localStorage,
+        Supabase.Client client
         // IHttpClientFactory httpClientFactory
         // HttpClient http
     )
     {
         _localStorage = localStorage;
+        _client = client;  
         // this.httpClientFactory = httpClientFactory;
         // _http = http;
     }
 
     public override async Task<AuthenticationState> GetAuthenticationStateAsync()
     {
-        string token = await _localStorage.GetItemAsStringAsync("token");
-        // string token = "eyJhbGciOiJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNobWFjLXNoYTUxMiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiVG9ueSBTdGFyayIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvcm9sZSI6Iklyb24gTWFuIiwiZXhwIjozMTY4NTQwMDAwfQ.IbVQa1lNYYOzwso69xYfsMOHnQfO3VLvVqV2SOXS7sTtyyZ8DEf5jmmwz2FGLJJvZnQKZuieHnmHkg7CGkDbvA";
-        
+        // Sets client auth and connects to realtime (if enabled)
+        await _client.InitializeAsync();
+
         var identity = new ClaimsIdentity();
         // _http.DefaultRequestHeaders.Authorization = null;
 
-        if (!string.IsNullOrEmpty(token))
+        if (!string.IsNullOrEmpty(_client.Auth.CurrentSession?.AccessToken))
         {
-            identity = new ClaimsIdentity(ParseClaimsFromJwt(token), "jwt");
+            identity = new ClaimsIdentity(ParseClaimsFromJwt(_client.Auth.CurrentSession.AccessToken), "jwt");
             // _http.DefaultRequestHeaders.Authorization =
             //     new AuthenticationHeaderValue("Bearer", token.Replace("\"", ""));
         }
diff --git a/Examples/BlazorWebAssemblySupabaseTemplate/Providers/CustomSupabaseSessionHandler.cs b/Examples/BlazorWebAssemblySupabaseTemplate/Providers/CustomSupabaseSessionHandler.cs
@@ -8,6 +8,7 @@ public class CustomSupabaseSessionHandler : ISupabaseSessionHandler
 {
     private readonly ILocalStorageService localStorage;
     private readonly ILogger<CustomSupabaseSessionHandler> logger;
+    private static string SESSION_KEY = "SUPABASE_SESSION";
 
     public CustomSupabaseSessionHandler(
         ILocalStorageService localStorage,
@@ -22,20 +23,20 @@ ILogger<CustomSupabaseSessionHandler> logger
     public async Task<bool> SessionDestroyer()
     {
         logger.LogInformation("------------------- SessionDestroyer -------------------");
-        await localStorage.RemoveItemAsync("SUPABASE_SESSION"); 
+        await localStorage.RemoveItemAsync(SESSION_KEY); 
         return true;
     }
 
     public async Task<bool> SessionPersistor<TSession>(TSession session) where TSession : Session
     {
         logger.LogInformation("------------------- SessionPersistor -------------------");
-        await localStorage.SetItemAsync("SUPABASE_SESSION", session);
+        await localStorage.SetItemAsync(SESSION_KEY, session);
         return true;
     }
 
     public async Task<TSession?> SessionRetriever<TSession>() where TSession : Session
     {
         logger.LogInformation("------------------- SessionRetriever -------------------");
-        return (TSession?) await localStorage.GetItemAsync<Session>("SUPABASE_SESSION");
+        return (TSession?) await localStorage.GetItemAsync<Session>(SESSION_KEY);
     }
 }
diff --git a/Examples/BlazorWebAssemblySupabaseTemplate/Services/AuthService.cs b/Examples/BlazorWebAssemblySupabaseTemplate/Services/AuthService.cs
@@ -10,13 +10,13 @@ namespace BlazorWebAssemblySupabaseTemplate.Services;
 
 public class AuthService
 {
-    private readonly ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject> client;
+    private readonly Supabase.Client client;
     private readonly AuthenticationStateProvider customAuthStateProvider;
     private readonly ILocalStorageService localStorage;
     private readonly ILogger<AuthService> logger;
 
     public AuthService(
-        ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject> client,
+		 Supabase.Client client,
         AuthenticationStateProvider CustomAuthStateProvider, 
         ILocalStorageService localStorage,
         ILogger<AuthService> logger
@@ -28,9 +28,6 @@ ILogger<AuthService> logger
         customAuthStateProvider = CustomAuthStateProvider;
         this.localStorage = localStorage;
         this.logger = logger;
-
-        client.InitializeAsync();
-        client.Auth.RetrieveSessionAsync();
     }
 
     public async Task Login(string email, string password)
@@ -42,17 +39,13 @@ public async Task Login(string email, string password)
         logger.LogInformation("------------------- User logged in -------------------");
         // logger.LogInformation($"instance.Auth.CurrentUser.Id {client?.Auth?.CurrentUser?.Id}");
         logger.LogInformation($"client.Auth.CurrentUser.Email {client?.Auth?.CurrentUser?.Email}");
-        
-        logger.LogInformation($"session?.User?.Id {session?.User?.Id}");
-        await localStorage.SetItemAsStringAsync("user_id", session?.User?.Id);
 
-        await localStorage.SetItemAsStringAsync("token", session?.AccessToken);
         await customAuthStateProvider.GetAuthenticationStateAsync();
     }
     
     public async Task Logout()
     {
-        await localStorage.RemoveItemAsync("token");
+        await client.Auth.SignOut();
         await customAuthStateProvider.GetAuthenticationStateAsync();
     }
 
diff --git a/Examples/BlazorWebAssemblySupabaseTemplate/Services/DatabaseService.cs b/Examples/BlazorWebAssemblySupabaseTemplate/Services/DatabaseService.cs
@@ -11,45 +11,42 @@ namespace BlazorWebAssemblySupabaseTemplate.Services;
 
 public class DatabaseService
 {
-    private readonly ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject> client;
-    private readonly AuthenticationStateProvider customAuthStateProvider;
-    private readonly ILocalStorageService localStorage;
-    private readonly ILogger<DatabaseService> logger;
-
-    public DatabaseService(
-        ISupabaseClient<User, Session, Socket, Channel, Bucket, FileObject> client,
-        AuthenticationStateProvider CustomAuthStateProvider, 
-        ILocalStorageService localStorage,
-        ILogger<DatabaseService> logger
-    ) : base()
-    {
-        logger.LogInformation("------------------- CONSTRUCTOR -------------------");
-
-        this.client = client;
-        customAuthStateProvider = CustomAuthStateProvider;
-        this.localStorage = localStorage;
-        this.logger = logger;
-
-        client.InitializeAsync();
-        client.Auth.RetrieveSessionAsync();
-    }
-
-    public async Task<IReadOnlyList<TModel>> From<TModel>() where TModel : BaseModel, new()
-    {
-        Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Get();
-        return modeledResponse.Models;
-    }
-    
-    public async Task<List<TModel>> Delete<TModel>(TModel item) where TModel : BaseModel, new()
-    {
-        Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Delete(item);
-        return modeledResponse.Models;
-    }
-    
-    public async Task<List<TModel>> Insert<TModel>(TModel item) where TModel : BaseModel, new()
-    {
-        Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Insert(item);
-        return modeledResponse.Models;
-    }
+	private readonly Supabase.Client client;
+	private readonly AuthenticationStateProvider customAuthStateProvider;
+	private readonly ILocalStorageService localStorage;
+	private readonly ILogger<DatabaseService> logger;
+
+	public DatabaseService(
+		 Supabase.Client client,
+		AuthenticationStateProvider CustomAuthStateProvider,
+		ILocalStorageService localStorage,
+		ILogger<DatabaseService> logger
+	) : base()
+	{
+		logger.LogInformation("------------------- CONSTRUCTOR -------------------");
+
+		this.client = client;
+		customAuthStateProvider = CustomAuthStateProvider;
+		this.localStorage = localStorage;
+		this.logger = logger;
+	}
+
+	public async Task<IReadOnlyList<TModel>> From<TModel>() where TModel : BaseModel, new()
+	{
+		Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Get();
+		return modeledResponse.Models;
+	}
+
+	public async Task<List<TModel>> Delete<TModel>(TModel item) where TModel : BaseModel, new()
+	{
+		Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Delete(item);
+		return modeledResponse.Models;
+	}
+
+	public async Task<List<TModel>> Insert<TModel>(TModel item) where TModel : BaseModel, new()
+	{
+		Postgrest.Responses.ModeledResponse<TModel> modeledResponse = await client.From<TModel>().Insert(item);
+		return modeledResponse.Models;
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -11,32 +11,35 @@ namespace BlazorWebAssemblySupabaseTemplate.Providers;`
`11`	`11`	`public class CustomAuthStateProvider : AuthenticationStateProvider`
`12`	`12`	`{`
`13`	`13`	`private readonly ILocalStorageService _localStorage;`
	`14`	`+ private readonly Supabase.Client _client;`
`14`	`15`	`// private readonly IHttpClientFactory httpClientFactory;`
`15`	`16`
`16`	`17`	`// private readonly HttpClient _http;`
`17`	`18`
`18`	`19`	`public CustomAuthStateProvider(`
`19`		`- ILocalStorageService localStorage`
	`20`	`+ ILocalStorageService localStorage,`
	`21`	`+ Supabase.Client client`
`20`	`22`	`// IHttpClientFactory httpClientFactory`
`21`	`23`	`// HttpClient http`
`22`	`24`	`)`
`23`	`25`	`{`
`24`	`26`	`_localStorage = localStorage;`
	`27`	`+ _client = client;`
`25`	`28`	`// this.httpClientFactory = httpClientFactory;`
`26`	`29`	`// _http = http;`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`public override async Task<AuthenticationState> GetAuthenticationStateAsync()`
`30`	`33`	`{`
`31`		`- string token = await _localStorage.GetItemAsStringAsync("token");`
`32`		`- // string token = "eyJhbGciOiJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNobWFjLXNoYTUxMiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiVG9ueSBTdGFyayIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvcm9sZSI6Iklyb24gTWFuIiwiZXhwIjozMTY4NTQwMDAwfQ.IbVQa1lNYYOzwso69xYfsMOHnQfO3VLvVqV2SOXS7sTtyyZ8DEf5jmmwz2FGLJJvZnQKZuieHnmHkg7CGkDbvA";`
`33`		`-`
	`34`	`+ // Sets client auth and connects to realtime (if enabled)`
	`35`	`+ await _client.InitializeAsync();`
	`36`	`+`
`34`	`37`	`var identity = new ClaimsIdentity();`
`35`	`38`	`// _http.DefaultRequestHeaders.Authorization = null;`
`36`	`39`
`37`		`- if (!string.IsNullOrEmpty(token))`
	`40`	`+ if (!string.IsNullOrEmpty(_client.Auth.CurrentSession?.AccessToken))`
`38`	`41`	`{`
`39`		`- identity = new ClaimsIdentity(ParseClaimsFromJwt(token), "jwt");`
	`42`	`+ identity = new ClaimsIdentity(ParseClaimsFromJwt(_client.Auth.CurrentSession.AccessToken), "jwt");`
`40`	`43`	`// _http.DefaultRequestHeaders.Authorization =`
`41`	`44`	`// new AuthenticationHeaderValue("Bearer", token.Replace("\"", ""));`
`42`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public class CustomSupabaseSessionHandler : ISupabaseSessionHandler`
`8`	`8`	`{`
`9`	`9`	`private readonly ILocalStorageService localStorage;`
`10`	`10`	`private readonly ILogger<CustomSupabaseSessionHandler> logger;`
	`11`	`+ private static string SESSION_KEY = "SUPABASE_SESSION";`
`11`	`12`
`12`	`13`	`public CustomSupabaseSessionHandler(`
`13`	`14`	`ILocalStorageService localStorage,`
`@@ -22,20 +23,20 @@ ILogger<CustomSupabaseSessionHandler> logger`
`22`	`23`	`public async Task<bool> SessionDestroyer()`
`23`	`24`	`{`
`24`	`25`	`logger.LogInformation("------------------- SessionDestroyer -------------------");`
`25`		`- await localStorage.RemoveItemAsync("SUPABASE_SESSION");`
	`26`	`+ await localStorage.RemoveItemAsync(SESSION_KEY);`
`26`	`27`	`return true;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public async Task<bool> SessionPersistor<TSession>(TSession session) where TSession : Session`
`30`	`31`	`{`
`31`	`32`	`logger.LogInformation("------------------- SessionPersistor -------------------");`
`32`		`- await localStorage.SetItemAsync("SUPABASE_SESSION", session);`
	`33`	`+ await localStorage.SetItemAsync(SESSION_KEY, session);`
`33`	`34`	`return true;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`public async Task<TSession?> SessionRetriever<TSession>() where TSession : Session`
`37`	`38`	`{`
`38`	`39`	`logger.LogInformation("------------------- SessionRetriever -------------------");`
`39`		`- return (TSession?) await localStorage.GetItemAsync<Session>("SUPABASE_SESSION");`
	`40`	`+ return (TSession?) await localStorage.GetItemAsync<Session>(SESSION_KEY);`
`40`	`41`	`}`
`41`	`42`	`}`