feat: migrate from axios to fetch with Codemod2.0

apps/auth-service/package.json

@@ -28,7 +28,6 @@
     "@fastify/busboy": "^2.1.1",
     "@fastify/cors": "8.5.0",
     "@fastify/rate-limit": "9.0.1",
-    "axios": "^1.6.8",
     "dotenv": "^16.4.5",
     "fastify": "4.25.1",
     "valibot": "^0.24.1"

apps/backend/package.json

@@ -43,7 +43,6 @@
     "@fastify/rate-limit": "9.0.1",
     "@types/tar": "^6.1.11",
     "ai": "2.2.29",
-    "axios": "^1.6.8",
     "bullmq": "^5.7.5",
     "chatgpt": "5.2.5",
     "chromadb": "1.7.2",

apps/backend/src/plugins/authPlugin.ts

@@ -1,5 +1,8 @@
-import type { OrganizationMembership, User } from "@codemod-com/utilities";
-import axios from "axios";
+import {
+  type OrganizationMembership,
+  type User,
+  extendedFetch,
+} from "@codemod-com/utilities";
 import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import fp from "fastify-plugin";
 import { environment } from "../util";
@@ -38,12 +41,13 @@ async function authPlugin(fastify: FastifyInstance, _opts: unknown) {
       try {
         const authHeader = request.headers.authorization;
 
-        if (!authHeader) reply.code(401).send({ error: "Unauthorized" });
+        if (!authHeader) {
+          reply.code(401).send({ error: "Unauthorized" });
+          return;
+        }
 
-        await axios.get(`${environment.AUTH_SERVICE_URL}/verifyToken`, {
-          headers: {
-            Authorization: authHeader,
-          },
+        await extendedFetch(`${environment.AUTH_SERVICE_URL}/verifyToken`, {
+          headers: { Authorization: authHeader },
         });
       } catch (error) {
         console.error(error);
@@ -72,16 +76,17 @@ async function authPlugin(fastify: FastifyInstance, _opts: unknown) {
           return;
         }
 
-        const { data } = await axios.get(
+        const response = await extendedFetch(
           `${environment.AUTH_SERVICE_URL}/userData`,
-          {
-            headers: {
-              Authorization: authHeader,
-            },
-          },
+          { headers: { Authorization: authHeader } },
         );
 
-        const { user, organizations, allowedNamespaces } = data;
+        const { user, organizations, allowedNamespaces } =
+          (await response.json()) as {
+            user?: User;
+            organizations?: OrganizationMembership[];
+            allowedNamespaces?: string[];
+          };
 
         request.user = user;
         request.organizations = organizations;
@@ -104,18 +109,17 @@ async function authPlugin(fastify: FastifyInstance, _opts: unknown) {
       try {
         const authHeader = request.headers.authorization;
 
-        if (!authHeader) reply.code(401).send({ error: "Unauthorized" });
+        if (!authHeader) {
+          reply.code(401).send({ error: "Unauthorized" });
+          return;
+        }
 
-        const { data } = await axios.get(
+        const response = await extendedFetch(
           `${environment.AUTH_SERVICE_URL}/oAuthToken`,
-          {
-            headers: {
-              Authorization: authHeader,
-            },
-          },
+          { headers: { Authorization: authHeader } },
         );
 
-        const { token } = data;
+        const { token } = (await response.json()) as { token?: string };
 
         request.token = token;
       } catch {

apps/backend/src/publishHandler.test.ts

@@ -44,12 +44,16 @@ const mocks = vi.hoisted(() => {
         findUnique: vi.fn(),
       },
     },
-    axios: {
-      get: vi.fn().mockImplementation((url: string, ...args: unknown[]) => ({
-        data: GET_USER_RETURN,
-      })),
-      post: vi.fn().mockImplementation(() => ({})),
-    },
+    fetch: vi.fn().mockImplementation((url, options) => {
+      if (options.method === "GET" || !options.method) {
+        return Promise.resolve({
+          json: () => Promise.resolve(GET_USER_RETURN),
+          ok: true,
+        });
+      }
+
+      return Promise.resolve({ json: () => GET_USER_RETURN, ok: true });
+    }),
     S3Client,
     TarService,
     PutObjectCommand,
@@ -62,10 +66,6 @@ vi.mock("@codemod-com/database", async () => {
   return { ...actual, prisma: mocks.prisma };
 });
 
-vi.mock("axios", async () => {
-  return { default: mocks.axios };
-});
-
 vi.mock("@aws-sdk/client-s3", async () => {
   const actual = await vi.importActual("@aws-sdk/client-s3");
 
@@ -116,7 +116,7 @@ vi.mock("@codemod-com/utilities", async () => {
   };
 });
 
-vi.stubGlobal("fetch", vi.fn());
+vi.stubGlobal("fetch", mocks.fetch);
 
 describe("/publish route", async () => {
   const fastify = await runServer();
@@ -218,26 +218,34 @@ describe("/publish route", async () => {
       requestTimeout: 5000,
     });
 
-    expect(mocks.axios.post).toHaveBeenCalledOnce();
-    expect(mocks.axios.post).toHaveBeenCalledWith(
+    expect(mocks.fetch).toHaveBeenCalledTimes(3);
+    expect(mocks.fetch).toHaveBeenNthCalledWith(
+      2,
       "https://hooks.zapier.com/hooks/catch/18983913/2ybuovt/",
       {
-        codemod: {
-          name: codemodRcContents.name,
-          from: codemodRcContents.applicability?.from?.map((tuple) =>
-            tuple.join(" "),
-          ),
-          to: codemodRcContents.applicability?.to?.map((tuple) =>
-            tuple.join(" "),
-          ),
-          engine: codemodRcContents.engine,
-          publishedAt: MOCK_TIMESTAMP,
-        },
-        author: {
-          username: GET_USER_RETURN.user.username,
-          name: `${GET_USER_RETURN.user.firstName} ${GET_USER_RETURN.user.lastName}`,
-          email: GET_USER_RETURN.user.emailAddresses[0]?.emailAddress,
+        body: JSON.stringify({
+          codemod: {
+            name: codemodRcContents.name,
+            from: codemodRcContents.applicability?.from?.map((tuple) =>
+              tuple.join(" "),
+            ),
+            to: codemodRcContents.applicability?.to?.map((tuple) =>
+              tuple.join(" "),
+            ),
+            engine: codemodRcContents.engine,
+            publishedAt: MOCK_TIMESTAMP,
+          },
+          author: {
+            username: GET_USER_RETURN.user.username,
+            name: `${GET_USER_RETURN.user.firstName} ${GET_USER_RETURN.user.lastName}`,
+            email: GET_USER_RETURN.user.emailAddresses[0]?.emailAddress,
+          },
+        }),
+        headers: {
+          "Content-Type": "application/json",
         },
+        method: "POST",
+        signal: expect.any(AbortSignal),
       },
     );
 
@@ -605,8 +613,9 @@ describe("/publish route", async () => {
   describe("when publishing via org", async () => {
     it("should go through happy path if user has access to the org", async () => {
       mocks.prisma.codemodVersion.findFirst.mockImplementation(() => null);
-      mocks.axios.get.mockImplementation(() => ({
-        data: { ...GET_USER_RETURN, allowedNamespaces: ["org"] },
+      mocks.fetch.mockImplementation(() => ({
+        json: () => ({ ...GET_USER_RETURN, allowedNamespaces: ["org"] }),
+        ok: true,
       }));
       mocks.prisma.codemod.upsert.mockImplementation(() => {
         return { createdAt: { getTime: () => MOCK_TIMESTAMP }, id: "id" };
@@ -669,8 +678,13 @@ describe("/publish route", async () => {
 
     it("should fail if user has no access to the org", async () => {
       mocks.prisma.codemodVersion.findFirst.mockImplementation(() => null);
-      mocks.axios.get.mockImplementation(() => ({
-        data: { ...GET_USER_RETURN, organizations: [], allowedNamespaces: [] },
+      mocks.fetch.mockImplementation(() => ({
+        json: () => ({
+          ...GET_USER_RETURN,
+          organizations: [],
+          allowedNamespaces: [],
+        }),
+        ok: true,
       }));
 
       const codemodRcContents: CodemodConfigInput = {

apps/backend/src/publishHandler.ts

@@ -7,10 +7,10 @@ import {
   TarService,
   buildCodemodSlug,
   codemodNameRegex,
+  extendedFetch,
   isNeitherNullNorUndefined,
   parseCodemodConfig,
 } from "@codemod-com/utilities";
-import axios from "axios";
 import type { RouteHandler } from "fastify";
 import * as semver from "semver";
 import type { UserDataPopulatedRequest } from "./plugins/authPlugin";
@@ -350,25 +350,32 @@ export const publishHandler: RouteHandler<{
 
     if (latestVersion === null) {
       try {
-        await axios.post(
+        await extendedFetch(
           "https://hooks.zapier.com/hooks/catch/18983913/2ybuovt/",
           {
-            codemod: {
-              name,
-              from: codemodRc.applicability?.from?.map((tuple) =>
-                tuple.join(" "),
-              ),
-              to: codemodRc.applicability?.to?.map((tuple) => tuple.join(" ")),
-              engine: codemodRc.engine,
-              publishedAt: createdAtTimestamp,
-            },
-            author: {
-              username,
-              name: `${firstName ?? ""} ${lastName ?? ""}`.trim() || null,
-              email:
-                emailAddresses.find((e) => e.id === primaryEmailAddressId)
-                  ?.emailAddress ?? null,
-            },
+            method: "POST",
+            body: JSON.stringify({
+              codemod: {
+                name,
+                from: codemodRc.applicability?.from?.map((tuple) =>
+                  tuple.join(" "),
+                ),
+                to: codemodRc.applicability?.to?.map((tuple) =>
+                  tuple.join(" "),
+                ),
+                engine: codemodRc.engine,
+                publishedAt: createdAtTimestamp,
+              },
+              author: {
+                username,
+                name: `${firstName ?? ""} ${lastName ?? ""}`.trim() || null,
+                email:
+                  emailAddresses.find((e) => e.id === primaryEmailAddressId)
+                    ?.emailAddress ?? null,
+              },
+            }),
+            headers: { "Content-Type": "application/json" },
+            signal: AbortSignal.timeout(5000),
           },
         );
       } catch (err) {