commit

src/CleanAspire.ClientApp/Components/WebpushrSetup.razor

@@ -3,21 +3,9 @@
     {
         if (firstRender)
         {
-            var result = await ApiClientService.ExecuteAsync(() => ApiClient.Webpushr.Config.GetAsync());
-            result.Switch(
-                async ok =>
-                {
-                    var webpushr = new Webpushr(JS);
-                    await webpushr.SetupWebpushrAsync(ok.PublicKey!);
-                },
-                invalid =>
-                {
-                    Snackbar.Add(L["Invalid configuration received. Please check the Webpushr settings."], Severity.Error);
-                },
-                error =>
-                {
-                    Snackbar.Add(L["An error occurred while fetching the Webpushr configuration. Please try again later."], Severity.Error);
-                });
+            var publicKey = await WebpushrService.GetPublicKeyAsync();
+            var webpushr = new Webpushr(JS);
+            await webpushr.SetupWebpushrAsync(publicKey!);
         }
     }
 }

src/CleanAspire.ClientApp/Services/JsInterop/Webpushr.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CleanAspire.Api.Client;
 using Microsoft.JSInterop;
 
 namespace CleanAspire.ClientApp.Services.JsInterop;

src/CleanAspire.ClientApp/Services/WebpushrService.cs

@@ -4,20 +4,47 @@
 
 using System.Net.Http.Headers;
 using System.Text;
+using CleanAspire.Api.Client;
+using CleanAspire.Api.Client.Models;
+using CleanAspire.ClientApp.Services.Interfaces;
 
 namespace CleanAspire.ClientApp.Services;
 
 public class WebpushrService
 {
     private readonly IHttpClientFactory _httpClientFactory;
+    private readonly ApiClient _apiClient;
+    private readonly IStorageService _storageService;
     private readonly ILogger<WebpushrService> _logger;
-
-    public WebpushrService(IHttpClientFactory httpClientFactory, ILogger<WebpushrService> logger)
+    private const string WEBPUSHRPUBLICKEY = "_webpushrPublicKey";
+    public WebpushrService(IHttpClientFactory httpClientFactory, ApiClient apiClient, IStorageService storageService, ILogger<WebpushrService> logger)
     {
         _httpClientFactory = httpClientFactory;
+        _apiClient = apiClient;
+        _storageService = storageService;
         _logger = logger;
     }
-
+    public async Task<string> GetPublicKeyAsync()
+    {
+        try
+        {
+            var publicKey = await _storageService.GetItemAsync<string>(WEBPUSHRPUBLICKEY);
+            if (string.IsNullOrEmpty(publicKey))
+            {
+                var res = await _apiClient.Webpushr.Config.GetAsync();
+                if (res != null)
+                {
+                    await _storageService.SetItemAsync(WEBPUSHRPUBLICKEY, res.PublicKey);
+                    publicKey = res.PublicKey;
+                }
+            }
+            return publicKey??string.Empty;
+        }
+        catch (Exception ex)
+        {
+            return string.Empty;
+        }
+    }
     public async Task SendNotificationAsync(string title, string message, string targetUrl, string? sid = null)
     {
         var client = _httpClientFactory.CreateClient("Webpushr");