From 6f67cbff2e57d0d324ae8da32186746bf3190b90 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan Date: Wed, 1 Apr 2026 19:18:11 +0530 Subject: [PATCH] use console var --- .env.example | 1 - .github/workflows/publish.yml | 4 ---- AGENTS.md | 1 - Dockerfile | 2 -- build.js | 1 - src/lib/system.ts | 1 - src/routes/(console)/+layout.ts | 24 ++++++++++++++++++++-- src/routes/(console)/verify-email/+page.ts | 16 ++++++++++++--- src/routes/+layout.ts | 11 +--------- 9 files changed, 36 insertions(+), 25 deletions(-) diff --git a/.env.example b/.env.example index 30973b2c1..14f47df65 100644 --- a/.env.example +++ b/.env.example @@ -4,5 +4,4 @@ PUBLIC_APPWRITE_MULTI_REGION=false PUBLIC_APPWRITE_ENDPOINT=http://localhost/v1 PUBLIC_STRIPE_KEY= PUBLIC_GROWTH_ENDPOINT= -PUBLIC_CONSOLE_EMAIL_VERIFICATION=false PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=true \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8335294ac..4bb77fbcb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,7 +41,6 @@ jobs: "PUBLIC_CONSOLE_MODE=cloud" "PUBLIC_CONSOLE_FEATURE_FLAGS=" "PUBLIC_APPWRITE_MULTI_REGION=true" - "PUBLIC_CONSOLE_EMAIL_VERIFICATION=true" "PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}" @@ -84,7 +83,6 @@ jobs: "PUBLIC_CONSOLE_MODE=cloud" "PUBLIC_CONSOLE_FEATURE_FLAGS=" "PUBLIC_APPWRITE_MULTI_REGION=true" - "PUBLIC_CONSOLE_EMAIL_VERIFICATION=true" "PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}" @@ -124,7 +122,6 @@ jobs: build-args: | "PUBLIC_CONSOLE_MODE=self-hosted" "PUBLIC_APPWRITE_MULTI_REGION=false" - "PUBLIC_CONSOLE_EMAIL_VERIFICATION=false" "PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=true" "PUBLIC_CONSOLE_FEATURE_FLAGS=" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" @@ -164,7 +161,6 @@ jobs: build-args: | "PUBLIC_CONSOLE_MODE=cloud" "PUBLIC_APPWRITE_MULTI_REGION=false" - "PUBLIC_CONSOLE_EMAIL_VERIFICATION=false" "PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false" "PUBLIC_CONSOLE_FEATURE_FLAGS=" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}" diff --git a/AGENTS.md b/AGENTS.md index 86083b656..993b44808 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -222,7 +222,6 @@ Set via `.env` (copy `.env.example`). All prefixed with `PUBLIC_` for SvelteKit: | `PUBLIC_STRIPE_KEY` | -- | Stripe public key (cloud only) | | `PUBLIC_GROWTH_ENDPOINT` | -- | Analytics endpoint | | `PUBLIC_CONSOLE_FEATURE_FLAGS` | -- | Feature flags | -| `PUBLIC_CONSOLE_EMAIL_VERIFICATION` | `false` | Require email verification | | `PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS` | `true` | Mock AI in dev | ## Common pitfalls diff --git a/Dockerfile b/Dockerfile index 691652e7c..11440e89b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ ADD ./static /app/static ARG PUBLIC_CONSOLE_MODE ARG PUBLIC_CONSOLE_FEATURE_FLAGS ARG PUBLIC_APPWRITE_MULTI_REGION -ARG PUBLIC_CONSOLE_EMAIL_VERIFICATION ARG PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS ARG PUBLIC_APPWRITE_ENDPOINT ARG PUBLIC_GROWTH_ENDPOINT @@ -31,7 +30,6 @@ ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE ENV PUBLIC_CONSOLE_FEATURE_FLAGS=$PUBLIC_CONSOLE_FEATURE_FLAGS ENV PUBLIC_APPWRITE_MULTI_REGION=$PUBLIC_APPWRITE_MULTI_REGION -ENV PUBLIC_CONSOLE_EMAIL_VERIFICATION=$PUBLIC_CONSOLE_EMAIL_VERIFICATION ENV PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=$PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY ENV PUBLIC_CONSOLE_FINGERPRINT_KEY=$PUBLIC_CONSOLE_FINGERPRINT_KEY diff --git a/build.js b/build.js index 1b99db221..f852e5e9a 100644 --- a/build.js +++ b/build.js @@ -28,7 +28,6 @@ async function main() { logEnv('MULTI REGION', env?.PUBLIC_APPWRITE_MULTI_REGION); logEnv('APPWRITE ENDPOINT', env?.PUBLIC_APPWRITE_ENDPOINT, 'relative'); logEnv('GROWTH ENDPOINT', env?.PUBLIC_GROWTH_ENDPOINT); - logEnv('CONSOLE EMAIL VERIFICATION', env?.PUBLIC_CONSOLE_EMAIL_VERIFICATION); logEnv('CONSOLE MOCK AI SUGGESTIONS', env?.PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS); log(); logDelimiter(); diff --git a/src/lib/system.ts b/src/lib/system.ts index 453260992..0c9a44b76 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -11,7 +11,6 @@ export const VARS = { APPWRITE_ENDPOINT: env.PUBLIC_APPWRITE_ENDPOINT ?? undefined, GROWTH_ENDPOINT: env.PUBLIC_GROWTH_ENDPOINT ?? undefined, PUBLIC_STRIPE_KEY: env.PUBLIC_STRIPE_KEY ?? undefined, - EMAIL_VERIFICATION: env.PUBLIC_CONSOLE_EMAIL_VERIFICATION === 'true', MOCK_AI_SUGGESTIONS: (env.PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS ?? 'true') === 'true' }; diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index b22143294..74be72830 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -7,9 +7,17 @@ import { makePlansMap } from '$lib/helpers/billing'; import { plansInfo as plansInfoStore } from '$lib/stores/billing'; import { normalizeConsoleVariables } from '$lib/helpers/domains'; import { syncServerTime } from '$lib/helpers/fingerprint'; +import { redirect } from '@sveltejs/kit'; +import { resolve } from '$app/paths'; -export const load: LayoutLoad = async ({ depends, parent }) => { - const { organizations, plansInfo } = await parent(); +function isEmailVerificationEnabledFromBackend(flag: string | undefined): boolean { + if (!flag) return false; + const normalized = flag.toLowerCase(); + return normalized === 'enabled' || normalized === 'true' || normalized === '1'; +} + +export const load: LayoutLoad = async ({ depends, parent, url }) => { + const { organizations, plansInfo, account } = await parent(); depends(Dependencies.RUNTIMES); depends(Dependencies.CONSOLE_VARIABLES); @@ -42,6 +50,18 @@ export const load: LayoutLoad = async ({ depends, parent }) => { const consoleVariables = normalizeConsoleVariables(rawConsoleVariables); + const emailVerificationEnabled = isEmailVerificationEnabledFromBackend( + consoleVariables._APP_CONSOLE_EMAIL_VERIFICATION + ); + + if (isCloud && account && !account.emailVerification && emailVerificationEnabled) { + const isVerifyEmailPage = url.pathname === resolve('/verify-email'); + + if (!isVerifyEmailPage) { + redirect(303, resolve('/verify-email')); + } + } + let fallbackPlansInfoArray = plansInfo; if (!fallbackPlansInfoArray) { fallbackPlansInfoArray = makePlansMap(plansArray); diff --git a/src/routes/(console)/verify-email/+page.ts b/src/routes/(console)/verify-email/+page.ts index d97e73666..dc3e1ae6d 100644 --- a/src/routes/(console)/verify-email/+page.ts +++ b/src/routes/(console)/verify-email/+page.ts @@ -4,14 +4,24 @@ import type { PageLoad } from './$types'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; -import { VARS } from '$lib/system'; + +function isEmailVerificationEnabledFromBackend(flag: string | undefined): boolean { + if (!flag) return false; + const normalized = flag.toLowerCase(); + return normalized === 'enabled' || normalized === 'true' || normalized === '1'; +} export const load: PageLoad = async ({ parent, depends, url }) => { - if (!VARS.EMAIL_VERIFICATION) { + const { account, consoleVariables } = await parent(); + + const emailVerificationEnabled = isEmailVerificationEnabledFromBackend( + consoleVariables?._APP_CONSOLE_EMAIL_VERIFICATION + ); + + if (!emailVerificationEnabled) { redirect(303, resolve('/')); } - const { account } = await parent(); depends(Dependencies.ACCOUNT); const user = url.searchParams.get('userId') ?? null; diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 5bdef81d7..41d8c3e17 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -9,7 +9,7 @@ import { redirectTo } from './store'; import { resolve } from '$app/paths'; import type { Account } from '$lib/stores/user'; import { type AppwriteException, Platform } from '@appwrite.io/console'; -import { isCloud, VARS } from '$lib/system'; +import { isCloud } from '$lib/system'; import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect'; import { getTeamOrOrganizationList } from '$lib/stores/organization'; import { makePlansMap } from '$lib/helpers/billing'; @@ -32,15 +32,6 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { } if (account) { - if (isCloud && !account.emailVerification && VARS.EMAIL_VERIFICATION) { - const isConsoleRoute = route.id?.startsWith('/(console)'); - const isVerifyEmailPage = url.pathname === resolve('/verify-email'); - - if (isConsoleRoute && !isVerifyEmailPage) { - redirect(303, resolve('/verify-email')); - } - } - const plansInfo = await getPlatformPlans(); plansInfoStore.set(plansInfo);