usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
kakkokari-gtyih 2024-10-04 20:17:02 +09:00
parent 73e063bcb7
commit 35dd85762d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/backend/src/server/api/SigninFlowApiService.ts
View File

@ -139,12 +139,12 @@ export class SigninFlowApiService {
return { return {
finished: false, finished: false,
next: 'password', next: 'password',
} satisfies Misskey.entities.SigninResponse; } satisfies Misskey.entities.SigninFlowResponse;
} else { } else {
return { return {
finished: false, finished: false,
next: 'captcha', next: 'captcha',
} satisfies Misskey.entities.SigninResponse; } satisfies Misskey.entities.SigninFlowResponse;
} }
} }
@ -251,7 +251,7 @@ export class SigninFlowApiService {
finished: false, finished: false,
next: 'passkey', next: 'passkey',
authRequest, authRequest,
} satisfies Misskey.entities.SigninResponse; } satisfies Misskey.entities.SigninFlowResponse;
} else { } else {
if (!same || !profile.twoFactorEnabled) { if (!same || !profile.twoFactorEnabled) {
return await fail(403, { return await fail(403, {
@ -262,7 +262,7 @@ export class SigninFlowApiService {
return { return {
finished: false, finished: false,
next: 'totp', next: 'totp',
} satisfies Misskey.entities.SigninResponse; } satisfies Misskey.entities.SigninFlowResponse;
} }
} }
// never get here // never get here

2
packages/backend/src/server/api/SigninService.ts
View File

@ -61,7 +61,7 @@ export class SigninService {
finished: true, finished: true,
id: user.id, id: user.id,
i: user.token!, i: user.token!,
} satisfies Misskey.entities.SigninResponse; } satisfies Misskey.entities.SigninFlowResponse;
} }
} }

6
packages/frontend/src/components/MkSignin.vue
View File

@ -83,7 +83,7 @@ import type { AuthenticationPublicKeyCredential } from '@github/webauthn-json/br
import type { OpenOnRemoteOptions } from '@/scripts/please-login.js'; import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'login', v: Misskey.entities.SigninResponse): void; (ev: 'login', v: Misskey.entities.SigninFlowResponse): void;
}>(); }>();
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
@ -212,7 +212,7 @@ async function onTotpSubmitted(token: string) {
} }
} }
async function tryLogin(req: Partial<Misskey.entities.SigninRequest>): Promise<Misskey.entities.SigninResponse> { async function tryLogin(req: Partial<Misskey.entities.SigninRequest>): Promise<Misskey.entities.SigninFlowResponse> {
const _req = { const _req = {
username: req.username ?? userInfo.value?.username, username: req.username ?? userInfo.value?.username,
...req, ...req,
@ -276,7 +276,7 @@ async function tryLogin(req: Partial<Misskey.entities.SigninRequest>): Promise<M
}); });
} }
async function onLoginSucceeded(res: Misskey.entities.SigninResponse & { finished: true; }) { async function onLoginSucceeded(res: Misskey.entities.SigninFlowResponse & { finished: true; }) {
if (props.autoSet) { if (props.autoSet) {
await login(res.i); await login(res.i);
} }

2
packages/frontend/src/components/MkSignupDialog.form.vue
View File

@ -98,7 +98,7 @@ const props = withDefaults(defineProps<{
}); });
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'signup', user: Misskey.entities.SigninResponse): void; (ev: 'signup', user: Misskey.entities.SigninFlowResponse): void;
(ev: 'signupEmailPending'): void; (ev: 'signupEmailPending'): void;
}>(); }>();

4
packages/frontend/src/components/MkSignupDialog.vue
View File

@ -47,7 +47,7 @@ const props = withDefaults(defineProps<{
}); });
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'done', res: Misskey.entities.SigninResponse): void; (ev: 'done', res: Misskey.entities.SigninFlowResponse): void;
(ev: 'closed'): void; (ev: 'closed'): void;
}>(); }>();
@ -55,7 +55,7 @@ const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
const isAcceptedServerRule = ref(false); const isAcceptedServerRule = ref(false);
function onSignup(res: Misskey.entities.SigninResponse) { function onSignup(res: Misskey.entities.SigninFlowResponse) {
emit('done', res); emit('done', res);
dialog.value?.close(); dialog.value?.close();
} }