johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 08:44:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Add fallback for tokens stored under the previously used key

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-03-19 14:51:51 +01:00
parent ba83fcedfb
commit 9d9bc43b03
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/common/session.js
View File

@@ -55,6 +55,14 @@ export default class Session {
this.storage = storage;
}
// Temporary fallback for data stored under previously used keys.
if (this.storage.getItem("authToken") && this.storage.getItem("sessionId")) {
this.storage.setItem(this.storageKey + ".token", this.storage.getItem("authToken"));
this.storage.setItem(this.storageKey + ".id", this.storage.getItem("sessionId"));
this.storage.removeItem("authToken");
this.storage.removeItem("sessionId");
}
// Restore authentication from session storage.
if (
this.applyAuthToken(this.storage.getItem(this.storageKey + ".token")) &&
@@ -193,9 +201,14 @@ export default class Session {
this.storage.removeItem(this.storageKey + ".token");
this.storage.removeItem(this.storageKey + ".provider");
// The "session_id" storage key is deprecated in favor of "session.token",
// but should continue to be removed when logging out:
this.storage.removeItem(this.storageKey + ".id");
// Remove previously used data e.g. "session_id"
// is deprecated in favor of "session.token".
this.storage.removeItem("session_id");
this.storage.removeItem("sessionId");
this.storage.removeItem("authToken");
this.storage.removeItem("provider");
this.storage.removeItem("user");
this.storage.removeItem("authError");
delete $api.defaults.headers.common[RequestHeader];
}