chore: clean up overloads

Author: wobsoriano

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

@@ -251,7 +251,6 @@ expect.extend({
       message: string;
     },
   ) {
-    console.log('received', received);
     const pass =
       received.status === AuthStatus.SignedOut &&
       received.tokenType === expected.tokenType &&
@@ -1224,7 +1223,7 @@ describe('tokens.authenticateRequest(options)', () => {
       const mockToken = tokenMap[tokenType];
       const mockConfig = mockMachineAuthResponses[tokenType];
 
-      test('returns authenticated state with valid token in header', async () => {
+      test('returns authenticated state with valid token', async () => {
         server.use(
           http.post(mockConfig.endpoint, () => {
             return HttpResponse.json(mockConfig.successResponse);

packages/backend/src/tokens/factory.ts

@@ -49,16 +49,16 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio
 
   // No options case
   function authenticateRequest(request: Request): Promise<RequestState<'session_token'>>;
-  // Single token type case
-  function authenticateRequest<T extends TokenType>(
-    request: Request,
-    options: RunTimeOptions & { acceptsToken: T },
-  ): Promise<RequestState<T>>;
-  // Any token type case
+  // With options but no acceptsToken case
   function authenticateRequest(
     request: Request,
-    options: RunTimeOptions & { acceptsToken: 'any' },
-  ): Promise<RequestState<TokenType>>;
+    options: Omit<RunTimeOptions, 'acceptsToken'>,
+  ): Promise<RequestState<'session_token'>>;
+  // Single or any token type case
+  function authenticateRequest<T extends TokenType | 'any'>(
+    request: Request,
+    options: RunTimeOptions & { acceptsToken: T },
+  ): Promise<RequestState<T extends 'any' ? TokenType : T>>;
   // List of unique token types case
   function authenticateRequest<T extends UniqueTokenArray>(
     request: Request,

packages/backend/src/tokens/request.ts

@@ -123,22 +123,23 @@ export async function authenticateRequest(
   request: Request,
   options: AuthenticateRequestOptions,
 ): Promise<RequestState<'session_token'>>;
-// Single token type case.
-export async function authenticateRequest<T extends TokenType>(
-  request: Request,
-  options: AuthenticateRequestOptions & { acceptsToken: T },
-): Promise<RequestState<T>>;
-// Any token type case.
+// With options but no acceptsToken case
 export async function authenticateRequest(
   request: Request,
-  options: AuthenticateRequestOptions & { acceptsToken: 'any' },
-): Promise<RequestState<TokenType>>;
+  options: Omit<AuthenticateRequestOptions, 'acceptsToken'>,
+): Promise<RequestState<'session_token'>>;
+// Single or any token type case.
+export async function authenticateRequest<T extends TokenType | 'any'>(
+  request: Request,
+  options: AuthenticateRequestOptions & { acceptsToken: T },
+): Promise<RequestState<T extends 'any' ? TokenType : T>>;
 // List of unique token types case.
 export async function authenticateRequest<T extends UniqueTokenArray>(
   request: Request,
   options: AuthenticateRequestOptions & { acceptsToken: T },
 ): Promise<RequestState<T[number]>>;
 
+// Implementation
 export async function authenticateRequest(
   request: Request,
   options: AuthenticateRequestOptions,