From e68e3173a8f0ea65ccde4b2c17f02a2422657d1c Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle <139135120+andrewwallacespeckle@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:40:57 +0000 Subject: [PATCH] Add FF_FORCE_EMAIL_VERIFICATION (#3866) --- packages/shared/src/environment/index.ts | 6 ++++++ utils/helm/speckle-server/templates/_helpers.tpl | 3 +++ .../helm/speckle-server/templates/frontend_2/deployment.yml | 2 ++ utils/helm/speckle-server/values.schema.json | 5 +++++ utils/helm/speckle-server/values.yaml | 2 ++ 5 files changed, 18 insertions(+) diff --git a/packages/shared/src/environment/index.ts b/packages/shared/src/environment/index.ts index 0f3adc466..4b2f1ee91 100644 --- a/packages/shared/src/environment/index.ts +++ b/packages/shared/src/environment/index.ts @@ -55,6 +55,11 @@ const parseFeatureFlags = () => { FF_FILEIMPORT_IFC_DOTNET_ENABLED: { schema: z.boolean(), defaults: { production: false, _: false } + }, + // Forces email verification for all users + FF_FORCE_EMAIL_VERIFICATION: { + schema: z.boolean(), + defaults: { production: false, _: false } } }) @@ -80,6 +85,7 @@ export function getFeatureFlags(): { FF_BILLING_INTEGRATION_ENABLED: boolean FF_WORKSPACES_MULTI_REGION_ENABLED: boolean FF_FILEIMPORT_IFC_DOTNET_ENABLED: boolean + FF_FORCE_EMAIL_VERIFICATION: boolean } { if (!parsedFlags) parsedFlags = parseFeatureFlags() return parsedFlags diff --git a/utils/helm/speckle-server/templates/_helpers.tpl b/utils/helm/speckle-server/templates/_helpers.tpl index d4c1f877d..6e67a8217 100644 --- a/utils/helm/speckle-server/templates/_helpers.tpl +++ b/utils/helm/speckle-server/templates/_helpers.tpl @@ -589,6 +589,9 @@ Generate the environment variables for Speckle server and Speckle objects deploy - name: FF_WORKSPACES_MULTI_REGION_ENABLED value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }} +- name: FF_FORCE_EMAIL_VERIFICATION + value: {{ .Values.featureFlags.forceEmailVerification | quote }} + {{- if .Values.featureFlags.billingIntegrationEnabled }} - name: STRIPE_API_KEY valueFrom: diff --git a/utils/helm/speckle-server/templates/frontend_2/deployment.yml b/utils/helm/speckle-server/templates/frontend_2/deployment.yml index d43fbf095..c978d34cf 100644 --- a/utils/helm/speckle-server/templates/frontend_2/deployment.yml +++ b/utils/helm/speckle-server/templates/frontend_2/deployment.yml @@ -137,6 +137,8 @@ spec: value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }} - name: NUXT_PUBLIC_FF_GENDOAI_MODULE_ENABLED value: {{ .Values.featureFlags.gendoAIModuleEnabled | quote }} + - name: NUXT_PUBLIC_FF_FORCE_EMAIL_VERIFICATION + value: {{ .Values.featureFlags.forceEmailVerification | quote }} {{- if .Values.analytics.survicate_workspace_key }} - name: NUXT_PUBLIC_SURVICATE_WORKSPACE_KEY value: {{ .Values.analytics.survicate_workspace_key | quote }} diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json index edf79ce32..500cefa3f 100644 --- a/utils/helm/speckle-server/values.schema.json +++ b/utils/helm/speckle-server/values.schema.json @@ -84,6 +84,11 @@ "type": "boolean", "description": "Toggles whether the experimental .Net IFC importer is used for importing IFC files.", "default": false + }, + "forceEmailVerification": { + "type": "boolean", + "description": "Forces email verification for all users", + "default": false } } }, diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml index dffeb5dbf..a7c227e68 100644 --- a/utils/helm/speckle-server/values.yaml +++ b/utils/helm/speckle-server/values.yaml @@ -55,6 +55,8 @@ featureFlags: workspacesMultiRegionEnabled: false ## @param featureFlags.fileImportIFCDotNetEnabled Toggles whether the experimental .Net IFC importer is used for importing IFC files. fileImportIFCDotNetEnabled: false + ## @param featureFlags.forceEmailVerification Forces email verification for all users + forceEmailVerification: false analytics: ## @param analytics.enabled Enable or disable analytics