From b2e6ba074e96a965937f23b0ee0d9e44ba0d6aa3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 27 Jul 2025 10:50:22 +0200 Subject: [PATCH] Improved code --- frontend/public/config.json | 12 ++++++------ frontend/src/stores/auth.store.js | 12 +++--------- frontend/src/utils.js | 8 ++++++++ 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 frontend/src/utils.js diff --git a/frontend/public/config.json b/frontend/public/config.json index 4738ed2e7..deb53e23c 100644 --- a/frontend/public/config.json +++ b/frontend/public/config.json @@ -1,8 +1,8 @@ { - "API_BASE_URL": "/api/v2/", - "API_DOC_URL": "/api/schema-v2/swagger/", - "OAUTH_AUTHORITY_URL": "https://localhost:8000/api/o", - "OAUTH_CLIENT_ID": "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD", - "OAUTH_REDIRECT_URI": "/login/logged", - "OAUTH_POST_REDIRECT_URI": "/" + "API_BASE_URL": "/api/v2/", + "API_DOC_URL": "/api/schema-v2/swagger/", + "OAUTH_AUTHORITY_URL": "https://localhost:8000/api/o", + "OAUTH_CLIENT_ID": "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD", + "OAUTH_REDIRECT_URI": "/login/logged", + "OAUTH_POST_REDIRECT_URI": "/" } diff --git a/frontend/src/stores/auth.store.js b/frontend/src/stores/auth.store.js index 9ee9cdbba..5b65a4e7e 100644 --- a/frontend/src/stores/auth.store.js +++ b/frontend/src/stores/auth.store.js @@ -10,22 +10,16 @@ import repository from '@/api/repository' import accountApi from '@/api/account' import accountsApi from '@/api/accounts' import authApi from '@/api/auth.js' - +import { getAbsoluteUrl } from '@/utils' import { useGlobalConfig } from '@/main' export const useAuthStore = defineStore('auth', () => { const config = useGlobalConfig() const authUser = ref(null) const isAuthenticated = ref(false) - let redirectUri = config.OAUTH_REDIRECT_URI - let postLogoutRedirectUri = config.OAUTH_POST_REDIRECT_URI + let redirectUri = getAbsoluteUrl(config.OAUTH_REDIRECT_URI) + let postLogoutRedirectUri = getAbsoluteUrl(config.OAUTH_POST_REDIRECT_URI) - if (!redirectUri.startsWith('http')) { - redirectUri = `${location.protocol}//${location.host}${config.OAUTH_REDIRECT_URI}` - } - if (!postLogoutRedirectUri.startsWith('http')) { - postLogoutRedirectUri = `${location.protocol}//${location.host}${config.OAUTH_POST_REDIRECT_URI}` - } const manager = new UserManager({ authority: config.OAUTH_AUTHORITY_URL, client_id: config.OAUTH_CLIENT_ID, diff --git a/frontend/src/utils.js b/frontend/src/utils.js new file mode 100644 index 000000000..b6eafbe36 --- /dev/null +++ b/frontend/src/utils.js @@ -0,0 +1,8 @@ +function getAbsoluteUrl(url) { + if (!url.startsWith('http')) { + return `${location.protocol}//${location.host}${url}` + } + return url +} + +export { getAbsoluteUrl }