From 6b5d23566caf122edb00935f00a6e22aaa3cf58f Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 17 Jan 2025 18:07:53 +0100 Subject: [PATCH] fix SELFHOST env on docker-compose --- dashboard/composables/useSelfhosted.ts | 2 +- dashboard/server/api/onboarding/exist.ts | 2 +- dashboard/server/api/project/generate_csv.ts | 2 +- dashboard/server/init.ts | 6 ++++++ docker-compose.yml | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dashboard/composables/useSelfhosted.ts b/dashboard/composables/useSelfhosted.ts index 4d54781..384dd65 100644 --- a/dashboard/composables/useSelfhosted.ts +++ b/dashboard/composables/useSelfhosted.ts @@ -3,5 +3,5 @@ const app = useRuntimeConfig(); export function useSelfhosted() { - return app.public.SELFHOSTED === 'TRUE' || app.public.SELFHOSTED === 'true'; + return app.public.SELFHOSTED.toString() === 'TRUE' || app.public.SELFHOSTED.toString() === 'true'; } \ No newline at end of file diff --git a/dashboard/server/api/onboarding/exist.ts b/dashboard/server/api/onboarding/exist.ts index 94dcd78..3135b6b 100644 --- a/dashboard/server/api/onboarding/exist.ts +++ b/dashboard/server/api/onboarding/exist.ts @@ -10,7 +10,7 @@ export default defineEventHandler(async event => { const exist = await OnboardingModel.exists({ user_id: data.user.id }); - if (SELFHOSTED === 'TRUE' || SELFHOSTED === 'true') { + if (SELFHOSTED.toString() === 'TRUE' || SELFHOSTED.toString() === 'true') { return { exists: true } } return { exist: exist != null } diff --git a/dashboard/server/api/project/generate_csv.ts b/dashboard/server/api/project/generate_csv.ts index e264ed0..a9a86ed 100644 --- a/dashboard/server/api/project/generate_csv.ts +++ b/dashboard/server/api/project/generate_csv.ts @@ -66,7 +66,7 @@ export default defineEventHandler(async event => { const { project, project_id, user } = data; - if (SELFHOSTED !== 'TRUE' && SELFHOSTED !== 'true') { + if (SELFHOSTED.toString() !== 'TRUE' && SELFHOSTED.toString() !== 'true') { const PREMIUM_TYPE = project.premium_type; if (PREMIUM_TYPE === 0) return setResponseStatus(event, 400, 'Project not premium'); } diff --git a/dashboard/server/init.ts b/dashboard/server/init.ts index 2f182db..cb2666e 100644 --- a/dashboard/server/init.ts +++ b/dashboard/server/init.ts @@ -42,6 +42,12 @@ export default async () => { logger.info('[SERVER] Completed'); logger.warn('[ANOMALY LOOP] Disabled'); + + + logger.warn(`[SELFHOSTED_SERVER] ${config.SELFHOSTED}`); + logger.warn(`[SELFHOSTED_CLIENT] ${config.public.SELFHOSTED}`); + logger.warn(`[AUTH] ${config.public.AUTH_MODE}`); + // anomalyLoop(); }; \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a90759c..360493a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,6 +95,7 @@ services: NUXT_NOAUTH_USER_NAME: "defaultuser" NUXT_SELFHOSTED: 'true' + NUXT_PUBLIC_SELFHOSTED: 'true' # Optional - Used for tests # NUXT_STRIPE_SECRET_TEST: ""