Fix how headers are handled in @hey-api/client-angular

.changeset/hot-baboons-carry.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": minor
+---
+
+Fix how headers are handled in @hey-api/client-angular#3860

examples/openapi-ts-angular-common/src/client/client/client.gen.ts

@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { HttpResponse } from '@angular/common/http';
+import type { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClient, HttpErrorResponse, HttpEventType, HttpRequest } from '@angular/common/http';
 import {
   assertInInjectionContext,
@@ -87,14 +87,26 @@ export const createClient = (config: Config = {}): Client => {
       opts.headers = opts.headers.delete('Content-Type');
     }
 
+    return opts;
+  };
+
+  const finalizeRequest = <
+    TData = unknown,
+    ThrowOnError extends boolean = false,
+    TResponseStyle extends ResponseStyle = 'fields',
+  >(
+    opts: RequestOptions<TData, TResponseStyle, ThrowOnError> & {
+      headers: HttpHeaders;
+    },
+  ) => {
     const url = buildUrl(opts as Config & RequestOptions);
 
     const req = new HttpRequest<unknown>(opts.method ?? 'GET', url, getValidRequestBody(opts), {
       redirect: 'follow',
       ...opts,
     });
 
-    return { opts, req, url };
+    return { req, url };
   };
 
   const beforeRequest = async <
