usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change(backend): メール認証の有効期限を30分で固定するように変更

This commit is contained in:
yukineko 2023-11-03 14:40:26 +09:00
parent 748dc3af28
commit af391f81c7
No known key found for this signature in database
GPG Key ID: E5BACB72109B7B90
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/backend/src/server/api/SignupApiService.ts
View File

@ -136,16 +136,16 @@ export class SignupApiService {
return; return;
} }
// メアド認証が有効かつ有効期限が0以外に設定されている場合 // メアド認証が有効の場合
if (instance.emailRequiredForSignup && instance.emailVerificationExpiresIn !== 0) { if (instance.emailRequiredForSignup) {
// メアド認証済みならエラー // メアド認証済みならエラー
if (ticket.usedBy) { if (ticket.usedBy) {
reply.code(400); reply.code(400);
return; return;
} }
// 認証しておらず、まだ有効期限内ならエラー // 認証しておらず、メール送信から30分以内ならエラー
if (ticket.usedAt && ticket.usedAt.getTime() + (instance.emailVerificationExpiresIn * 1000 * 60) > Date.now()) { if (ticket.usedAt && ticket.usedAt.getTime() + (1000 * 60 * 30) > Date.now()) {
reply.code(400); reply.code(400);
return; return;
} }
@ -235,10 +235,9 @@ export class SignupApiService {
const code = body['code']; const code = body['code'];
try { try {
const instance = await this.metaService.fetch(true);
const pendingUser = await this.userPendingsRepository.findOneByOrFail({ code }); const pendingUser = await this.userPendingsRepository.findOneByOrFail({ code });
if (instance.emailVerificationExpiresIn !== 0 && this.idService.parse(pendingUser.id).date.getTime() + (instance.emailVerificationExpiresIn * 1000 * 60) < Date.now()) { if (this.idService.parse(pendingUser.id).date.getTime() + (1000 * 60 * 30) < Date.now()) {
throw new FastifyReplyError(400, 'EXPIRED'); throw new FastifyReplyError(400, 'EXPIRED');
} }