diff --git a/dashboard/nuxt.config.ts b/dashboard/nuxt.config.ts index 93dba8e..347ca3d 100644 --- a/dashboard/nuxt.config.ts +++ b/dashboard/nuxt.config.ts @@ -46,7 +46,7 @@ export default defineNuxtConfig({ NOAUTH_USER_EMAIL: process.env.NOAUTH_USER_EMAIL, NOAUTH_USER_NAME: process.env.NOAUTH_USER_NAME, public: { - PAYPAL_CLIENT_ID: '' + GOOGLE_AUTH_CLIENT_ID: process.env.GOOGLE_AUTH_CLIENT_ID } }, diff --git a/dashboard/pages/login.vue b/dashboard/pages/login.vue index 38c2977..0ba3455 100644 --- a/dashboard/pages/login.vue +++ b/dashboard/pages/login.vue @@ -2,19 +2,20 @@ definePageMeta({ layout: 'none' }); -const { GOOGLE_AUTH_CLIENT_ID } = useRuntimeConfig(); +const config = useRuntimeConfig() +const isNoAuth = ref(config.public.GOOGLE_AUTH_CLIENT_ID == undefined); -const isNoAuth = ref(GOOGLE_AUTH_CLIENT_ID == undefined); - -const useCodeClientWrapper = isNoAuth.value === true ? useCodeClient : (...args: any) => { - return { isReady: false, login: () => { } } -} +const useCodeClientWrapper = isNoAuth.value === false ? + useCodeClient : + (...args: any) => { + return { isReady: false, login: () => { } } + } async function loginWithoutAuth() { try { const result = await $fetch('/api/auth/no_auth'); if (result.error) return alert('Error during login, please try again'); - + setToken(result.access_token); const user = await $fetch('/api/user/me', { headers: { 'Authorization': 'Bearer ' + token.value } }) @@ -31,8 +32,8 @@ async function loginWithoutAuth() { router.push('/?just_logged=true'); } - } catch (ex) { - alert('Error during login.', ex.message); + } catch (ex: any) { + alert('Error during login.' + ex.message); } }