From 0bbb5045118d8e4e6e7b40f5c647ef4db413225d Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 12 Jul 2024 13:11:45 +0200
Subject: [PATCH] Update DbPersistTest.cs (#98)

---
 src/AliasVault.WebApp/Auth/Pages/Base/LoginBase.cs     | 1 -
 src/AliasVault.WebApp/Main/Pages/Sync/Sync.razor       | 1 -
 src/Tests/AliasVault.E2ETests/Common/PlaywrightTest.cs | 6 ++++++
 src/Tests/AliasVault.E2ETests/Tests/DbPersistTest.cs   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/AliasVault.WebApp/Auth/Pages/Base/LoginBase.cs b/src/AliasVault.WebApp/Auth/Pages/Base/LoginBase.cs
index ef4d78400..b5a9074c5 100644
--- a/src/AliasVault.WebApp/Auth/Pages/Base/LoginBase.cs
+++ b/src/AliasVault.WebApp/Auth/Pages/Base/LoginBase.cs
@@ -168,7 +168,6 @@ public class LoginBase : OwningComponentBase
         var localStorageReturnUrl = await LocalStorage.GetItemAsync<string>("returnUrl");
         if (!string.IsNullOrEmpty(localStorageReturnUrl))
         {
-            await LocalStorage.RemoveItemAsync("returnUrl");
             NavigationManager.NavigateTo(localStorageReturnUrl);
         }
         else
diff --git a/src/AliasVault.WebApp/Main/Pages/Sync/Sync.razor b/src/AliasVault.WebApp/Main/Pages/Sync/Sync.razor
index fecd42091..d07bbee36 100644
--- a/src/AliasVault.WebApp/Main/Pages/Sync/Sync.razor
+++ b/src/AliasVault.WebApp/Main/Pages/Sync/Sync.razor
@@ -48,7 +48,6 @@
         // Check that encryption key is set. If not, redirect to unlock screen.
         if (!AuthService.IsEncryptionKeySet())
         {
-            await LocalStorage.SetItemAsync(ReturnUrlKey, NavigationManager.Uri);
             NavigationManager.NavigateTo("/unlock");
         }
 
diff --git a/src/Tests/AliasVault.E2ETests/Common/PlaywrightTest.cs b/src/Tests/AliasVault.E2ETests/Common/PlaywrightTest.cs
index c68716b46..95e138e33 100644
--- a/src/Tests/AliasVault.E2ETests/Common/PlaywrightTest.cs
+++ b/src/Tests/AliasVault.E2ETests/Common/PlaywrightTest.cs
@@ -186,6 +186,9 @@ public class PlaywrightTest
     /// <returns>Async task.</returns>
     protected async Task RefreshPageAndUnlockVault()
     {
+        // Get current URL.
+        var currentUrl = Page.Url;
+
         // Hard refresh the page.
         await Page.ReloadAsync();
 
@@ -200,6 +203,9 @@ public class PlaywrightTest
 
         var submitButton = Page.GetByRole(AriaRole.Button, new() { Name = "Unlock" });
         await submitButton.ClickAsync();
+
+        // Wait for the original page to load again.
+        await WaitForURLAsync(currentUrl);
     }
 
     /// <summary>
diff --git a/src/Tests/AliasVault.E2ETests/Tests/DbPersistTest.cs b/src/Tests/AliasVault.E2ETests/Tests/DbPersistTest.cs
index 956857bd8..842fe6294 100644
--- a/src/Tests/AliasVault.E2ETests/Tests/DbPersistTest.cs
+++ b/src/Tests/AliasVault.E2ETests/Tests/DbPersistTest.cs
@@ -37,7 +37,7 @@ public class DbPersistTest : PlaywrightTest
         await RefreshPageAndUnlockVault();
 
         // Wait for the credentials page to load again.
-        await WaitForURLAsync("**/credentials*");
+        await WaitForURLAsync("**/credentials/**", serviceNameBefore);
 
         // Check if the service name is still present in the content.
         pageContent = await Page.TextContentAsync("body");