fix(service-worker): preserve redirect policy on reconstructed asset requests

Yenya030 · mattrbeck · commit e19150d2b596 · 2026-03-18T10:26:25.000-07:00
Preserve the redirect mode when rebuilding asset requests in newRequestWithMetadata(). This keeps explicit redirect:error semantics intact across service-worker redirect handling. Update the worker test mocks to model redirect defaults correctly and add focused regression coverage for redirected lazy assets with redirect:error. (cherry picked from commit 07abfbc)
diff --git a/packages/service-worker/worker/src/assets.ts b/packages/service-worker/worker/src/assets.ts
@@ -501,7 +501,7 @@ export abstract class AssetGroup {
    * Create a new `Request` based on the specified URL and `RequestInit` options, preserving only
    * metadata that are known to be safe.
    *
-   * Currently, only headers are preserved.
+   * Currently, only headers and redirect policy are preserved.
    *
    * NOTE:
    *   Things like credential inclusion are intentionally omitted to avoid issues with opaque
@@ -512,7 +512,10 @@ export abstract class AssetGroup {
    *   https://github.com/angular/angular/issues/41931#issuecomment-1227601347
    */
   private newRequestWithMetadata(url: string, options: RequestInit): Request {
-    return this.adapter.newRequest(url, {headers: options.headers});
+    return this.adapter.newRequest(url, {
+      headers: options.headers,
+      redirect: options.redirect,
+    });
   }
 
   /**
diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
@@ -1689,6 +1689,12 @@ import {envIsSupported} from '../testing/utils';
           expect(redirectReq.mode).toBe('cors'); // The default value.
           expect((redirectReq as any).unknownOption).toBeUndefined();
         });
+
+        it('does not follow redirects when redirect policy is error', async () => {
+          await expectAsync(
+            makeRequest(scope, '/lazy/redirected.txt', undefined, {redirect: 'error'}),
+          ).toBeRejected();
+        });
       });
     });
 
diff --git a/packages/service-worker/worker/testing/fetch.ts b/packages/service-worker/worker/testing/fetch.ts
@@ -115,7 +115,7 @@ export class MockRequest extends MockBody implements Request {
   readonly keepalive: boolean = true;
   readonly method: string = 'GET';
   readonly mode: RequestMode = 'cors';
-  readonly redirect: RequestRedirect = 'error';
+  readonly redirect: RequestRedirect = 'follow';
   readonly referrer: string = '';
   readonly referrerPolicy: ReferrerPolicy = 'no-referrer';
   readonly signal: AbortSignal = null as any;
@@ -153,6 +153,9 @@ export class MockRequest extends MockBody implements Request {
     if (init.method !== undefined) {
       this.method = init.method;
     }
+    if (init.redirect !== undefined) {
+      this.redirect = init.redirect;
+    }
     if (init.destination !== undefined) {
       this.destination = init.destination;
     }
@@ -167,6 +170,7 @@ export class MockRequest extends MockBody implements Request {
       mode: this.mode,
       credentials: this.credentials,
       headers: this.headers,
+      redirect: this.redirect,
     });
   }
 }
diff --git a/packages/service-worker/worker/testing/mock.ts b/packages/service-worker/worker/testing/mock.ts
@@ -165,7 +165,11 @@ export class MockServerState {
     }
     const url = req.url.split('?')[0];
     if (this.resources.has(url)) {
-      return this.resources.get(url)!.clone();
+      const response = this.resources.get(url)!.clone();
+      if ((response as any).redirected && req.redirect === 'error') {
+        throw new Error('Redirect disallowed by request policy.');
+      }
+      return response;
     }
     if (this.errors.has(url)) {
       throw new Error('Intentional failure!');

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ export abstract class AssetGroup {`
`501`	`501`	* Create a new `Request` based on the specified URL and `RequestInit` options, preserving only
`502`	`502`	`* metadata that are known to be safe.`
`503`	`503`	`*`
`504`		`- * Currently, only headers are preserved.`
	`504`	`+ * Currently, only headers and redirect policy are preserved.`
`505`	`505`	`*`
`506`	`506`	`* NOTE:`
`507`	`507`	`* Things like credential inclusion are intentionally omitted to avoid issues with opaque`
`@@ -512,7 +512,10 @@ export abstract class AssetGroup {`
`512`	`512`	`* https://github.com/angular/angular/issues/41931#issuecomment-1227601347`
`513`	`513`	`*/`
`514`	`514`	`private newRequestWithMetadata(url: string, options: RequestInit): Request {`
`515`		`- return this.adapter.newRequest(url, {headers: options.headers});`
	`515`	`+ return this.adapter.newRequest(url, {`
	`516`	`+ headers: options.headers,`
	`517`	`+ redirect: options.redirect,`
	`518`	`+ });`
`516`	`519`	`}`
`517`	`520`
`518`	`521`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,11 @@ export class MockServerState {`
`165`	`165`	`}`
`166`	`166`	`const url = req.url.split('?')[0];`
`167`	`167`	`if (this.resources.has(url)) {`
`168`		`- return this.resources.get(url)!.clone();`
	`168`	`+ const response = this.resources.get(url)!.clone();`
	`169`	`+ if ((response as any).redirected && req.redirect === 'error') {`
	`170`	`+ throw new Error('Redirect disallowed by request policy.');`
	`171`	`+ }`
	`172`	`+ return response;`
`169`	`173`	`}`
`170`	`174`	`if (this.errors.has(url)) {`
`171`	`175`	`throw new Error('Intentional failure!');`