mirror of
https://github.com/RSSNext/Folo.git
synced 2026-10-17 05:08:13 +08:00
fix(auth): address PR review on migration flow
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user