fix: update all global axios imports to use Coder instance

Parkreiner · Parkreiner · commit c2298756d9ec · 2024-04-22T16:30:42.000Z
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -1,5 +1,5 @@
 import { type BrowserContext, expect, type Page, test } from "@playwright/test";
-import axios from "axios";
+import { coderAxiosInstance } from "api/api";
 import { type ChildProcess, exec, spawn } from "child_process";
 import { randomUUID } from "crypto";
 import express from "express";
@@ -398,7 +398,7 @@ export const waitUntilUrlIsNotResponding = async (url: string) => {
 
   while (retries < maxRetries) {
     try {
-      await axios.get(url);
+      await coderAxiosInstance.get(url);
     } catch (error) {
       return;
     }
diff --git a/site/e2e/reporter.ts b/site/e2e/reporter.ts
@@ -8,7 +8,7 @@ import type {
   Reporter,
   TestError,
 } from "@playwright/test/reporter";
-import axios from "axios";
+import { coderAxiosInstance } from "api/api";
 import * as fs from "fs/promises";
 import type { Writable } from "stream";
 import { coderdPProfPort, enterpriseLicense } from "./constants";
@@ -136,9 +136,10 @@ class CoderReporter implements Reporter {
 const logLines = (chunk: string): string[] => chunk.trimEnd().split("\n");
 
 const exportDebugPprof = async (outputFile: string) => {
-  const response = await axios.get(
+  const response = await coderAxiosInstance.get(
     `http://127.0.0.1:${coderdPProfPort}/debug/pprof/goroutine?debug=1`,
   );
+
   if (response.status !== 200) {
     throw new Error(`Error: Received status code ${response.status}`);
   }
diff --git a/site/src/api/api.test.ts b/site/src/api/api.test.ts
@@ -1,4 +1,3 @@
-import axios from "axios";
 import {
   MockTemplate,
   MockTemplateVersionParameter1,
@@ -8,6 +7,7 @@ import {
   MockWorkspaceBuildParameter1,
 } from "testHelpers/entities";
 import * as api from "./api";
+import { coderAxiosInstance } from "./api";
 import type * as TypesGen from "./typesGenerated";
 
 describe("api.ts", () => {
@@ -17,13 +17,16 @@ describe("api.ts", () => {
       const loginResponse: TypesGen.LoginWithPasswordResponse = {
         session_token: "abc_123_test",
       };
-      jest.spyOn(axios, "post").mockResolvedValueOnce({ data: loginResponse });
+
+      jest
+        .spyOn(coderAxiosInstance, "post")
+        .mockResolvedValueOnce({ data: loginResponse });
 
       // when
       const result = await api.login("test", "123");
 
       // then
-      expect(axios.post).toHaveBeenCalled();
+      expect(coderAxiosInstance.post).toHaveBeenCalled();
       expect(result).toStrictEqual(loginResponse);
     });
 
@@ -38,7 +41,7 @@ describe("api.ts", () => {
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
         return Promise.reject(expectedError);
       });
-      axios.post = axiosMockPost;
+      coderAxiosInstance.post = axiosMockPost;
 
       try {
         await api.login("test", "123");
@@ -54,7 +57,7 @@ describe("api.ts", () => {
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
         return Promise.resolve();
       });
-      axios.post = axiosMockPost;
+      coderAxiosInstance.post = axiosMockPost;
 
       // when
       await api.logout();
@@ -73,7 +76,8 @@ describe("api.ts", () => {
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
         return Promise.reject(expectedError);
       });
-      axios.post = axiosMockPost;
+
+      coderAxiosInstance.post = axiosMockPost;
 
       try {
         await api.logout();
@@ -92,7 +96,8 @@ describe("api.ts", () => {
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
         return Promise.resolve({ data: apiKeyResponse });
       });
-      axios.post = axiosMockPost;
+
+      coderAxiosInstance.post = axiosMockPost;
 
       // when
       const result = await api.getApiKey();
@@ -112,7 +117,8 @@ describe("api.ts", () => {
       const axiosMockPost = jest.fn().mockImplementationOnce(() => {
         return Promise.reject(expectedError);
       });
-      axios.post = axiosMockPost;
+
+      coderAxiosInstance.post = axiosMockPost;
 
       try {
         await api.getApiKey();
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
@@ -1,4 +1,5 @@
-import axios, { type AxiosError, type AxiosResponse } from "axios";
+import { type AxiosError, type AxiosResponse, isAxiosError } from "axios";
+import { coderAxiosInstance } from "./api";
 
 const Language = {
   errorsByCode: {
@@ -25,7 +26,7 @@ export type ApiError = AxiosError<ApiErrorResponse> & {
 
 export const isApiError = (err: unknown): err is ApiError => {
   return (
-    axios.isAxiosError(err) &&
+    isAxiosError(err) &&
     err.response !== undefined &&
     isApiErrorResponse(err.response.data)
   );
diff --git a/site/src/contexts/auth/RequireAuth.tsx b/site/src/contexts/auth/RequireAuth.tsx
@@ -1,4 +1,4 @@
-import axios from "axios";
+import { coderAxiosInstance } from "api/api";
 import { type FC, useEffect } from "react";
 import { Outlet, Navigate, useLocation } from "react-router-dom";
 import { isApiError } from "api/errors";
@@ -22,7 +22,7 @@ export const RequireAuth: FC = () => {
       return;
     }
 
-    const interceptorHandle = axios.interceptors.response.use(
+    const interceptorHandle = coderAxiosInstance.interceptors.response.use(
       (okResponse) => okResponse,
       (error: unknown) => {
         // 401 Unauthorized
@@ -32,13 +32,14 @@ export const RequireAuth: FC = () => {
           signOut();
         }
 
-        // Otherwise, pass the response through so that it can be displayed in the UI
+        // Otherwise, pass the response through so that it can be displayed in
+        // the UI
         return Promise.reject(error);
       },
     );
 
     return () => {
-      axios.interceptors.response.eject(interceptorHandle);
+      coderAxiosInstance.interceptors.response.eject(interceptorHandle);
     };
   }, [isLoading, isSigningOut, isSignedIn, signOut]);
 
diff --git a/site/src/contexts/useProxyLatency.ts b/site/src/contexts/useProxyLatency.ts
@@ -1,5 +1,5 @@
 import PerformanceObserver from "@fastly/performance-observer-polyfill";
-import axios from "axios";
+import { coderAxiosInstance } from "api/api";
 import { useEffect, useReducer, useState } from "react";
 import type { Region } from "api/typesGenerated";
 import { generateRandomString } from "utils/random";
@@ -198,7 +198,7 @@ export const useProxyLatency = (
     observer.observe({ entryTypes: ["resource"] });
 
     const proxyRequests = Object.keys(proxyChecks).map((latencyURL) => {
-      return axios.get(latencyURL, {
+      return coderAxiosInstance.get(latencyURL, {
         withCredentials: false,
         // Must add a custom header to make the request not a "simple request".
         // We want to force a preflight request.
