From aedabd3b3681275bffa4cdc0df8d71b25c08a36c Mon Sep 17 00:00:00 2001
From: Emily <adharaultimasheireen@gmail.com>
Date: Wed, 3 Jul 2024 15:58:56 +0200
Subject: [PATCH] fix env variables

---
 dashboard/.env.example               | 5 +++++
 dashboard/nuxt.config.ts             | 2 +-
 dashboard/pages/login.vue            | 2 +-
 dashboard/server/api/auth/no_auth.ts | 4 ++--
 docker-compose.yml                   | 7 +++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dashboard/.env.example b/dashboard/.env.example
index feee9d5..2cd8fd2 100644
--- a/dashboard/.env.example
+++ b/dashboard/.env.example
@@ -16,6 +16,11 @@ EMAIL_PASS=
 
 AUTH_JWT_SECRET=
 
+AUTH_MODE=
+
+NOAUTH_USER_EMAIL=
+NOAUTH_USER_NAME=
+
 GOOGLE_AUTH_CLIENT_ID=
 GOOGLE_AUTH_CLIENT_SECRET=
 
diff --git a/dashboard/nuxt.config.ts b/dashboard/nuxt.config.ts
index 347ca3d..d602f88 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: {
-      GOOGLE_AUTH_CLIENT_ID: process.env.GOOGLE_AUTH_CLIENT_ID
+      AUTH_MODE: process.env.AUTH_MODE
     }
 
   },
diff --git a/dashboard/pages/login.vue b/dashboard/pages/login.vue
index 0ba3455..fa88266 100644
--- a/dashboard/pages/login.vue
+++ b/dashboard/pages/login.vue
@@ -3,7 +3,7 @@
 definePageMeta({ layout: 'none' });
 
 const config = useRuntimeConfig()
-const isNoAuth = ref<boolean>(config.public.GOOGLE_AUTH_CLIENT_ID == undefined);
+const isNoAuth = ref<boolean>(config.public.AUTH_MODE == 'NO_AUTH');
 
 const useCodeClientWrapper = isNoAuth.value === false ?
     useCodeClient :
diff --git a/dashboard/server/api/auth/no_auth.ts b/dashboard/server/api/auth/no_auth.ts
index 5aa116e..bafc3a1 100644
--- a/dashboard/server/api/auth/no_auth.ts
+++ b/dashboard/server/api/auth/no_auth.ts
@@ -2,9 +2,9 @@
 import { createUserJwt } from '~/server/AuthManager';
 import { UserModel } from '@schema/UserSchema';
 
-const { NOAUTH_USER_EMAIL, NOAUTH_USER_NAME, GOOGLE_AUTH_CLIENT_ID } = useRuntimeConfig();
+const { NOAUTH_USER_EMAIL, NOAUTH_USER_NAME, public: publicRuntime } = useRuntimeConfig();
 
-const noAuthMode = GOOGLE_AUTH_CLIENT_ID.length == 0;
+const noAuthMode = publicRuntime.AUTH_MODE == 'NO_AUTH';
 
 export default defineEventHandler(async event => {
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 92d1d46..848862c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -90,9 +90,12 @@ services:
       # NUXT_GOOGLE_AUTH_CLIENT_ID: ""
       # NUXT_GOOGLE_AUTH_CLIENT_SECRET: ""
 
-
-      # Default user created to login if no GOOGLE_AUTH_CLIENT_ID is provided
+      # NO_AUTH or GOOGLE
       
+      NUXT_PUBLIC_AUTH_MODE: 'NO_AUTH'
+
+      # Default user created in NO_AUTH mode
+
       NUXT_NOAUTH_USER_EMAIL: 'default@user.com'
       NUXT_NOAUTH_USER_NAME: "defaultuser"