From f6ce95a146c1dbce5934a188c681647e5ec6e33d Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:26:58 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"add:=20meta=E3=81=ABemailVerification?= =?UTF-8?q?ExpiresIn=E3=82=92=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ceb6ccff51a406bfd87b4da6c59401ce5551dd95. --- .../1698912474617-enhance-mail-verification.js | 16 ---------------- packages/backend/src/models/Meta.ts | 6 ------ .../src/server/api/endpoints/admin/meta.ts | 5 ----- .../server/api/endpoints/admin/update-meta.ts | 5 ----- .../backend/src/server/api/endpoints/meta.ts | 5 ----- 5 files changed, 37 deletions(-) delete mode 100644 packages/backend/migration/1698912474617-enhance-mail-verification.js diff --git a/packages/backend/migration/1698912474617-enhance-mail-verification.js b/packages/backend/migration/1698912474617-enhance-mail-verification.js deleted file mode 100644 index 6d2e4b9a55..0000000000 --- a/packages/backend/migration/1698912474617-enhance-mail-verification.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and other misskey contributors - * SPDX-License-Identifier: AGPL-3.0-only - */ - -export class EnhanceMailVerification1698912474617 { - name = 'EnhanceMailVerification1698912474617' - - async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ADD "emailVerificationExpiresIn" integer NOT NULL DEFAULT '0'`); - } - - async down(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "emailVerificationExpiresIn"`); - } -} diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index 91a2495af2..360239f509 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -174,12 +174,6 @@ export class MiMeta { }) public emailRequiredForSignup: boolean; - @Column('integer', { - default: 0, - comment: 'The expiration time of email verification (unit: minute)', - }) - public emailVerificationExpiresIn: number; - @Column('boolean', { default: false, }) diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 4eb8f860d3..73c84a8674 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -32,10 +32,6 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, - emailVerificationExpiresIn: { - type: 'number', - optional: false, nullable: false, - }, enableHcaptcha: { type: 'boolean', optional: false, nullable: false, @@ -357,7 +353,6 @@ export default class extends Endpoint { // eslint- privacyPolicyUrl: instance.privacyPolicyUrl, disableRegistration: instance.disableRegistration, emailRequiredForSignup: instance.emailRequiredForSignup, - emailVerificationExpiresIn: instance.emailVerificationExpiresIn, enableHcaptcha: instance.enableHcaptcha, hcaptchaSiteKey: instance.hcaptchaSiteKey, enableRecaptcha: instance.enableRecaptcha, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 9a520d3dc8..c58569a31c 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -59,7 +59,6 @@ export const paramDef = { cacheRemoteFiles: { type: 'boolean' }, cacheRemoteSensitiveFiles: { type: 'boolean' }, emailRequiredForSignup: { type: 'boolean' }, - emailVerificationExpiresIn: { type: 'integer', minimum: 0 }, enableHcaptcha: { type: 'boolean' }, hcaptchaSiteKey: { type: 'string', nullable: true }, hcaptchaSecretKey: { type: 'string', nullable: true }, @@ -250,10 +249,6 @@ export default class extends Endpoint { // eslint- set.emailRequiredForSignup = ps.emailRequiredForSignup; } - if (ps.emailVerificationExpiresIn !== undefined) { - set.emailVerificationExpiresIn = ps.emailVerificationExpiresIn; - } - if (ps.enableHcaptcha !== undefined) { set.enableHcaptcha = ps.enableHcaptcha; } diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 9be0253a2e..2727e4f093 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -100,10 +100,6 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, - emailVerificationExpiresIn: { - type: 'number', - optional: false, nullable: false, - }, enableHcaptcha: { type: 'boolean', optional: false, nullable: false, @@ -312,7 +308,6 @@ export default class extends Endpoint { // eslint- privacyPolicyUrl: instance.privacyPolicyUrl, disableRegistration: instance.disableRegistration, emailRequiredForSignup: instance.emailRequiredForSignup, - emailVerificationExpiresIn: instance.emailVerificationExpiresIn, enableHcaptcha: instance.enableHcaptcha, hcaptchaSiteKey: instance.hcaptchaSiteKey, enableRecaptcha: instance.enableRecaptcha,