Refactor session store (WIP)

3 files changed, 5 insertions, 5 deletions

diff --git a/MatrixUtils.Web/Pages/Labs/Client/Index.razor b/MatrixUtils.Web/Pages/Labs/Client/Index.razor

index 4656fcb..c6e7d1a 100644
--- a/MatrixUtils.Web/Pages/Labs/Client/Index.razor
+++ b/MatrixUtils.Web/Pages/Labs/Client/Index.razor
@@ -40,11 +40,11 @@
     }
 
     protected override async Task OnInitializedAsync() {
-        var tokens = await RmuStorage.GetAllTokens();
-        var tasks = tokens.Select(async token => {
+        var tokens = await sessionStore.GetAllSessions();
+        var tasks = tokens.Keys.Select(async token => {
             try {
                 var cc = new ClientContext() {
-                    Homeserver = await RmuStorage.GetSession(token)
+                    Homeserver = await sessionStore.GetHomeserver(token)
                 };
                 cc.SyncWrapper = new ClientSyncWrapper(cc.Homeserver);
 
diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpace.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpace.razor

index a382729..f81afe5 100644
--- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpace.razor
+++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpace.razor
@@ -52,7 +52,7 @@
             NavigationManager.NavigateTo(NavigationManager.Uri.Replace("stage=", ""), true); //"/User/DMSpace/Setup"
         }
         DMSpaceRootPage = this;
-        SetupData.Homeserver ??= await RmuStorage.GetCurrentSessionOrNavigate();
+        SetupData.Homeserver ??= await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (SetupData.Homeserver is null) return;
         try {
             SetupData.DmSpaceConfiguration = await SetupData.Homeserver.GetAccountDataAsync<DMSpaceConfiguration>("gay.rory.dm_space");
diff --git a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2.razor b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2.razor

index f9da6eb..441752b 100644
--- a/MatrixUtils.Web/Pages/Labs/Rooms2/Index2.razor
+++ b/MatrixUtils.Web/Pages/Labs/Rooms2/Index2.razor
@@ -55,7 +55,7 @@
     public RoomListViewData Data { get; set; } = new RoomListViewData();
 
     protected override async Task OnInitializedAsync() {
-        Data.Homeserver = await RmuStorage.GetCurrentSessionOrNavigate();
+        Data.Homeserver = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true);
         if (Data.Homeserver is null) return;
         var rooms = await Data.Homeserver.GetJoinedRooms();
         Data.GlobalProfile = await Data.Homeserver.GetProfileAsync(Data.Homeserver.WhoAmI.UserId);