From af391f81c7012f0262fd4866d401bc0ec2aaee4b Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:40:26 +0900 Subject: [PATCH] =?UTF-8?q?change(backend):=20=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E8=AA=8D=E8=A8=BC=E3=81=AE=E6=9C=89=E5=8A=B9=E6=9C=9F=E9=99=90?= =?UTF-8?q?=E3=82=9230=E5=88=86=E3=81=A7=E5=9B=BA=E5=AE=9A=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/server/api/SignupApiService.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts index c72420689f..d6f4df7f13 100644 --- a/packages/backend/src/server/api/SignupApiService.ts +++ b/packages/backend/src/server/api/SignupApiService.ts @@ -136,16 +136,16 @@ export class SignupApiService { return; } - // メアド認証が有効かつ有効期限が0以外に設定されている場合 - if (instance.emailRequiredForSignup && instance.emailVerificationExpiresIn !== 0) { + // メアド認証が有効の場合 + if (instance.emailRequiredForSignup) { // メアド認証済みならエラー if (ticket.usedBy) { reply.code(400); return; } - // 認証しておらず、まだ有効期限内ならエラー - if (ticket.usedAt && ticket.usedAt.getTime() + (instance.emailVerificationExpiresIn * 1000 * 60) > Date.now()) { + // 認証しておらず、メール送信から30分以内ならエラー + if (ticket.usedAt && ticket.usedAt.getTime() + (1000 * 60 * 30) > Date.now()) { reply.code(400); return; } @@ -235,10 +235,9 @@ export class SignupApiService { const code = body['code']; try { - const instance = await this.metaService.fetch(true); 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'); }