diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index c9c31508..179c7f50 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -142,7 +142,7 @@ export default { version: () => version, disableExternal: () => disableExternal, disableUsedPercentage: () => disableUsedPercentage, - canLogout: () => (!noAuth && loginPage) || authMethod === "oidc" + canLogout: () => (!noAuth && loginPage) || authMethod === "oidc", }, asyncComputed: { usage: { diff --git a/frontend/src/utils/auth.js b/frontend/src/utils/auth.js index a17741dd..dda51802 100644 --- a/frontend/src/utils/auth.js +++ b/frontend/src/utils/auth.js @@ -21,9 +21,9 @@ export function parseToken(token) { } export async function validateLogin() { - let jwt = localStorage.getItem("jwt") + let jwt = localStorage.getItem("jwt"); - if (authMethod === 'oidc' && (!jwt || jwt === "null")) { + if (authMethod === "oidc" && (!jwt || jwt === "null")) { jwt = cookie("auth"); } @@ -48,7 +48,6 @@ export async function login(username, password, recaptcha) { }); const body = await res.text(); - if (res.status === 200) { parseToken(body); } else { @@ -69,7 +68,7 @@ export async function renew(jwt) { if (res.status === 200) { parseToken(body); } else { - if (authMethod === 'oidc') { + if (authMethod === "oidc") { clearLoginState(); document.location.replace(document.location.pathname); } @@ -103,4 +102,4 @@ function clearLoginState() { store.commit("setJWT", ""); store.commit("setUser", null); localStorage.setItem("jwt", null); -} \ No newline at end of file +} diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index 862c14f5..c44aaa03 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -47,9 +47,9 @@