Remove @ts-expect-error

Author: LauraBeatris

packages/backend/src/tokens/authStatus.ts

@@ -27,7 +27,7 @@ export type SignedInState = {
   afterSignInUrl: string;
   afterSignUpUrl: string;
   isSignedIn: true;
-  toAuth: (opts?: PendingSessionOptions) => SignedInAuthObject;
+  toAuth: (opts?: PendingSessionOptions) => SignedInAuthObject | SignedOutAuthObject;
   headers: Headers;
   token: string;
 };
@@ -99,7 +99,6 @@ export function signedIn(
     afterSignInUrl: authenticateContext.afterSignInUrl || '',
     afterSignUpUrl: authenticateContext.afterSignUpUrl || '',
     isSignedIn: true,
-    // @ts-expect-error The return type is intentionally overridden here to support consumer-facing logic that treats pending sessions as signed out. This override does not affect internal session management like handshake flows.
     toAuth: ({ treatPendingAsSignedOut = true } = {}) => {
       if (treatPendingAsSignedOut && authObject.sessionStatus === 'pending') {
         return signedOutAuthObject(undefined, authObject.sessionStatus);

packages/backend/src/tokens/request.ts

@@ -463,13 +463,13 @@ export async function authenticateRequest(
         authenticateContext.sessionTokenInCookie!,
       );
 
+      const authObject = signedInRequestState.toAuth();
       // Org sync if necessary
-      const handshakeRequestState = handleMaybeOrganizationSyncHandshake(
-        authenticateContext,
-        signedInRequestState.toAuth(),
-      );
-      if (handshakeRequestState) {
-        return handshakeRequestState;
+      if (authObject.userId) {
+        const handshakeRequestState = handleMaybeOrganizationSyncHandshake(authenticateContext, authObject);
+        if (handshakeRequestState) {
+          return handshakeRequestState;
+        }
       }
 
       return signedInRequestState;