diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-07 05:13:21 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-07 05:13:21 +0900 |
| commit | 351b2360145e0322705b3085a23d4e07029eeaf6 (patch) | |
| tree | 03e3f5db0fb770b0a9e9f7c580b1dd9be2f02e3a /src/models | |
| parent | イベント送信時に指定の変数の値を添付出来るように (diff) | |
| parent | Support password-less login with WebAuthn (#5112) (diff) | |
| download | sharkey-351b2360145e0322705b3085a23d4e07029eeaf6.tar.gz sharkey-351b2360145e0322705b3085a23d4e07029eeaf6.tar.bz2 sharkey-351b2360145e0322705b3085a23d4e07029eeaf6.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/entities/user-profile.ts | 5 | ||||
| -rw-r--r-- | src/models/repositories/user.ts | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index 6f960f1b7b..4a588ebfbf 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -81,6 +81,11 @@ export class UserProfile { }) public securityKeysAvailable: boolean; + @Column('boolean', { + default: false, + }) + public usePasswordLessLogin: boolean; + @Column('varchar', { length: 128, nullable: true, comment: 'The password hash of the User. It will be null if the origin of the user is local.' diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index cc89b674c5..06da74197f 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -156,6 +156,7 @@ export class UserRepository extends Repository<User> { detail: true }), twoFactorEnabled: profile!.twoFactorEnabled, + usePasswordLessLogin: profile!.usePasswordLessLogin, securityKeys: profile!.twoFactorEnabled ? UserSecurityKeys.count({ userId: user.id @@ -208,7 +209,6 @@ export class UserRepository extends Repository<User> { select: ['id', 'name', 'lastUsed'] }) : [] - } : {}), ...(relation ? { |