From d9ca4e461188ea29bd16468367bd6f4609bdd02e Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Thu, 12 Feb 2026 20:16:34 +0800
Subject: [PATCH] fix(auth): address PR review on migration flow

---
 .../layer/main/src/lib/auth-cookie-migration.ts        | 10 +++++++---
 apps/mobile/src/initialize/index.ts                    |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/layer/main/src/lib/auth-cookie-migration.ts b/apps/desktop/layer/main/src/lib/auth-cookie-migration.ts
index b502ad0d7..9d5f88593 100644
--- a/apps/desktop/layer/main/src/lib/auth-cookie-migration.ts
+++ b/apps/desktop/layer/main/src/lib/auth-cookie-migration.ts
@@ -7,6 +7,10 @@ import { logger } from "../logger"
 const LEGACY_PROD_API_URL = "https://api.follow.is"
 const BETTER_AUTH_SESSION_DATA_COOKIE_NAME = "better-auth.session_data"
 
+const isBetterAuthSessionTokenCookie = (cookieName: string) => {
+  return cookieName.includes(BETTER_AUTH_COOKIE_NAME_SESSION_TOKEN)
+}
+
 const isBetterAuthSessionCookie = (cookieName: string) => {
   return (
     cookieName.includes(BETTER_AUTH_COOKIE_NAME_SESSION_TOKEN) ||
@@ -55,10 +59,10 @@ export const migrateAuthCookiesToNewApiDomain = async (
   const currentDomainCookies = await cookieSession.cookies.get({
     domain: currentHost,
   })
-  const hasCurrentDomainSessionCookie = currentDomainCookies.some((cookie) =>
-    isBetterAuthSessionCookie(cookie.name),
+  const hasCurrentDomainSessionTokenCookie = currentDomainCookies.some((cookie) =>
+    isBetterAuthSessionTokenCookie(cookie.name),
   )
-  if (hasCurrentDomainSessionCookie) {
+  if (hasCurrentDomainSessionTokenCookie) {
     return
   }
 
diff --git a/apps/mobile/src/initialize/index.ts b/apps/mobile/src/initialize/index.ts
index 570773486..bc7d58d1f 100644
--- a/apps/mobile/src/initialize/index.ts
+++ b/apps/mobile/src/initialize/index.ts
@@ -25,7 +25,9 @@ export const initializeApp = async () => {
 
   await initDeviceType()
   await initializeDB()
-  await apm("migrateLegacyApiSession", migrateLegacyApiSession)
+  void apm("migrateLegacyApiSession", migrateLegacyApiSession).catch((error) => {
+    console.error("migrateLegacyApiSession failed", error)
+  })
 
   await apm("migrateDatabase", migrateDatabase)
   initializeDayjs()