From 35dd85762de4cef91492da7cba9f973b97fe2e5e Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:17:02 +0900
Subject: [PATCH] fix

---
 packages/backend/src/server/api/SigninFlowApiService.ts  | 8 ++++----
 packages/backend/src/server/api/SigninService.ts         | 2 +-
 packages/frontend/src/components/MkSignin.vue            | 6 +++---
 packages/frontend/src/components/MkSignupDialog.form.vue | 2 +-
 packages/frontend/src/components/MkSignupDialog.vue      | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/SigninFlowApiService.ts b/packages/backend/src/server/api/SigninFlowApiService.ts
index 84a31df10b..377c4b4adf 100644
--- a/packages/backend/src/server/api/SigninFlowApiService.ts
+++ b/packages/backend/src/server/api/SigninFlowApiService.ts
@@ -139,12 +139,12 @@ export class SigninFlowApiService {
 				return {
 					finished: false,
 					next: 'password',
-				} satisfies Misskey.entities.SigninResponse;
+				} satisfies Misskey.entities.SigninFlowResponse;
 			} else {
 				return {
 					finished: false,
 					next: 'captcha',
-				} satisfies Misskey.entities.SigninResponse;
+				} satisfies Misskey.entities.SigninFlowResponse;
 			}
 		}
 
@@ -251,7 +251,7 @@ export class SigninFlowApiService {
 				finished: false,
 				next: 'passkey',
 				authRequest,
-			} satisfies Misskey.entities.SigninResponse;
+			} satisfies Misskey.entities.SigninFlowResponse;
 		} else {
 			if (!same || !profile.twoFactorEnabled) {
 				return await fail(403, {
@@ -262,7 +262,7 @@ export class SigninFlowApiService {
 				return {
 					finished: false,
 					next: 'totp',
-				} satisfies Misskey.entities.SigninResponse;
+				} satisfies Misskey.entities.SigninFlowResponse;
 			}
 		}
 		// never get here
diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts
index 82d3ca1546..640356b50c 100644
--- a/packages/backend/src/server/api/SigninService.ts
+++ b/packages/backend/src/server/api/SigninService.ts
@@ -61,7 +61,7 @@ export class SigninService {
 			finished: true,
 			id: user.id,
 			i: user.token!,
-		} satisfies Misskey.entities.SigninResponse;
+		} satisfies Misskey.entities.SigninFlowResponse;
 	}
 }
 
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 0f2812c186..f41722dbc5 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -83,7 +83,7 @@ import type { AuthenticationPublicKeyCredential } from '@github/webauthn-json/br
 import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
 
 const emit = defineEmits<{
-	(ev: 'login', v: Misskey.entities.SigninResponse): void;
+	(ev: 'login', v: Misskey.entities.SigninFlowResponse): void;
 }>();
 
 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 = {
 		username: req.username ?? userInfo.value?.username,
 		...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) {
 		await login(res.i);
 	}
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index 85b59bcb0c..ff096dc729 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -98,7 +98,7 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'signup', user: Misskey.entities.SigninResponse): void;
+	(ev: 'signup', user: Misskey.entities.SigninFlowResponse): void;
 	(ev: 'signupEmailPending'): void;
 }>();
 
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index 97310d32a6..4cccd99492 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -47,7 +47,7 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'done', res: Misskey.entities.SigninResponse): void;
+	(ev: 'done', res: Misskey.entities.SigninFlowResponse): void;
 	(ev: 'closed'): void;
 }>();
 
@@ -55,7 +55,7 @@ const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 
 const isAcceptedServerRule = ref(false);
 
-function onSignup(res: Misskey.entities.SigninResponse) {
+function onSignup(res: Misskey.entities.SigninFlowResponse) {
 	emit('done', res);
 	dialog.value?.close();
 }