summaryrefslogtreecommitdiff
path: root/packages/backend
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-10-03 20:40:39 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2024-10-03 20:40:39 +0900
commitd2175a9b9f6e38ca3ec0ca28b29d99f4b46f9dcd (patch)
treed6053894ad95062a120698512b123c2c2a6c3fe7 /packages/backend
parentfix(misskey-js): type fixes related to signup and signin (#14679) (diff)
downloadsharkey-d2175a9b9f6e38ca3ec0ca28b29d99f4b46f9dcd.tar.gz
sharkey-d2175a9b9f6e38ca3ec0ca28b29d99f4b46f9dcd.tar.bz2
sharkey-d2175a9b9f6e38ca3ec0ca28b29d99f4b46f9dcd.zip
initialPassword -> setupPassword
Diffstat (limited to 'packages/backend')
-rw-r--r--packages/backend/src/config.ts6
-rw-r--r--packages/backend/src/server/api/endpoints/admin/accounts/create.ts8
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index b320ce5403..42f1033b9d 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -63,7 +63,7 @@ type Source = {
publishTarballInsteadOfProvideRepositoryUrl?: boolean;
- initialPassword?: string;
+ setupPassword?: string;
proxy?: string;
proxySmtp?: string;
@@ -154,7 +154,7 @@ export type Config = {
version: string;
publishTarballInsteadOfProvideRepositoryUrl: boolean;
- initialPassword: string | undefined;
+ setupPassword: string | undefined;
host: string;
hostname: string;
scheme: string;
@@ -235,7 +235,7 @@ export function loadConfig(): Config {
return {
version,
publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,
- initialPassword: config.initialPassword,
+ setupPassword: config.setupPassword,
url: url.origin,
port: config.port ?? parseInt(process.env.PORT ?? '', 10),
socket: config.socket,
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
index bddf7f45d3..d30131a62f 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -51,7 +51,7 @@ export const paramDef = {
properties: {
username: localUsernameSchema,
password: passwordSchema,
- initialPassword: { type: 'string', nullable: true },
+ setupPassword: { type: 'string', nullable: true },
},
required: ['username', 'password'],
} as const;
@@ -75,13 +75,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (!realUsers && me == null && token == null) {
// 初回セットアップの場合
- if (this.config.initialPassword != null) {
+ if (this.config.setupPassword != null) {
// 初期パスワードが設定されている場合
- if (ps.initialPassword !== this.config.initialPassword) {
+ if (ps.setupPassword !== this.config.setupPassword) {
// 初期パスワードが違う場合
throw new ApiError(meta.errors.wrongInitialPassword);
}
- } else if (ps.initialPassword != null && ps.initialPassword.trim() !== '') {
+ } else if (ps.setupPassword != null && ps.setupPassword.trim() !== '') {
// 初期パスワードが設定されていないのに初期パスワードが入力された場合
throw new ApiError(meta.errors.wrongInitialPassword);
}