mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-23 00:29:22 +09:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

initialPassword -> setupPassword

Browse Source
This commit is contained in:
syuilo 2024-10-03 20:40:39 +09:00
parent 2a4ab0e187
commit d2175a9b9f
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/cypress-devcontainer.yml
View File

@ -13,7 +13,7 @@
# The provider of the service who sets up Misskey on behalf of the customer should # The provider of the service who sets up Misskey on behalf of the customer should
# set this value to something unique when generating the Misskey config file, # set this value to something unique when generating the Misskey config file,
# and provide it to the customer. # and provide it to the customer.
initialPassword: example_password_please_change_this_or_you_will_get_hacked setupPassword: example_password_please_change_this_or_you_will_get_hacked
# ┌─────┐ # ┌─────┐
#───┘ URL └───────────────────────────────────────────────────── #───┘ URL └─────────────────────────────────────────────────────

2
.config/example.yml
View File

@ -70,7 +70,7 @@
# The provider of the service who sets up Misskey on behalf of the customer should # The provider of the service who sets up Misskey on behalf of the customer should
# set this value to something unique when generating the Misskey config file, # set this value to something unique when generating the Misskey config file,
# and provide it to the customer. # and provide it to the customer.
initialPassword: example_password_please_change_this_or_you_will_get_hacked setupPassword: example_password_please_change_this_or_you_will_get_hacked
# ┌─────┐ # ┌─────┐
#───┘ URL └───────────────────────────────────────────────────── #───┘ URL └─────────────────────────────────────────────────────

6
packages/backend/src/config.ts
View File

@ -63,7 +63,7 @@ type Source = {
publishTarballInsteadOfProvideRepositoryUrl?: boolean; publishTarballInsteadOfProvideRepositoryUrl?: boolean;
initialPassword?: string; setupPassword?: string;
proxy?: string; proxy?: string;
proxySmtp?: string; proxySmtp?: string;
@ -154,7 +154,7 @@ export type Config = {
version: string; version: string;
publishTarballInsteadOfProvideRepositoryUrl: boolean; publishTarballInsteadOfProvideRepositoryUrl: boolean;
initialPassword: string | undefined; setupPassword: string | undefined;
host: string; host: string;
hostname: string; hostname: string;
scheme: string; scheme: string;
@ -235,7 +235,7 @@ export function loadConfig(): Config {
return { return {
version, version,
publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl, publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,
initialPassword: config.initialPassword, setupPassword: config.setupPassword,
url: url.origin, url: url.origin,
port: config.port ?? parseInt(process.env.PORT ?? '', 10), port: config.port ?? parseInt(process.env.PORT ?? '', 10),
socket: config.socket, socket: config.socket,

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

@ -51,7 +51,7 @@ export const paramDef = {
properties: { properties: {
username: localUsernameSchema, username: localUsernameSchema,
password: passwordSchema, password: passwordSchema,
initialPassword: { type: 'string', nullable: true }, setupPassword: { type: 'string', nullable: true },
}, },
required: ['username', 'password'], required: ['username', 'password'],
} as const; } as const;
@ -75,13 +75,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (!realUsers && me == null && token == null) { 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); 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); throw new ApiError(meta.errors.wrongInitialPassword);
} }

8
packages/frontend/src/pages/welcome.setup.vue
View File

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div> </div>
<div class="_gaps_m" style="padding: 32px;"> <div class="_gaps_m" style="padding: 32px;">
<div>{{ i18n.ts.intro }}</div> <div>{{ i18n.ts.intro }}</div>
<MkInput v-model="initialPassword" type="password" data-cy-admin-initial-password> <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 #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> <template #prefix><i class="ti ti-lock"></i></template>
</MkInput> </MkInput>
@ -40,9 +40,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import { host, version } from '@@/js/config.js';
import MkButton from '@/components/MkButton.vue'; import MkButton from '@/components/MkButton.vue';
import MkInput from '@/components/MkInput.vue'; import MkInput from '@/components/MkInput.vue';
import { host, version } from '@@/js/config.js';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/scripts/misskey-api.js';
import { login } from '@/account.js'; import { login } from '@/account.js';
@ -51,7 +51,7 @@ import MkAnimBg from '@/components/MkAnimBg.vue';
const username = ref(''); const username = ref('');
const password = ref(''); const password = ref('');
const initialPassword = ref(''); const setupPassword = ref('');
const submitting = ref(false); const submitting = ref(false);
function submit() { function submit() {
@ -61,7 +61,7 @@ function submit() {
misskeyApi('admin/accounts/create', { misskeyApi('admin/accounts/create', {
username: username.value, username: username.value,
password: password.value, password: password.value,
initialPassword: initialPassword.value === '' ? null : initialPassword.value, setupPassword: setupPassword.value === '' ? null : setupPassword.value,
}).then(res => { }).then(res => {
return login(res.token); return login(res.token);
}).catch((err) => { }).catch((err) => {

2
packages/misskey-js/src/autogen/types.ts
View File

@ -5611,7 +5611,7 @@ export type operations = {
'application/json': { 'application/json': {
username: string; username: string;
password: string; password: string;
initialPassword?: string | null; setupPassword?: string | null;
}; };
}; };
}; };