Refactor session store (WIP)

3 files changed, 9 insertions, 9 deletions

diff --git a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor

index 64dbfcf..e5ffd5b 100644
--- a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor
+++ b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor
@@ -23,11 +23,11 @@
     List<AuthenticatedHomeserverGeneric> hss { get; set; } = new();
 
     protected override async Task OnInitializedAsync() {
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is null) return;
-        var sessions = await RmuStorage.GetAllTokens();
-        foreach (var userAuth in sessions) {
-            var session = await RmuStorage.GetSession(userAuth);
+        var sessions = await sessionStore.GetAllSessions();
+        foreach (var userAuth in sessions.Keys) {
+            var session = await sessionStore.GetHomeserver(userAuth);
             if (session is not null) {
                 hss.Add(session);
                 StateHasChanged();
diff --git a/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor b/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor

index e352c91..c373a37 100644
--- a/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor
+++ b/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor
@@ -25,11 +25,11 @@
     string roomId { get; set; }
 
     protected override async Task OnInitializedAsync() {
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is null) return;
-        var sessions = await RmuStorage.GetAllTokens();
-        foreach (var userAuth in sessions) {
-            var session = await RmuStorage.GetSession(userAuth);
+        var sessions = await sessionStore.GetAllSessions();
+        foreach (var userAuth in sessions.Keys) {
+            var session = await sessionStore.GetHomeserver(userAuth);
             if (session is not null) {
                 hss.Add(session);
                 StateHasChanged();
diff --git a/MatrixUtils.Web/Pages/Tools/User/ViewAccountData.razor b/MatrixUtils.Web/Pages/Tools/User/ViewAccountData.razor

index b73b5ac..a393d2e 100644
--- a/MatrixUtils.Web/Pages/Tools/User/ViewAccountData.razor
+++ b/MatrixUtils.Web/Pages/Tools/User/ViewAccountData.razor
@@ -16,7 +16,7 @@
     Dictionary<string, EventList?> perRoomAccountData = new();
 
     protected override async Task OnInitializedAsync() {
-        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
+        var hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (hs is null) return;
         perRoomAccountData = await hs.EnumerateAccountDataPerRoom();
         globalAccountData = await hs.EnumerateAccountData();