chore: address conflicts

Author: wobsoriano

packages/backend/src/tokens/__tests__/request.test.ts

@@ -16,7 +16,8 @@ import type { AuthReason } from '../authStatus';
 import { AuthErrorReason, AuthStatus } from '../authStatus';
 import { OrganizationMatcher } from '../organizationMatcher';
 import { authenticateRequest, RefreshTokenErrorReason } from '../request';
-import type { AuthenticateRequestOptions, MachineTokenType } from '../types';
+import type { MachineTokenType } from '../tokenTypes';
+import type { AuthenticateRequestOptions } from '../types';
 
 const PK_TEST = 'pk_test_Y2xlcmsuaW5zcGlyZWQucHVtYS03NC5sY2wuZGV2JA';
 const PK_LIVE = 'pk_live_Y2xlcmsuaW5zcGlyZWQucHVtYS03NC5sY2wuZGV2JA';

packages/backend/src/tokens/authObjects.ts

@@ -11,9 +11,8 @@ import type {
 import type { APIKey, CreateBackendApiOptions, MachineToken } from '../api';
 import { createBackendApiClient } from '../api';
 import type { AuthenticateContext } from './authenticateContext';
-import type { MachineTokenType, SessionTokenType } from './tokenTypes';
+import type { MachineAuthType, MachineTokenType, SessionTokenType } from './tokenTypes';
 import { TokenType } from './tokenTypes';
-import type { MachineAuthType } from './types';
 
 type AuthObjectDebugData = Record<string, any>;
 type AuthObjectDebug = () => AuthObjectDebugData;

packages/backend/src/tokens/authStatus.ts

@@ -15,9 +15,8 @@ import {
   signedOutAuthObject,
   unauthenticatedMachineObject,
 } from './authObjects';
-import type { MachineTokenType, SessionTokenType } from './tokenTypes';
+import type { MachineAuthType, MachineTokenType, SessionTokenType } from './tokenTypes';
 import { TokenType } from './tokenTypes';
-import type { MachineAuthType } from './types';
 
 export const AuthStatus = {
   SignedIn: 'signed-in',

packages/backend/src/tokens/handshake.ts

@@ -9,6 +9,7 @@ import { AuthErrorReason, signedIn, signedOut } from './authStatus';
 import { getCookieName, getCookieValue } from './cookie';
 import { loadClerkJWKFromLocal, loadClerkJWKFromRemote } from './keys';
 import type { OrganizationMatcher } from './organizationMatcher';
+import { TokenType } from './tokenTypes';
 import type { OrganizationSyncOptions, OrganizationSyncTarget } from './types';
 import type { VerifyTokenOptions } from './verify';
 import { verifyToken } from './verify';
@@ -202,12 +203,24 @@ export class HandshakeService {
     }
 
     if (sessionToken === '') {
-      return signedOut(this.authenticateContext, AuthErrorReason.SessionTokenMissing, '', headers);
+      return signedOut({
+        tokenType: TokenType.SessionToken,
+        authenticateContext: this.authenticateContext,
+        reason: AuthErrorReason.SessionTokenMissing,
+        message: '',
+        headers,
+      });
     }
 
     const { data, errors: [error] = [] } = await verifyToken(sessionToken, this.authenticateContext);
     if (data) {
-      return signedIn(this.authenticateContext, data, headers, sessionToken);
+      return signedIn({
+        tokenType: TokenType.SessionToken,
+        authenticateContext: this.authenticateContext,
+        sessionClaims: data,
+        headers,
+        token: sessionToken,
+      });
     }
 
     if (
@@ -240,7 +253,13 @@ ${developmentError.getFullMessage()}`,
         clockSkewInMs: 86_400_000,
       });
       if (retryResult) {
-        return signedIn(this.authenticateContext, retryResult, headers, sessionToken);
+        return signedIn({
+          tokenType: TokenType.SessionToken,
+          authenticateContext: this.authenticateContext,
+          sessionClaims: retryResult,
+          headers,
+          token: sessionToken,
+        });
       }
 
       throw new Error(retryError?.message || 'Clerk: Handshake retry failed.');

packages/backend/src/tokens/tokenTypes.ts

@@ -1,3 +1,5 @@
+import type { APIKey, IdPOAuthAccessToken, MachineToken } from '../api';
+
 export const TokenType = {
   SessionToken: 'session_token',
   ApiKey: 'api_key',
@@ -9,3 +11,4 @@ export type TokenType = (typeof TokenType)[keyof typeof TokenType];
 
 export type SessionTokenType = typeof TokenType.SessionToken;
 export type MachineTokenType = Exclude<TokenType, SessionTokenType>;
+export type MachineAuthType = MachineToken | APIKey | IdPOAuthAccessToken;