From 7d9c3eb1d7a8bb913e6b7bfe224817ac575f76df Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Mon, 14 Apr 2025 23:42:38 +0200
Subject: Refactor session store (WIP)

---
 MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor                    | 2 +-
 MatrixUtils.Web/Pages/HSAdmin/HSE/ManageExternalProfiles.razor | 6 +++---
 MatrixUtils.Web/Pages/HSAdmin/Synapse/BackgroundJobs.razor     | 2 +-
 MatrixUtils.Web/Pages/HSAdmin/Synapse/BlockMedia.razor         | 2 +-
 MatrixUtils.Web/Pages/HSAdmin/Synapse/RoomQuery.razor          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'MatrixUtils.Web/Pages/HSAdmin')

diff --git a/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor b/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor
index 6ccdce4..e1b46e2 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/HSAdmin.razor
@@ -30,7 +30,7 @@ else {
     public ServerVersionResponse? ServerVersionResponse { get; set; }
 
     protected override async Task OnInitializedAsync() {
-        Homeserver = await RmuStorage.GetCurrentSessionOrNavigate();
+        Homeserver = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (Homeserver is null) return;
         ServerVersionResponse = await (Homeserver.FederationClient?.GetServerVersionAsync() ?? Task.FromResult<ServerVersionResponse?>(null));
         await base.OnInitializedAsync();
diff --git a/MatrixUtils.Web/Pages/HSAdmin/HSE/ManageExternalProfiles.razor b/MatrixUtils.Web/Pages/HSAdmin/HSE/ManageExternalProfiles.razor
index 6d492a7..87600c6 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/HSE/ManageExternalProfiles.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/HSE/ManageExternalProfiles.razor
@@ -17,7 +17,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        Homeserver = await RmuStorage.GetCurrentSessionOrNavigate();
+        Homeserver = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (Homeserver is null) return;
         await LoadProfiles();
         await base.OnInitializedAsync();
@@ -33,9 +33,9 @@
 
     private async Task AddAllLocalProfiles() {
         if(Homeserver is AuthenticatedHomeserverHSE hse) {
-            var sessions = await RmuStorage.GetAllTokens();
+            var sessions = await sessionStore.GetAllSessions();
             foreach(var session in sessions) {
-                await hse.SetExternalProfile(session.UserId, session);
+                await hse.SetExternalProfile(session.Value.Auth.UserId, session.Value.Auth);
             }
             await LoadProfiles();
         }
diff --git a/MatrixUtils.Web/Pages/HSAdmin/Synapse/BackgroundJobs.razor b/MatrixUtils.Web/Pages/HSAdmin/Synapse/BackgroundJobs.razor
index 02bf88f..d855cba 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/Synapse/BackgroundJobs.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/Synapse/BackgroundJobs.razor
@@ -10,7 +10,7 @@
     private SynapseAdminBackgroundUpdateStatusResponse? BackgroundJobStatus { get; set; }
 
     protected override async Task OnInitializedAsync() {
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate() as AuthenticatedHomeserverSynapse;
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true) as AuthenticatedHomeserverSynapse;
         if (hs is null) return;
         Homeserver = hs;
 
diff --git a/MatrixUtils.Web/Pages/HSAdmin/Synapse/BlockMedia.razor b/MatrixUtils.Web/Pages/HSAdmin/Synapse/BlockMedia.razor
index 6de4e4d..d07ff08 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/Synapse/BlockMedia.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/Synapse/BlockMedia.razor
@@ -77,7 +77,7 @@
     private AuthenticatedHomeserverSynapse? Homeserver { get; set; }
 
     protected override async Task OnInitializedAsync() {
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate() as AuthenticatedHomeserverSynapse;
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true) as AuthenticatedHomeserverSynapse;
         if (hs is null) return;
         Homeserver = hs;
 
diff --git a/MatrixUtils.Web/Pages/HSAdmin/Synapse/RoomQuery.razor b/MatrixUtils.Web/Pages/HSAdmin/Synapse/RoomQuery.razor
index 0a93df8..79e7357 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/Synapse/RoomQuery.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/Synapse/RoomQuery.razor
@@ -293,7 +293,7 @@
 
     private async Task Search() {
         Results.Clear();
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is AuthenticatedHomeserverSynapse synapse) {
             Homeserver = synapse;
             var searchRooms = synapse.Admin.SearchRoomsAsync(orderBy: OrderBy!, dir: Ascending ? "f" : "b", searchTerm: SearchTerm, localFilter: Filter).GetAsyncEnumerator();
-- 
cgit 1.5.1