@@ -105,16 +117,18 @@ export const createClient = (config: Config = {}): Client => {
   >(
     options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
   ) => {
-    const { opts, req, url } = requestOptions(options);
+    const opts = requestOptions(options);
 
     if (opts.security) {
-      await setAuthParams(opts);
+      await setAuthParams(opts, opts.security);
     }
 
     if (opts.requestValidator) {
       await opts.requestValidator(opts);
     }
 
+    const { req, url } = finalizeRequest(opts);
+
     return { opts, req, url };
   };
 
@@ -236,7 +250,7 @@ export const createClient = (config: Config = {}): Client => {
         throw new Error('Request validation is not supported in requestOptions');
       }
 
-      return requestOptions(options).req;
+      return finalizeRequest(requestOptions(options)).req;
     },
     setConfig,
     sse: {

examples/openapi-ts-angular-common/src/client/client/utils.gen.ts

@@ -179,12 +179,13 @@ export const getParseAs = (
   return;
 };
 
-export async function setAuthParams(
-  options: Pick<RequestOptions, 'auth' | 'query' | 'security'> & {
+export const setAuthParams = async (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
     headers: HttpHeaders;
   },
-): Promise<void> {
-  for (const auth of options.security ?? []) {
+  security: Pick<Required<RequestOptions>, 'security'>['security'],
+) => {
+  for (const auth of security) {
     const token = await getAuthToken(auth, options.auth);
 
     if (!token) {
@@ -208,10 +209,8 @@ export async function setAuthParams(
         options.headers = options.headers.set(name, token);
         break;
     }
-
-    return;
   }
-}
+};
 
 export const buildUrl: Client['buildUrl'] = (options) => {
   const url = getUrl({

examples/openapi-ts-angular/src/client/client/client.gen.ts

@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { HttpResponse } from '@angular/common/http';
+import type { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClient, HttpErrorResponse, HttpEventType, HttpRequest } from '@angular/common/http';
 import {
   assertInInjectionContext,
@@ -87,14 +87,26 @@ export const createClient = (config: Config = {}): Client => {
       opts.headers = opts.headers.delete('Content-Type');
     }
 
+    return opts;
+  };
+
+  const finalizeRequest = <
+    TData = unknown,
+    ThrowOnError extends boolean = false,
+    TResponseStyle extends ResponseStyle = 'fields',
+  >(
+    opts: RequestOptions<TData, TResponseStyle, ThrowOnError> & {
+      headers: HttpHeaders;
+    },
+  ) => {
     const url = buildUrl(opts as Config & RequestOptions);
 
     const req = new HttpRequest<unknown>(opts.method ?? 'GET', url, getValidRequestBody(opts), {
       redirect: 'follow',
       ...opts,
     });
 
-    return { opts, req, url };
+    return { req, url };
   };
 
   const beforeRequest = async <
@@ -105,16 +117,18 @@ export const createClient = (config: Config = {}): Client => {
   >(
     options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
   ) => {
-    const { opts, req, url } = requestOptions(options);
+    const opts = requestOptions(options);
 
     if (opts.security) {
-      await setAuthParams(opts);
+      await setAuthParams(opts, opts.security);
     }
 
     if (opts.requestValidator) {
       await opts.requestValidator(opts);
     }
 
+    const { req, url } = finalizeRequest(opts);
+
     return { opts, req, url };
   };
 
@@ -236,7 +250,7 @@ export const createClient = (config: Config = {}): Client => {
         throw new Error('Request validation is not supported in requestOptions');
       }
 
-      return requestOptions(options).req;
+      return finalizeRequest(requestOptions(options)).req;
     },
     setConfig,
     sse: {

examples/openapi-ts-angular/src/client/client/utils.gen.ts

@@ -179,12 +179,13 @@ export const getParseAs = (
   return;
 };
 
-export async function setAuthParams(
-  options: Pick<RequestOptions, 'auth' | 'query' | 'security'> & {
+export const setAuthParams = async (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
     headers: HttpHeaders;
   },
-): Promise<void> {
-  for (const auth of options.security ?? []) {
+  security: Pick<Required<RequestOptions>, 'security'>['security'],
+) => {
+  for (const auth of security) {
     const token = await getAuthToken(auth, options.auth);
 
     if (!token) {
@@ -208,10 +209,8 @@ export async function setAuthParams(
         options.headers = options.headers.set(name, token);
         break;
     }
-
-    return;
   }
-}
+};
 
 export const buildUrl: Client['buildUrl'] = (options) => {
   const url = getUrl({

examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts

@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { HttpResponse } from '@angular/common/http';
+import type { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClient, HttpErrorResponse, HttpEventType, HttpRequest } from '@angular/common/http';
 import {
   assertInInjectionContext,
@@ -87,14 +87,26 @@ export const createClient = (config: Config = {}): Client => {
       opts.headers = opts.headers.delete('Content-Type');
     }
 
+    return opts;
+  };
+
+  const finalizeRequest = <
+    TData = unknown,
+    ThrowOnError extends boolean = false,
+    TResponseStyle extends ResponseStyle = 'fields',
+  >(
+    opts: RequestOptions<TData, TResponseStyle, ThrowOnError> & {
+      headers: HttpHeaders;
+    },
+  ) => {
     const url = buildUrl(opts as Config & RequestOptions);
 
     const req = new HttpRequest<unknown>(opts.method ?? 'GET', url, getValidRequestBody(opts), {
       redirect: 'follow',
       ...opts,
     });
 
-    return { opts, req, url };
+    return { req, url };
   };
 
   const beforeRequest = async <
@@ -105,16 +117,18 @@ export const createClient = (config: Config = {}): Client => {
   >(
     options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
   ) => {
-    const { opts, req, url } = requestOptions(options);
+    const opts = requestOptions(options);
 
     if (opts.security) {
-      await setAuthParams(opts);
+      await setAuthParams(opts, opts.security);
     }
 
     if (opts.requestValidator) {
       await opts.requestValidator(opts);
     }
 
+    const { req, url } = finalizeRequest(opts);
+
     return { opts, req, url };
   };
 
@@ -236,7 +250,7 @@ export const createClient = (config: Config = {}): Client => {
         throw new Error('Request validation is not supported in requestOptions');
       }
 
-      return requestOptions(options).req;
+      return finalizeRequest(requestOptions(options)).req;
     },
     setConfig,
     sse: {

examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts

@@ -179,12 +179,13 @@ export const getParseAs = (
   return;
 };
 
-export async function setAuthParams(
-  options: Pick<RequestOptions, 'auth' | 'query' | 'security'> & {
+export const setAuthParams = async (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
     headers: HttpHeaders;
   },
-): Promise<void> {
-  for (const auth of options.security ?? []) {
+  security: Pick<Required<RequestOptions>, 'security'>['security'],
+) => {
+  for (const auth of security) {
     const token = await getAuthToken(auth, options.auth);
 
     if (!token) {
@@ -208,10 +209,8 @@ export async function setAuthParams(
         options.headers = options.headers.set(name, token);
         break;
     }
-
-    return;
   }
-}
+};
 
 export const buildUrl: Client['buildUrl'] = (options) => {
   const url = getUrl({

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts

@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { HttpResponse } from '@angular/common/http';
+import type { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClient, HttpErrorResponse, HttpEventType, HttpRequest } from '@angular/common/http';
 import {
   assertInInjectionContext,
@@ -87,14 +87,26 @@ export const createClient = (config: Config = {}): Client => {
       opts.headers = opts.headers.delete('Content-Type');
     }
 
+    return opts;
+  };
+
+  const finalizeRequest = <
+    TData = unknown,
+    ThrowOnError extends boolean = false,
+    TResponseStyle extends ResponseStyle = 'fields',
+  >(
+    opts: RequestOptions<TData, TResponseStyle, ThrowOnError> & {
+      headers: HttpHeaders;
+    },
+  ) => {
     const url = buildUrl(opts as Config & RequestOptions);
 
     const req = new HttpRequest<unknown>(opts.method ?? 'GET', url, getValidRequestBody(opts), {
       redirect: 'follow',
       ...opts,
     });
 
-    return { opts, req, url };
+    return { req, url };
   };
 
   const beforeRequest = async <
@@ -105,16 +117,18 @@ export const createClient = (config: Config = {}): Client => {
   >(
     options: RequestOptions<TData, TResponseStyle, ThrowOnError, Url>,
   ) => {
-    const { opts, req, url } = requestOptions(options);
+    const opts = requestOptions(options);
 
     if (opts.security) {
-      await setAuthParams(opts);
+      await setAuthParams(opts, opts.security);
     }
 
     if (opts.requestValidator) {
       await opts.requestValidator(opts);
     }
 
+    const { req, url } = finalizeRequest(opts);
+
     return { opts, req, url };
   };
 
@@ -236,7 +250,7 @@ export const createClient = (config: Config = {}): Client => {
         throw new Error('Request validation is not supported in requestOptions');
       }
 
-      return requestOptions(options).req;
+      return finalizeRequest(requestOptions(options)).req;
     },
     setConfig,
     sse: {

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts

@@ -182,12 +182,13 @@ export const getParseAs = (
   return;
 };
 
-export async function setAuthParams(
-  options: Pick<RequestOptions, 'auth' | 'query' | 'security'> & {
+export const setAuthParams = async (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
     headers: HttpHeaders;
   },
-): Promise<void> {
-  for (const auth of options.security ?? []) {
+  security: Pick<Required<RequestOptions>, 'security'>['security'],
+) => {
+  for (const auth of security) {
     const token = await getAuthToken(auth, options.auth);
 
     if (!token) {
@@ -211,10 +212,8 @@ export async function setAuthParams(
         options.headers = options.headers.set(name, token);
         break;
     }
-
-    return;
   }
-}
+};
 
 export const buildUrl: Client['buildUrl'] = (options) => {
   const url = getUrl({