frontend: change local storage name of longin-secret to loginSecret s…

…ince loginKey was pretty confusing.
Tinkerforge · Nov 5, 2024 · 628788e · 628788e
1 parent 9dde545
commit 628788e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
@@ -12,7 +12,7 @@ export async function logout(logout_all: boolean) {
             credentials: "include",
         });
 
-        localStorage.removeItem("loginKey");
+        localStorage.removeItem("loginSalt");
         localStorage.removeItem("secretKey");
 
         window.location.reload();

diff --git a/frontend/src/components/login.tsx b/frontend/src/components/login.tsx
@@ -50,7 +50,7 @@ export class Login extends Component<{}, LoginState> {
         }
 
         const loginSaltBs64 = Base64.fromUint8Array(login_salt);
-        window.localStorage.setItem("loginKey", loginSaltBs64);
+        window.localStorage.setItem("loginSalt", loginSaltBs64);
 
         const login_key = await generate_hash(this.state.password, login_salt);
 

diff --git a/frontend/src/pages/user.tsx b/frontend/src/pages/user.tsx
@@ -217,7 +217,7 @@ export function User() {
 
         const t = i18n.t;
 
-        const loginSaltBs64 = window.localStorage.getItem("loginKey");
+        const loginSaltBs64 = window.localStorage.getItem("loginSalt");
         const loginSalt = Base64.toUint8Array(loginSaltBs64);
         const loginKey = await generate_hash(deleteUser.password, loginSalt)
 

diff --git a/frontend/src/utils.tsx b/frontend/src/utils.tsx
@@ -97,13 +97,18 @@ export async function refresh_access_token() {
             credentials: "include"
         });
 
+        if (localStorage.getItem("loginKey")) {
+            localStorage.setItem("loginSalt", localStorage.getItem("loginKey"));
+            localStorage.removeItem("loginKey");
+        }
+
         if (resp.status == 200) {
-            if (!localStorage.getItem("loginKey") || !localStorage.getItem("secretKey")) {
+            if (!localStorage.getItem("loginSalt") || !localStorage.getItem("secretKey")) {
                 logout(false);
             }
             loggedIn.value = AppState.LoggedIn;
         } else {
-            localStorage.removeItem("loginKey");
+            localStorage.removeItem("loginSalt");
             localStorage.removeItem("secretKey");
             loggedIn.value = AppState.LoggedOut;
         }