graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 10:53:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Better error handling

Browse source
This commit is contained in:
syuilo 2019-06-18 13:58:59 +09:00
parent 285d0d13f9
commit 1a984de8e8
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/server/api/endpoints/i/update-email.ts
View file

@ -8,6 +8,7 @@ import * as bcrypt from 'bcryptjs';
import { Users, UserProfiles } from '../../../../models'; import { Users, UserProfiles } from '../../../../models';
import { ensure } from '../../../../prelude/ensure'; import { ensure } from '../../../../prelude/ensure';
import { sendEmail } from '../../../../services/send-email'; import { sendEmail } from '../../../../services/send-email';
import { ApiError } from '../../error';
export const meta = { export const meta = {
requireCredential: true, requireCredential: true,
@ -27,6 +28,14 @@ export const meta = {
email: { email: {
validator: $.optional.nullable.str validator: $.optional.nullable.str
}, },
},
errors: {
incorrectPassword: {
message: 'Incorrect password.',
code: 'INCORRECT_PASSWORD',
id: 'e54c1d7e-e7d6-4103-86b6-0a95069b4ad3'
},
} }
}; };
@ -37,7 +46,7 @@ export default define(meta, async (ps, user) => {
const same = await bcrypt.compare(ps.password, profile.password!); const same = await bcrypt.compare(ps.password, profile.password!);
if (!same) { if (!same) {
throw new Error('incorrect password'); throw new ApiError(meta.errors.incorrectPassword);
} }
await UserProfiles.update({ userId: user.id }, { await UserProfiles.update({ userId: user.id }, {