use DEFAULT_LOGIN_METHOD instead for more flexibility. defaults to otp.

hcengineering · Nov 10, 2024 · f5b669c · f5b669c
1 parent b661127
commit f5b669c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts
@@ -202,7 +202,7 @@ export async function configurePlatform(): Promise<void> {
 
   setMetadata(login.metadata.AccountsUrl, config.ACCOUNTS_URL)
   setMetadata(login.metadata.DisableSignUp, config.DISABLE_SIGNUP === 'true')
-  setMetadata(login.metadata.LoginPasswordOnly, config.LOGIN_PASSWORD_ONLY === 'true')
+  setMetadata(login.metadata.DefaultLoginMethod, config.DEFAULT_LOGIN_METHOD)
   setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
   setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
   setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)

diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts
@@ -29,7 +29,7 @@ export interface Config {
   ANALYTICS_COLLECTOR_URL?: string
   AI_URL?: string
   DISABLE_SIGNUP?: string
-  LOGIN_PASSWORD_ONLY?: string
+  DEFAULT_LOGIN_METHOD?: string
   BRANDING_URL?: string
   PREVIEW_CONFIG: string
   UPLOAD_CONFIG: string

diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts
@@ -294,7 +294,7 @@ export async function configurePlatform() {
 
   setMetadata(login.metadata.AccountsUrl, config.ACCOUNTS_URL)
   setMetadata(login.metadata.DisableSignUp, config.DISABLE_SIGNUP === 'true')
-  setMetadata(login.metadata.LoginPasswordOnly, config.LOGIN_PASSWORD_ONLY === 'true')
+  setMetadata(login.metadata.DefaultLoginMethod, config.DEFAULT_LOGIN_METHOD)
   setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
   setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
   setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)

diff --git a/plugins/login-resources/src/components/LoginForm.svelte b/plugins/login-resources/src/components/LoginForm.svelte
@@ -23,11 +23,11 @@
 
   export let navigateUrl: string | undefined = undefined
   export let signUpDisabled = false
-  const loginPasswordOnly = getMetadata(login.metadata.LoginPasswordOnly) ?? false
+  const defaultLoginMethod = getMetadata(login.metadata.DefaultLoginMethod) ?? 'otp'
 
   let method: LoginMethods = LoginMethods.Otp
 
-  if (loginPasswordOnly === true) {
+  if (defaultLoginMethod === 'password') {
     method = LoginMethods.Password
   }
 

diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts
@@ -73,7 +73,7 @@ export default plugin(loginId, {
     LastToken: '' as Metadata<string>,
     LoginEndpoint: '' as Metadata<string>,
     LoginEmail: '' as Metadata<string>,
-    LoginPasswordOnly: '' as Metadata<boolean>,
+    DefaultLoginMethod: '' as Metadata<string>,
     DisableSignUp: '' as Metadata<boolean>
   },
   component: {

diff --git a/server/front/src/starter.ts b/server/front/src/starter.ts
@@ -119,7 +119,7 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
 
   const disableSignUp = process.env.DISABLE_SIGNUP
 
-  const loginPasswordOnly = process.env.LOGIN_PASSWORD_ONLY
+  const defaultLoginMethod = process.env.DEFAULT_LOGIN_METHOD
 
   const config = {
     elasticUrl,
@@ -140,7 +140,7 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
     uploadConfig,
     pushPublicKey,
     disableSignUp,
-    loginPasswordOnly
+    defaultLoginMethod
   }
   console.log('Starting Front service with', config)
   const shutdown = start(ctx, config, SERVER_PORT, extraConfig)