diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-01 07:16:52 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-01 07:16:52 +0900 |
| commit | 7ed3448e13847f3ba807be1354e90c912fbefd9a (patch) | |
| tree | a9d91176e5a95f90e2af570ae900641f651e77aa /src/server/api/endpoints/i | |
| parent | Update gulpfile.ts (diff) | |
| download | sharkey-7ed3448e13847f3ba807be1354e90c912fbefd9a.tar.gz sharkey-7ed3448e13847f3ba807be1354e90c912fbefd9a.tar.bz2 sharkey-7ed3448e13847f3ba807be1354e90c912fbefd9a.zip | |
Resolve #1669
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/2fa/done.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/2fa/register.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/2fa/unregister.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/change-password.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update-email.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts index c134e1b226..3420bc3f64 100644 --- a/src/server/api/endpoints/i/2fa/done.ts +++ b/src/server/api/endpoints/i/2fa/done.ts @@ -35,7 +35,7 @@ export default define(meta, async (ps, user) => { throw new Error('not verified'); } - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { twoFactorSecret: profile.twoFactorTempSecret, twoFactorEnabled: true }); diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts index bd46b7c68c..112cdd6b7c 100644 --- a/src/server/api/endpoints/i/2fa/register.ts +++ b/src/server/api/endpoints/i/2fa/register.ts @@ -34,7 +34,7 @@ export default define(meta, async (ps, user) => { length: 32 }); - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { twoFactorTempSecret: secret.base32 }); diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts index 99483143cc..8fda128095 100644 --- a/src/server/api/endpoints/i/2fa/unregister.ts +++ b/src/server/api/endpoints/i/2fa/unregister.ts @@ -26,7 +26,7 @@ export default define(meta, async (ps, user) => { throw new Error('incorrect password'); } - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { twoFactorSecret: null, twoFactorEnabled: false }); diff --git a/src/server/api/endpoints/i/change-password.ts b/src/server/api/endpoints/i/change-password.ts index 07d2d864d2..0f44bbf826 100644 --- a/src/server/api/endpoints/i/change-password.ts +++ b/src/server/api/endpoints/i/change-password.ts @@ -34,7 +34,7 @@ export default define(meta, async (ps, user) => { const salt = await bcrypt.genSalt(8); const hash = await bcrypt.hash(ps.newPassword, salt); - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { password: hash }); }); diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts index ca95e612a3..92ac3d79eb 100644 --- a/src/server/api/endpoints/i/update-email.ts +++ b/src/server/api/endpoints/i/update-email.ts @@ -49,7 +49,7 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.incorrectPassword); } - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { email: ps.email, emailVerified: false, emailVerifyCode: null @@ -66,7 +66,7 @@ export default define(meta, async (ps, user) => { if (ps.email != null) { const code = rndstr('a-z0-9', 16); - await UserProfiles.update({ userId: user.id }, { + await UserProfiles.update(user.id, { emailVerifyCode: code }); diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index f7f03e84a3..14ed27fe5a 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -268,7 +268,7 @@ export default define(meta, async (ps, user, app) => { //#endregion if (Object.keys(updates).length > 0) await Users.update(user.id, updates); - if (Object.keys(profileUpdates).length > 0) await UserProfiles.update({ userId: user.id }, profileUpdates); + if (Object.keys(profileUpdates).length > 0) await UserProfiles.update(user.id, profileUpdates); const iObj = await Users.pack(user.id, user, { detail: true, |