
* wip
* wip
* wip
* test
* wip rollup pluginでsearchIndexの情報生成
* wip
* SPDX
* wip: markerIdを自動付与
* rollupでビルド時・devモード時に毎回uuidを生成するように
* 開発サーバーでだけ必要な挙動は開発サーバーのみで
* 条件が逆
* wip: childrenの生成
* update comment
* update comment
* rename auto generated file
* hashをパスと行数から決定
* Update privacy.vue
* Update privacy.vue
* wip
* Update general.vue
* Update general.vue
* wip
* wip
* Update SearchMarker.vue
* wip
* Update profile.vue
* Update mute-block.vue
* Update mute-block.vue
* Update general.vue
* Update general.vue
* childrenがduplicate key errorを吐く問題をいったん解決
* マーカーの形を成形
* loggerを置きかえ
* とりあえず省略記法に対応
* Refactor and Format codes
* wip
* Update settings-search-index.ts
* wip
* wip
* とりあえず不確定要因の仮置きidを削除
* hashの生成を正規化(絶対パスになっていたのを緩和)
* pathの入力を省略可能に
* adminでもパス生成できるように
* Update settings-search-index.ts
* Update privacy.vue
* wip
* build searchIndex
* wip
* build
* Update general.vue
* build
* Update sounds.vue
* build
* build
* Update sounds.vue
* 🎨
* 🎨
* Update privacy.vue
* Update privacy.vue
* Update security.vue
* create-search-indexを多少改善
* build
* Update 2fa.vue
* wip
* 必ずtransformCodeCacheを利用するように, キャッシュの明確な受け渡しを定義
* キャッシュはdevServerでなくても更新
* Revert "wip"
This reverts commit 41bffd3a13
.
* inlining
* wip
* Update theme.vue
* 🎨
* wip normalize
* Update theme.vue
* キャッシュのパス変換
* build
* wip
* wip
* Update SearchMarker.vue
* i18n.ts['key'] の形式が取り出せない問題のFix
* build
* 仮でpath入れ
* 必ず絶対パスが使われるように
* wip
* 🎨
* storybookビルド時はcreateSearchIndexをしない
* inliningの構造化
* format code
* Update index.vue
* wip
* wip
* 🎨
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* clean up
* Update navbar.vue
* enhance: 検索で上下矢印を使用することで検索結果を移動できるように
* refactor
* fix(frontend): PageWindowでSearchMarkerが動作するように
* enhance(frontend): SearchMarkerの点滅を一定時間で止める
* lint fix
* fix: 子要素監視が抜けていたのを修正
* アニメーションの回数はCSSで制御するように
* refactor
* enhance(frontend): 検索インデックス作成時のログを削減
* revert
* fix
* fix
---------
Co-authored-by: tai-cha <dev@taichan.site>
Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
238 lines
7.4 KiB
Vue
238 lines
7.4 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<SearchMarker markerId="2fa" :keywords="['2fa']">
|
|
<FormSection :first="first">
|
|
<template #label><SearchLabel>{{ i18n.ts['2fa'] }}</SearchLabel></template>
|
|
|
|
<div v-if="$i" class="_gaps_s">
|
|
<MkInfo v-if="$i.twoFactorEnabled && $i.twoFactorBackupCodesStock === 'partial'" warn>
|
|
{{ i18n.ts._2fa.backupCodeUsedWarning }}
|
|
</MkInfo>
|
|
<MkInfo v-if="$i.twoFactorEnabled && $i.twoFactorBackupCodesStock === 'none'" warn>
|
|
{{ i18n.ts._2fa.backupCodesExhaustedWarning }}
|
|
</MkInfo>
|
|
|
|
<SearchMarker :keywords="['totp', 'app']">
|
|
<MkFolder :defaultOpen="true">
|
|
<template #icon><i class="ti ti-shield-lock"></i></template>
|
|
<template #label><SearchLabel>{{ i18n.ts.totp }}</SearchLabel></template>
|
|
<template #caption><SearchKeyword>{{ i18n.ts.totpDescription }}</SearchKeyword></template>
|
|
<template #suffix><i v-if="$i.twoFactorEnabled" class="ti ti-check" style="color: var(--MI_THEME-success)"></i></template>
|
|
|
|
<div v-if="$i.twoFactorEnabled" class="_gaps_s">
|
|
<div v-text="i18n.ts._2fa.alreadyRegistered"/>
|
|
<template v-if="$i.securityKeysList.length > 0">
|
|
<MkButton @click="renewTOTP">{{ i18n.ts._2fa.renewTOTP }}</MkButton>
|
|
<MkInfo>{{ i18n.ts._2fa.whyTOTPOnlyRenew }}</MkInfo>
|
|
</template>
|
|
<MkButton v-else danger @click="unregisterTOTP">{{ i18n.ts.unregister }}</MkButton>
|
|
</div>
|
|
|
|
<div v-else-if="!$i.twoFactorEnabled" class="_gaps_s">
|
|
<MkButton primary gradate @click="registerTOTP">{{ i18n.ts._2fa.registerTOTP }}</MkButton>
|
|
<MkLink url="https://misskey-hub.net/docs/for-users/stepped-guides/how-to-enable-2fa/" target="_blank"><i class="ti ti-help-circle"></i> {{ i18n.ts.learnMore }}</MkLink>
|
|
</div>
|
|
</MkFolder>
|
|
</SearchMarker>
|
|
|
|
<SearchMarker :keywords="['security', 'key', 'passkey']">
|
|
<MkFolder>
|
|
<template #icon><i class="ti ti-key"></i></template>
|
|
<template #label><SearchLabel>{{ i18n.ts.securityKeyAndPasskey }}</SearchLabel></template>
|
|
<div class="_gaps_s">
|
|
<MkInfo>
|
|
{{ i18n.ts._2fa.securityKeyInfo }}
|
|
</MkInfo>
|
|
|
|
<MkInfo v-if="!webAuthnSupported()" warn>
|
|
{{ i18n.ts._2fa.securityKeyNotSupported }}
|
|
</MkInfo>
|
|
|
|
<MkInfo v-else-if="webAuthnSupported() && !$i.twoFactorEnabled" warn>
|
|
{{ i18n.ts._2fa.registerTOTPBeforeKey }}
|
|
</MkInfo>
|
|
|
|
<template v-else>
|
|
<MkButton primary @click="addSecurityKey">{{ i18n.ts._2fa.registerSecurityKey }}</MkButton>
|
|
<MkFolder v-for="key in $i.securityKeysList" :key="key.id">
|
|
<template #label>{{ key.name }}</template>
|
|
<template #suffix><I18n :src="i18n.ts.lastUsedAt"><template #t><MkTime :time="key.lastUsed"/></template></I18n></template>
|
|
<div class="_buttons">
|
|
<MkButton @click="renameKey(key)"><i class="ti ti-forms"></i> {{ i18n.ts.rename }}</MkButton>
|
|
<MkButton danger @click="unregisterKey(key)"><i class="ti ti-trash"></i> {{ i18n.ts.unregister }}</MkButton>
|
|
</div>
|
|
</MkFolder>
|
|
</template>
|
|
</div>
|
|
</MkFolder>
|
|
</SearchMarker>
|
|
|
|
<SearchMarker :keywords="['password', 'less', 'key', 'passkey', 'login', 'signin']">
|
|
<MkSwitch :disabled="!$i.twoFactorEnabled || $i.securityKeysList.length === 0" :modelValue="usePasswordLessLogin" @update:modelValue="v => updatePasswordLessLogin(v)">
|
|
<template #label><SearchLabel>{{ i18n.ts.passwordLessLogin }}</SearchLabel></template>
|
|
<template #caption><SearchKeyword>{{ i18n.ts.passwordLessLoginDescription }}</SearchKeyword></template>
|
|
</MkSwitch>
|
|
</SearchMarker>
|
|
</div>
|
|
</FormSection>
|
|
</SearchMarker>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { defineAsyncComponent, computed } from 'vue';
|
|
import { supported as webAuthnSupported, create as webAuthnCreate, parseCreationOptionsFromJSON } from '@github/webauthn-json/browser-ponyfill';
|
|
import MkButton from '@/components/MkButton.vue';
|
|
import MkInfo from '@/components/MkInfo.vue';
|
|
import MkSwitch from '@/components/MkSwitch.vue';
|
|
import FormSection from '@/components/form/section.vue';
|
|
import MkFolder from '@/components/MkFolder.vue';
|
|
import MkLink from '@/components/MkLink.vue';
|
|
import * as os from '@/os.js';
|
|
import { signinRequired, updateAccountPartial } from '@/account.js';
|
|
import { i18n } from '@/i18n.js';
|
|
|
|
const $i = signinRequired();
|
|
|
|
// メモ: 各エンドポイントはmeUpdatedを発行するため、refreshAccountは不要
|
|
|
|
withDefaults(defineProps<{
|
|
first?: boolean;
|
|
}>(), {
|
|
first: false,
|
|
});
|
|
|
|
const usePasswordLessLogin = computed(() => $i.usePasswordLessLogin ?? false);
|
|
|
|
async function registerTOTP(): Promise<void> {
|
|
const auth = await os.authenticateDialog();
|
|
if (auth.canceled) return;
|
|
|
|
const twoFactorData = await os.apiWithDialog('i/2fa/register', {
|
|
password: auth.result.password,
|
|
token: auth.result.token,
|
|
});
|
|
|
|
const { dispose } = os.popup(defineAsyncComponent(() => import('./2fa.qrdialog.vue')), {
|
|
twoFactorData,
|
|
}, {
|
|
closed: () => dispose(),
|
|
});
|
|
}
|
|
|
|
async function unregisterTOTP(): Promise<void> {
|
|
const auth = await os.authenticateDialog();
|
|
if (auth.canceled) return;
|
|
|
|
os.apiWithDialog('i/2fa/unregister', {
|
|
password: auth.result.password,
|
|
token: auth.result.token,
|
|
}).then(res => {
|
|
updateAccountPartial({
|
|
twoFactorEnabled: false,
|
|
});
|
|
}).catch(error => {
|
|
os.alert({
|
|
type: 'error',
|
|
text: error,
|
|
});
|
|
});
|
|
}
|
|
|
|
function renewTOTP(): void {
|
|
os.confirm({
|
|
type: 'question',
|
|
title: i18n.ts._2fa.renewTOTP,
|
|
text: i18n.ts._2fa.renewTOTPConfirm,
|
|
okText: i18n.ts._2fa.renewTOTPOk,
|
|
cancelText: i18n.ts._2fa.renewTOTPCancel,
|
|
}).then(({ canceled }) => {
|
|
if (canceled) return;
|
|
registerTOTP();
|
|
});
|
|
}
|
|
|
|
async function unregisterKey(key) {
|
|
const confirm = await os.confirm({
|
|
type: 'question',
|
|
title: i18n.ts._2fa.removeKey,
|
|
text: i18n.tsx._2fa.removeKeyConfirm({ name: key.name }),
|
|
});
|
|
if (confirm.canceled) return;
|
|
|
|
const auth = await os.authenticateDialog();
|
|
if (auth.canceled) return;
|
|
|
|
await os.apiWithDialog('i/2fa/remove-key', {
|
|
password: auth.result.password,
|
|
token: auth.result.token,
|
|
credentialId: key.id,
|
|
});
|
|
os.success();
|
|
}
|
|
|
|
async function renameKey(key) {
|
|
const name = await os.inputText({
|
|
title: i18n.ts.rename,
|
|
default: key.name,
|
|
type: 'text',
|
|
minLength: 1,
|
|
maxLength: 30,
|
|
});
|
|
if (name.canceled) return;
|
|
|
|
await os.apiWithDialog('i/2fa/update-key', {
|
|
name: name.result,
|
|
credentialId: key.id,
|
|
});
|
|
}
|
|
|
|
async function addSecurityKey() {
|
|
const auth = await os.authenticateDialog();
|
|
if (auth.canceled) return;
|
|
|
|
const registrationOptions = parseCreationOptionsFromJSON({
|
|
publicKey: await os.apiWithDialog('i/2fa/register-key', {
|
|
password: auth.result.password,
|
|
token: auth.result.token,
|
|
}),
|
|
});
|
|
|
|
const name = await os.inputText({
|
|
title: i18n.ts._2fa.registerSecurityKey,
|
|
text: i18n.ts._2fa.securityKeyName,
|
|
type: 'text',
|
|
minLength: 1,
|
|
maxLength: 30,
|
|
});
|
|
if (name.canceled) return;
|
|
|
|
const credential = await os.promiseDialog(
|
|
webAuthnCreate(registrationOptions),
|
|
null,
|
|
() => {}, // ユーザーのキャンセルはrejectなのでエラーダイアログを出さない
|
|
i18n.ts._2fa.tapSecurityKey,
|
|
);
|
|
if (!credential) return;
|
|
|
|
const auth2 = await os.authenticateDialog();
|
|
if (auth2.canceled) return;
|
|
|
|
await os.apiWithDialog('i/2fa/key-done', {
|
|
password: auth.result.password,
|
|
token: auth.result.token,
|
|
name: name.result,
|
|
credential: credential.toJSON(),
|
|
});
|
|
}
|
|
|
|
async function updatePasswordLessLogin(value: boolean) {
|
|
await os.apiWithDialog('i/2fa/password-less', {
|
|
value,
|
|
});
|
|
}
|
|
</script>
|