Skip to content

Commit b661127

Browse files
committed
LoginPasswordOnly in LoginForm rather than LoginApp since it's only used there
1 parent dcfaac7 commit b661127

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@
5555
export let page: Pages = 'signup'
5656
5757
const signUpDisabled = getMetadata(login.metadata.DisableSignUp) ?? false
58-
const loginPasswordOnly = getMetadata(login.metadata.LoginPasswordOnly) ?? false
5958
let navigateUrl: string | undefined
6059
6160
onDestroy(location.subscribe(updatePageLoc))
6261
63-
function updatePageLoc (loc: Location): void {
62+
function updatePageLoc(loc: Location): void {
6463
const token = getMetadata(presentation.metadata.Token)
6564
page = (loc.path[1] as Pages) ?? (token != null ? 'selectWorkspace' : 'login')
6665
const allowedUnauthPages: Pages[] = [
@@ -81,7 +80,7 @@
8180
navigateUrl = loc.query?.navigateUrl ?? undefined
8281
}
8382
84-
async function chooseToken (): Promise<void> {
83+
async function chooseToken(): Promise<void> {
8584
if (page === 'auth') {
8685
// token handled by auth page
8786
return
@@ -136,7 +135,7 @@
136135
<Scroller padding={'1rem 0'}>
137136
<div class="form-content">
138137
{#if page === 'login'}
139-
<LoginForm {navigateUrl} {signUpDisabled} {loginPasswordOnly} />
138+
<LoginForm {navigateUrl} {signUpDisabled} />
140139
{:else if page === 'signup'}
141140
<SignupForm {signUpDisabled} />
142141
{:else if page === 'createWorkspace'}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818
import LoginPasswordForm from './LoginPasswordForm.svelte'
1919
import LoginOtpForm from './LoginOtpForm.svelte'
2020
import BottomActionComponent from './BottomAction.svelte'
21+
import { getMetadata } from '@hcengineering/platform'
2122
import login from '../plugin'
2223
2324
export let navigateUrl: string | undefined = undefined
2425
export let signUpDisabled = false
25-
export let loginPasswordOnly = false
26+
const loginPasswordOnly = getMetadata(login.metadata.LoginPasswordOnly) ?? false
2627
2728
let method: LoginMethods = LoginMethods.Otp
2829
2930
if (loginPasswordOnly === true) {
3031
method = LoginMethods.Password
3132
}
3233
33-
function changeMethod (event: CustomEvent<LoginMethods>): void {
34+
function changeMethod(event: CustomEvent<LoginMethods>): void {
3435
method = event.detail
3536
}
3637

0 commit comments

Comments
 (0)