From eec37470f9a999a5262192d687a4289d80f046ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 26 Nov 2022 01:02:12 +0800
Subject: [PATCH] fix: jump to home after user login

---
 composables/users.ts      | 6 +++---
 pages/signin/callback.vue | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/composables/users.ts b/composables/users.ts
index ad75d7ff..a9941940 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -27,9 +27,9 @@ export const currentInstance = computed<null | Instance>(() => currentUserId.val
 export const characterLimit = computed(() => currentInstance.value?.configuration.statuses.maxCharacters ?? DEFAULT_POST_CHARS_LIMIT)
 
 export async function loginTo(user: UserLogin & { account?: AccountCredentials }) {
-  const existing = users.value.findIndex(u => u.server === user.server && u.token === user.token)
-  if (existing !== -1) {
-    if (currentUserId.value === users.value[existing].account?.id)
+  const existing = users.value.find(u => u.server === user.server && u.token === user.token)
+  if (existing) {
+    if (currentUserId.value === existing.account?.id)
       return null
     currentUserId.value = user.account?.id
     await reloadPage()
diff --git a/pages/signin/callback.vue b/pages/signin/callback.vue
index 80663212..f95b7fe7 100644
--- a/pages/signin/callback.vue
+++ b/pages/signin/callback.vue
@@ -3,10 +3,12 @@ definePageMeta({
   layout: 'none',
 })
 
+const router = useRouter()
 const { query } = useRoute()
 
 onMounted(async () => {
   await loginTo(query as any)
+  router.push('/')
 })
 </script>