redirect: 'manual'

Signed-off-by: Carina Ursu <carina@union.ai>

Author: ursucarina

packages/oss-console/src/components/data/fetchClient.tsx

@@ -27,6 +27,15 @@ function queueRefresh(fn: () => Promise<void>): Promise<void> {
   return refreshInFlight;
 }
 
+function isRedirectResponse(res: Response): boolean {
+  if (res.type === 'opaqueredirect') {
+    return true;
+  }
+  const { status } = res;
+  // 304 Not Modified is 3xx but not a redirect; treat other 3xx like axios maxRedirects:0.
+  return status >= 300 && status < 400 && status !== 304;
+}
+
 function appendQuery(url: string, params?: Record<string, unknown>): string {
   if (!params) return url;
   const entries = Object.entries(params).filter(([, v]) => v !== undefined && v !== null);
@@ -78,7 +87,7 @@ export const fetchClient = {
       const init: FetchRequestInit = {
         method,
         credentials: 'include',
-        redirect: 'error',
+        redirect: 'manual',
         headers: config.headers,
       };
       if (method !== 'GET' && method !== 'HEAD' && config.data != null) {
@@ -89,6 +98,13 @@ export const fetchClient = {
 
     let res = await doFetch();
 
+    if (isRedirectResponse(res)) {
+      throw new HttpRequestError(res.statusText || 'Redirect', {
+        status: res.status,
+        statusText: res.statusText || 'Redirect',
+      });
+    }
+
     if (res.status === 401 && !skipRefresh) {
       await queueRefresh(async () => {
         await refreshAuth(

packages/oss-console/src/components/data/test/fetchClient.test.ts

@@ -0,0 +1,101 @@
+import { fetchClient } from '../fetchClient';
+
+function buildResponse(overrides: Partial<Response> & Pick<Response, 'status'>): Response {
+  const { status } = overrides;
+  return {
+    ok: status >= 200 && status < 300,
+    statusText: overrides.statusText ?? '',
+    type: 'basic',
+    url: 'http://localhost/api',
+    redirected: false,
+    headers: new Headers(),
+    arrayBuffer: () => Promise.resolve(new ArrayBuffer(0)),
+    ...overrides,
+  } as Response;
+}
+
+describe('fetchClient.request', () => {
+  const mockFetch = global.fetch as jest.MockedFunction<typeof fetch>;
+
+  beforeEach(() => {
+    mockFetch.mockReset();
+    mockFetch.mockImplementation(() =>
+      Promise.resolve(
+        buildResponse({
+          status: 200,
+          statusText: 'OK',
+          ok: true,
+        }),
+      ),
+    );
+  });
+
+  it('calls fetch with redirect: manual', async () => {
+    await fetchClient.request({ url: 'http://localhost/api' });
+    expect(mockFetch).toHaveBeenCalledWith(
+      'http://localhost/api',
+      expect.objectContaining({ redirect: 'manual' }),
+    );
+  });
+
+  it('throws HttpRequestError with status for 3xx redirect responses', async () => {
+    mockFetch.mockImplementationOnce(() =>
+      Promise.resolve(
+        buildResponse({
+          status: 302,
+          statusText: 'Found',
+          ok: false,
+          headers: new Headers({ Location: '/login' }),
+        }),
+      ),
+    );
+
+    await expect(
+      fetchClient.request({ url: 'http://localhost/api', skipAuthRefresh: true }),
+    ).rejects.toMatchObject({
+      name: 'HttpRequestError',
+      response: { status: 302, statusText: 'Found' },
+    });
+  });
+
+  it('throws HttpRequestError for opaqueredirect (cross-origin redirect) instead of TypeError', async () => {
+    mockFetch.mockImplementationOnce(() =>
+      Promise.resolve(
+        buildResponse({
+          status: 0,
+          statusText: '',
+          ok: false,
+          type: 'opaqueredirect',
+        }),
+      ),
+    );
+
+    await expect(
+      fetchClient.request({ url: 'http://localhost/api', skipAuthRefresh: true }),
+    ).rejects.toMatchObject({
+      name: 'HttpRequestError',
+      message: 'Redirect',
+      response: { status: 0, statusText: 'Redirect' },
+    });
+  });
+
+  it('does not treat 304 Not Modified as a redirect error', async () => {
+    mockFetch.mockImplementationOnce(() =>
+      Promise.resolve(
+        buildResponse({
+          status: 304,
+          statusText: 'Not Modified',
+          ok: false,
+        }),
+      ),
+    );
+
+    await expect(
+      fetchClient.request({ url: 'http://localhost/api', skipAuthRefresh: true }),
+    ).rejects.toMatchObject({
+      name: 'HttpRequestError',
+      message: 'Not Modified',
+      response: expect.objectContaining({ status: 304 }),
+    });
+  });
+});