oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Pull Requests Packages Releases 2 Activity

fix(frontend/MkSignup): prevent uncaught errors from interrupted signup (#10265)

Browse Source 
* fix(frontend/MkSignup): prevent uncaught errors from interrupted signup

* nullable sitekey

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
This commit is contained in:
Kagami Sascha Rosylight 2023-03-11 06:32:13 +01:00 committed by GitHub
parent 4e7e377987
commit 1ea4469bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/src/components/MkCaptcha.vue
View File

@ -10,7 +10,8 @@ import { ref, shallowRef, computed, onMounted, onBeforeUnmount, watch } from 'vu
import { defaultStore } from '@/store';
import { i18n } from '@/i18n';
type Captcha = {
// 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;
@ -32,7 +33,7 @@ declare global {
const props = defineProps<{
provider: CaptchaProvider;
sitekey: string;
sitekey: string | null; // null will show error on request
modelValue?: string | null;
}>();

32
packages/frontend/src/components/MkSignup.vue
View File

@ -72,7 +72,7 @@ import { toUnicode } from 'punycode/';
import MkButton from './MkButton.vue';
import MkInput from './MkInput.vue';
import MkSwitch from './MkSwitch.vue';
import MkCaptcha from '@/components/MkCaptcha.vue';
import MkCaptcha, { type Captcha } from '@/components/MkCaptcha.vue';
import * as config from '@/config';
import * as os from '@/os';
import { login } from '@/account';
@ -92,9 +92,9 @@ const emit = defineEmits<{
const host = toUnicode(config.host);
let hcaptcha = $ref();
let recaptcha = $ref();
let turnstile = $ref();
let hcaptcha = $ref<Captcha | undefined>();
let recaptcha = $ref<Captcha | undefined>();
let turnstile = $ref<Captcha | undefined>();
let username: string = $ref('');
let password: string = $ref('');
@ -208,11 +208,12 @@ function onChangePasswordRetype(): void {
passwordRetypeState = password === retypedPassword ? 'match' : 'not-match';
}
function onSubmit(): void {
async function onSubmit(): Promise<void> {
if (submitting) return;
submitting = true;
os.api('signup', {
try {
await os.api('signup', {
username,
password,
emailAddress: email,
@ -220,7 +221,7 @@ function onSubmit(): void {
'hcaptcha-response': hCaptchaResponse,
'g-recaptcha-response': reCaptchaResponse,
'turnstile-response': turnstileResponse,
}).then(() => {
});
if (instance.emailRequiredForSignup) {
os.alert({
type: 'success',
@ -229,28 +230,27 @@ function onSubmit(): void {
});
emit('signupEmailPending');
} else {
os.api('signin', {
const res = await os.api('signin', {
username,
password,
}).then(res => {
});
emit('signup', res);
if (props.autoSet) {
login(res.i);
return login(res.i);
}
});
}
}).catch(() => {
} catch {
submitting = false;
hcaptcha.reset?.();
recaptcha.reset?.();
turnstile.reset?.();
hcaptcha?.reset?.();
recaptcha?.reset?.();
turnstile?.reset?.();
os.alert({
type: 'error',
text: i18n.ts.somethingHappened,
});
});
}
}
</script>