Skip to content

Commit 17b2cef

Browse files
committed
frontend/utils: add proposed fix for #159
1 parent d9f03c9 commit 17b2cef

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

frontend/src/utils.tsx

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,27 @@ export function refresh_access_token() {
107107
return;
108108
}
109109

110-
const {error, response} = await fetchClient.GET("/auth/jwt_refresh", {credentials: "same-origin"});
111-
112-
if (!error || response.status === 502) {
113-
if (!localStorage.getItem("loginSalt") || !localStorage.getItem("secretKey")) {
114-
logout(false);
110+
try {
111+
const {error, response} = await fetchClient.GET("/auth/jwt_refresh", {credentials: "same-origin"});
112+
113+
if (!error || response.status === 502) {
114+
if (!localStorage.getItem("loginSalt") || !localStorage.getItem("secretKey")) {
115+
logout(false);
116+
}
117+
loggedIn.value = AppState.LoggedIn;
118+
} else {
119+
auth_already_failed = true;
120+
localStorage.removeItem("loginSalt");
121+
localStorage.removeItem("secretKey");
122+
loggedIn.value = AppState.LoggedOut;
115123
}
116-
loggedIn.value = AppState.LoggedIn;
117-
} else {
118-
auth_already_failed = true;
119-
localStorage.removeItem("loginSalt");
120-
localStorage.removeItem("secretKey");
121-
loggedIn.value = AppState.LoggedOut;
124+
refreshPromiseResolved = true;
125+
resolve();
126+
} catch (e) {
127+
console.error(e);
128+
refreshPromiseResolved = true;
129+
reject();
122130
}
123-
refreshPromiseResolved = true;
124-
resolve();
125131
});
126132
return refreshPromise
127133
}

0 commit comments

Comments
 (0)