fix: ios logout issues (#3794)

Co-authored-by: Ido Shamun <1993245+idoshamun@users.noreply.github.com>

Author: rebelchris

__tests__/routes/betterAuth.ts

@@ -65,7 +65,7 @@ describe('betterAuth routes', () => {
         modelName: 'ba_session',
         storeSessionInDatabase: true,
         expiresIn: 30 * 24 * 60 * 60,
-        updateAge: 24 * 60 * 60,
+        updateAge: 12 * 60 * 60,
       });
     });
 

src/betterAuth.ts

@@ -12,7 +12,7 @@ import { triggerTypedEvent } from './common/typedPubsub';
 import { sendEmail, CioTransactionalMessageTemplateId } from './common/mailing';
 import { handleRegex } from './common/object';
 import { validateAndTransformHandle } from './common/handles';
-import { ONE_DAY_IN_SECONDS, ONE_MONTH_IN_SECONDS } from './common/constants';
+import { ONE_MONTH_IN_SECONDS, ONE_HOUR_IN_SECONDS } from './common/constants';
 import { singleRedisClient } from './redis';
 import { User } from './entity/user/User';
 import { cookies, extractRootDomain } from './cookies';
@@ -399,7 +399,7 @@ export const getBetterAuthOptions = (pool: Pool): BetterAuthOptions => {
       modelName: 'ba_session',
       storeSessionInDatabase: true,
       expiresIn: ONE_MONTH_IN_SECONDS,
-      updateAge: ONE_DAY_IN_SECONDS,
+      updateAge: 12 * ONE_HOUR_IN_SECONDS,
     },
     account: {
       modelName: 'ba_account',

src/routes/boot.ts

@@ -93,6 +93,7 @@ import {
 } from '../common/profile/completion';
 import { getUnreadNotificationsCount } from '../notifications/common';
 import { unwrapArray } from '../common/array';
+import { asyncRetry } from '../integrations/retry';
 
 export type BootSquadSource = Omit<GQLSource, 'currentMember'> & {
   permalink: string;
@@ -925,12 +926,17 @@ export const getBootData = async (
 
   const baSessionCookie = req.cookies[cookies.authSession.key];
   if (baSessionCookie) {
+    let sessionInvalid = false;
     try {
-      const session = (await getBetterAuth().api.getSession({
-        headers: fromNodeHeaders(
-          req.headers as Record<string, string | string[] | undefined>,
-        ),
-      })) as BetterAuthSession | null;
+      const session = (await asyncRetry(
+        () =>
+          getBetterAuth().api.getSession({
+            headers: fromNodeHeaders(
+              req.headers as Record<string, string | string[] | undefined>,
+            ),
+          }),
+        { retries: 3 },
+      )) as BetterAuthSession | null;
 
       if (session) {
         req.userId = session.user.id;
@@ -947,14 +953,18 @@ export const getBootData = async (
       }
 
       req.log.warn('BetterAuth getSession returned null');
+      sessionInvalid = true;
     } catch (error) {
       req.log.error(
         { err: error instanceof Error ? error.message : String(error) },
         'BetterAuth session validation failed',
       );
     }
-    req.log.warn('BetterAuth session cookie present but validation failed');
-    setCookie(req, res, 'authSession', undefined);
+
+    if (sessionInvalid) {
+      req.log.warn('BetterAuth session cookie present but session invalid');
+      setCookie(req, res, 'authSession', undefined);
+    }
   }
 
   if (req.userId && req.accessToken?.expiresIn) {