a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
152 lines
4 KiB
Vue
152 lines
4 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div>
|
|
<span v-if="!available">Loading<MkEllipsis/></span>
|
|
<div v-if="props.provider == 'mcaptcha'">
|
|
<div id="mcaptcha__widget-container" class="m-captcha-style"></div>
|
|
<div ref="captchaEl"></div>
|
|
</div>
|
|
<div v-else ref="captchaEl"></div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { ref, shallowRef, computed, onMounted, onBeforeUnmount, watch, onUnmounted } from 'vue';
|
|
import { defaultStore } from '@/store.js';
|
|
|
|
// APIs provided by Captcha services
|
|
export type Captcha = {
|
|
render(container: string | Node, options: {
|
|
readonly [_ in 'sitekey' | 'theme' | 'type' | 'size' | 'tabindex' | 'callback' | 'expired' | 'expired-callback' | 'error-callback' | 'endpoint']?: unknown;
|
|
}): string;
|
|
remove(id: string): void;
|
|
execute(id: string): void;
|
|
reset(id?: string): void;
|
|
getResponse(id: string): string;
|
|
};
|
|
|
|
export type CaptchaProvider = 'hcaptcha' | 'recaptcha' | 'turnstile' | 'mcaptcha';
|
|
|
|
type CaptchaContainer = {
|
|
readonly [_ in CaptchaProvider]?: Captcha;
|
|
};
|
|
|
|
declare global {
|
|
interface Window extends CaptchaContainer { }
|
|
}
|
|
|
|
const props = defineProps<{
|
|
provider: CaptchaProvider;
|
|
sitekey: string | null; // null will show error on request
|
|
instanceUrl?: string | null;
|
|
modelValue?: string | null;
|
|
}>();
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'update:modelValue', v: string | null): void;
|
|
}>();
|
|
|
|
const available = ref(false);
|
|
|
|
const captchaEl = shallowRef<HTMLDivElement | undefined>();
|
|
|
|
const variable = computed(() => {
|
|
switch (props.provider) {
|
|
case 'hcaptcha': return 'hcaptcha';
|
|
case 'recaptcha': return 'grecaptcha';
|
|
case 'turnstile': return 'turnstile';
|
|
case 'mcaptcha': return 'mcaptcha';
|
|
}
|
|
});
|
|
|
|
const loaded = !!window[variable.value];
|
|
|
|
const src = computed(() => {
|
|
switch (props.provider) {
|
|
case 'hcaptcha': return 'https://js.hcaptcha.com/1/api.js?render=explicit&recaptchacompat=off';
|
|
case 'recaptcha': return 'https://www.recaptcha.net/recaptcha/api.js?render=explicit';
|
|
case 'turnstile': return 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit';
|
|
case 'mcaptcha': return null;
|
|
}
|
|
});
|
|
|
|
const scriptId = computed(() => `script-${props.provider}`);
|
|
|
|
const captcha = computed<Captcha>(() => window[variable.value] || {} as unknown as Captcha);
|
|
|
|
if (loaded || props.provider === 'mcaptcha') {
|
|
available.value = true;
|
|
} else if (src.value !== null) {
|
|
(document.getElementById(scriptId.value) ?? document.head.appendChild(Object.assign(document.createElement('script'), {
|
|
async: true,
|
|
id: scriptId.value,
|
|
src: src.value,
|
|
})))
|
|
.addEventListener('load', () => available.value = true);
|
|
}
|
|
|
|
function reset() {
|
|
if (captcha.value.reset) captcha.value.reset();
|
|
}
|
|
|
|
async function requestRender() {
|
|
if (captcha.value.render && captchaEl.value instanceof Element) {
|
|
captcha.value.render(captchaEl.value, {
|
|
sitekey: props.sitekey,
|
|
theme: defaultStore.state.darkMode ? 'dark' : 'light',
|
|
callback: callback,
|
|
'expired-callback': callback,
|
|
'error-callback': callback,
|
|
});
|
|
} else if (props.provider === 'mcaptcha' && props.instanceUrl && props.sitekey) {
|
|
const { default: Widget } = await import('@mcaptcha/vanilla-glue');
|
|
// @ts-expect-error avoid typecheck error
|
|
new Widget({
|
|
siteKey: {
|
|
instanceUrl: new URL(props.instanceUrl),
|
|
key: props.sitekey,
|
|
},
|
|
});
|
|
} else {
|
|
window.setTimeout(requestRender, 1);
|
|
}
|
|
}
|
|
|
|
function callback(response?: string) {
|
|
emit('update:modelValue', typeof response === 'string' ? response : null);
|
|
}
|
|
|
|
function onReceivedMessage(message: MessageEvent) {
|
|
if (message.data.token) {
|
|
if (props.instanceUrl && new URL(message.origin).host === new URL(props.instanceUrl).host) {
|
|
callback(<string>message.data.token);
|
|
}
|
|
}
|
|
}
|
|
|
|
onMounted(() => {
|
|
if (available.value) {
|
|
window.addEventListener('message', onReceivedMessage);
|
|
requestRender();
|
|
} else {
|
|
watch(available, requestRender);
|
|
}
|
|
});
|
|
|
|
onUnmounted(() => {
|
|
window.removeEventListener('message', onReceivedMessage);
|
|
});
|
|
|
|
onBeforeUnmount(() => {
|
|
reset();
|
|
});
|
|
|
|
defineExpose({
|
|
reset,
|
|
});
|
|
|
|
</script>
|