diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-26 14:51:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 14:51:03 +0900 |
| commit | 8d7d200efffcf9ffd49dba28f729a6e5b9c11f68 (patch) | |
| tree | 10e3209cd77c3a08b488c08bd4b2f9d7e87de974 /src/api/endpoints/i/2fa | |
| parent | Merge pull request #1293 from rinsuki/fix/using-hostname-insteadof-host (diff) | |
| parent | Introduce account document to user document (diff) | |
| download | sharkey-8d7d200efffcf9ffd49dba28f729a6e5b9c11f68.tar.gz sharkey-8d7d200efffcf9ffd49dba28f729a6e5b9c11f68.tar.bz2 sharkey-8d7d200efffcf9ffd49dba28f729a6e5b9c11f68.zip | |
Merge pull request #1287 from akihikodaki/account
Introduce account document to user document
Diffstat (limited to 'src/api/endpoints/i/2fa')
| -rw-r--r-- | src/api/endpoints/i/2fa/done.ts | 4 | ||||
| -rw-r--r-- | src/api/endpoints/i/2fa/register.ts | 2 | ||||
| -rw-r--r-- | src/api/endpoints/i/2fa/unregister.ts | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/api/endpoints/i/2fa/done.ts b/src/api/endpoints/i/2fa/done.ts index 0b36033bb6..0f1db73829 100644 --- a/src/api/endpoints/i/2fa/done.ts +++ b/src/api/endpoints/i/2fa/done.ts @@ -28,8 +28,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => { await User.update(user._id, { $set: { - two_factor_secret: user.two_factor_temp_secret, - two_factor_enabled: true + 'account.two_factor_secret': user.two_factor_temp_secret, + 'account.two_factor_enabled': true } }); diff --git a/src/api/endpoints/i/2fa/register.ts b/src/api/endpoints/i/2fa/register.ts index c2b5037a29..24abfcdfc5 100644 --- a/src/api/endpoints/i/2fa/register.ts +++ b/src/api/endpoints/i/2fa/register.ts @@ -14,7 +14,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => { if (passwordErr) return rej('invalid password param'); // Compare password - const same = await bcrypt.compare(password, user.password); + const same = await bcrypt.compare(password, user.account.password); if (!same) { return rej('incorrect password'); diff --git a/src/api/endpoints/i/2fa/unregister.ts b/src/api/endpoints/i/2fa/unregister.ts index 6bee6a26f2..c43f9ccc44 100644 --- a/src/api/endpoints/i/2fa/unregister.ts +++ b/src/api/endpoints/i/2fa/unregister.ts @@ -11,7 +11,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => { if (passwordErr) return rej('invalid password param'); // Compare password - const same = await bcrypt.compare(password, user.password); + const same = await bcrypt.compare(password, user.account.password); if (!same) { return rej('incorrect password'); @@ -19,8 +19,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => { await User.update(user._id, { $set: { - two_factor_secret: null, - two_factor_enabled: false + 'account.two_factor_secret': null, + 'account.two_factor_enabled': false } }); |