Skip to content

Commit f5b669c

Browse files
committed
use DEFAULT_LOGIN_METHOD instead for more flexibility. defaults to otp.
1 parent b661127 commit f5b669c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

desktop/src/ui/platform.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export async function configurePlatform(): Promise<void> {
202202

203203
setMetadata(login.metadata.AccountsUrl, config.ACCOUNTS_URL)
204204
setMetadata(login.metadata.DisableSignUp, config.DISABLE_SIGNUP === 'true')
205-
setMetadata(login.metadata.LoginPasswordOnly, config.LOGIN_PASSWORD_ONLY === 'true')
205+
setMetadata(login.metadata.DefaultLoginMethod, config.DEFAULT_LOGIN_METHOD)
206206
setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
207207
setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
208208
setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)

desktop/src/ui/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export interface Config {
2929
ANALYTICS_COLLECTOR_URL?: string
3030
AI_URL?: string
3131
DISABLE_SIGNUP?: string
32-
LOGIN_PASSWORD_ONLY?: string
32+
DEFAULT_LOGIN_METHOD?: string
3333
BRANDING_URL?: string
3434
PREVIEW_CONFIG: string
3535
UPLOAD_CONFIG: string

dev/prod/src/platform.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ export async function configurePlatform() {
294294

295295
setMetadata(login.metadata.AccountsUrl, config.ACCOUNTS_URL)
296296
setMetadata(login.metadata.DisableSignUp, config.DISABLE_SIGNUP === 'true')
297-
setMetadata(login.metadata.LoginPasswordOnly, config.LOGIN_PASSWORD_ONLY === 'true')
297+
setMetadata(login.metadata.DefaultLoginMethod, config.DEFAULT_LOGIN_METHOD)
298298
setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
299299
setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
300300
setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)

plugins/login-resources/src/components/LoginForm.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
2424
export let navigateUrl: string | undefined = undefined
2525
export let signUpDisabled = false
26-
const loginPasswordOnly = getMetadata(login.metadata.LoginPasswordOnly) ?? false
26+
const defaultLoginMethod = getMetadata(login.metadata.DefaultLoginMethod) ?? 'otp'
2727
2828
let method: LoginMethods = LoginMethods.Otp
2929
30-
if (loginPasswordOnly === true) {
30+
if (defaultLoginMethod === 'password') {
3131
method = LoginMethods.Password
3232
}
3333

plugins/login/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default plugin(loginId, {
7373
LastToken: '' as Metadata<string>,
7474
LoginEndpoint: '' as Metadata<string>,
7575
LoginEmail: '' as Metadata<string>,
76-
LoginPasswordOnly: '' as Metadata<boolean>,
76+
DefaultLoginMethod: '' as Metadata<string>,
7777
DisableSignUp: '' as Metadata<boolean>
7878
},
7979
component: {

server/front/src/starter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
119119

120120
const disableSignUp = process.env.DISABLE_SIGNUP
121121

122-
const loginPasswordOnly = process.env.LOGIN_PASSWORD_ONLY
122+
const defaultLoginMethod = process.env.DEFAULT_LOGIN_METHOD
123123

124124
const config = {
125125
elasticUrl,
@@ -140,7 +140,7 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
140140
uploadConfig,
141141
pushPublicKey,
142142
disableSignUp,
143-
loginPasswordOnly
143+
defaultLoginMethod
144144
}
145145
console.log('Starting Front service with', config)
146146
const shutdown = start(ctx, config, SERVER_PORT, extraConfig)

0 commit comments

Comments
 (0)