fix

Author: mattyatea

packages/backend/src/config.ts

@@ -72,7 +72,6 @@ type Source = {
 	rootUserName?: string;
 	rootPassword?: string;
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
-
 	objectStorage?: {
 		useObjectStorage: boolean;
 		objectStorageBaseUrl: string;
@@ -205,7 +204,6 @@ export type Config = {
 
 	version: string;
 	publishTarballInsteadOfProvideRepositoryUrl: boolean;
-	setupPassword: string | undefined;
 	host: string;
 	hostname: string;
 	scheme: string;
@@ -310,7 +308,6 @@ export function loadConfig(): Config {
 		version,
 		publishTarballInsteadOfProvideRepositoryUrl:
 			!!config.publishTarballInsteadOfProvideRepositoryUrl,
-		setupPassword: config.setupPassword,
 		url: url.origin,
 		port: config.port ?? parseInt(process.env.PORT ?? '', 10),
 		socket: config.socket,

packages/backend/src/server/api/endpoints/admin/accounts/create.ts

@@ -51,7 +51,6 @@ export const paramDef = {
 	properties: {
 		username: localUsernameSchema,
 		password: passwordSchema,
-		setupPassword: { type: 'string', nullable: true },
 	},
 	required: ['username', 'password'],
 } as const;
@@ -73,19 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const me = _me ? await this.usersRepository.findOneByOrFail({ id: _me.id }) : null;
 			const realUsers = await this.instanceActorService.realLocalUsersPresent();
 
-			if (!realUsers && me == null && token == null) {
-				// 初回セットアップの場合
-				if (this.config.setupPassword != null) {
-					// 初期パスワードが設定されている場合
-					if (ps.setupPassword !== this.config.setupPassword) {
-						// 初期パスワードが違う場合
-						throw new ApiError(meta.errors.wrongInitialPassword);
-					}
-				} else if (ps.setupPassword != null && ps.setupPassword.trim() !== '') {
-					// 初期パスワードが設定されていないのに初期パスワードが入力された場合
-					throw new ApiError(meta.errors.wrongInitialPassword);
-				}
-			} else if ((realUsers && !me?.isRoot) || token !== null) {
+			if ((realUsers && !me?.isRoot) || token !== null) {
 				// 初回セットアップではなく、管理者でない場合 or 外部トークンを使用している場合
 				throw new ApiError(meta.errors.accessDenied);
 			}

packages/frontend/src/pages/welcome.setup.vue

@@ -14,10 +14,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div class="_gaps_m" style="padding: 32px;">
 				<div>{{ i18n.ts.intro }}</div>
-				<MkInput v-model="setupPassword" type="password" data-cy-admin-initial-password>
-					<template #label>{{ i18n.ts.initialPasswordForSetup }} <div v-tooltip:dialog="i18n.ts.initialPasswordForSetupDescription" class="_button _help"><i class="ti ti-help-circle"></i></div></template>
-					<template #prefix><i class="ti ti-lock"></i></template>
-				</MkInput>
 				<MkInput v-model="username" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-admin-username>
 					<template #label>{{ i18n.ts.username }}</template>
 					<template #prefix>@</template>
@@ -51,7 +47,6 @@ import MkAnimBg from '@/components/MkAnimBg.vue';
 
 const username = ref('');
 const password = ref('');
-const setupPassword = ref('');
 const submitting = ref(false);
 
 function submit() {
@@ -61,7 +56,6 @@ function submit() {
 	misskeyApi('admin/accounts/create', {
 		username: username.value,
 		password: password.value,
-		setupPassword: setupPassword.value === '' ? null : setupPassword.value,
 	}).then(res => {
 		return login(res.token);
 	}).catch((err) => {