chore(deps): bump axios from 1.8.4 to 1.12.0

libs/profile/client/src/lib/profile.client.ts

@@ -69,17 +69,19 @@ export class ProfileClient {
     try {
       return (await this.axiosInstance[method](endpoint, requestData)).data;
     } catch (err) {
-      const response = err.response || {};
-      if (err.errno > -1 || (response.status && response.status < 500)) {
-        throw new ProfileClientError(err);
-      } else {
+      if (axios.isAxiosError(err)) {
+        const status = err.response?.status;
+        if ((err as any).errno > -1 || (status !== undefined && status < 500)) {
+          throw new ProfileClientError(err);
+        }
         throw new ProfileClientServiceFailureError(
           this.config.serviceName,
           method,
           endpoint,
           err
         );
       }
+      throw err;
     }
   }
 
@@ -124,8 +126,8 @@ export class ProfileClient {
       const userinfo = await this.makeRequest(
         userinfoUrl,
         {
+          // This is an override for specific keys, other default headers will be merged automatically by axios
           headers: {
-            ...this.axiosInstance.defaults.headers,
             Authorization: `Bearer ${accessToken}`,
           },
         },

package.json

@@ -93,7 +93,7 @@
     "@type-cacheable/ioredis-adapter": "^10.0.4",
     "agentkeepalive": "^4.6.0",
     "app-store-server-api": "^0.16.0",
-    "axios": "1.8.4",
+    "axios": "1.12.0",
     "base64url": "^3.0.1",
     "bn.js": "^5.2.1",
     "class-transformer": "^0.5.1",

packages/fxa-event-broker/src/client-capability/client-capability.service.ts

@@ -51,13 +51,14 @@ export class ClientCapabilityService
       if (throwOnError) {
         throw ExtendedError.withCause(
           'Unexpected error fetching client capabilities from auth-server',
-          err
+          err as Error
         );
       }
       this.log.error('updateCapabilities', {
-        status: err.response
-          ? (err.response as AxiosResponse).status
-          : undefined,
+        status:
+          axios.isAxiosError(err) && err.response
+            ? err.response.status
+            : undefined,
         message: 'Error fetching client capabilities.',
       });
       Sentry.captureException(err);

packages/fxa-event-broker/src/pubsub-proxy/pubsub-proxy.controller.ts

@@ -126,23 +126,22 @@ export class PubsubProxyController {
       }
       return response;
     } catch (err) {
-      if (err.response) {
+      if (axios.isAxiosError(err) && err.response) {
         // Proxy normal HTTP responses that aren't 200.
         this.metrics.increment(`proxy.fail`, {
           clientId,
-          statusCode: (err.response as AxiosResponse).status.toString(),
+          statusCode: String(err.response.status),
           type: message.event,
         });
         this.log.debug('proxyDeliverFail', {
           response: err.response,
           message: 'failed to proxy message',
         });
         return err.response;
-      } else {
-        this.log.error('proxyDeliverError', { err });
-        Sentry.captureException(err);
-        throw ExtendedError.withCause('Proxy delivery error', err);
       }
+      this.log.error('proxyDeliverError', { err });
+      Sentry.captureException(err);
+      throw ExtendedError.withCause('Proxy delivery error', err as Error);
     }
   }
 

yarn.lock

@@ -25190,17 +25190,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.8.4":
-  version: 1.8.4
-  resolution: "axios@npm:1.8.4"
-  dependencies:
-    follow-redirects: "npm:^1.15.6"
-    form-data: "npm:^4.0.0"
-    proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/450993c2ba975ffccaf0d480b68839a3b2435a5469a71fa2fb0b8a55cdb2c2ae47e609360b9c1e2b2534b73dfd69e2733a1cf9f8215bee0bcd729b72f801b0ce
-  languageName: node
-  linkType: hard
-
 "axios@npm:^1.5.1, axios@npm:^1.6.0, axios@npm:^1.6.7, axios@npm:^1.7.4, axios@npm:^1.8.2, axios@npm:^1.8.3":
   version: 1.10.0
   resolution: "axios@npm:1.10.0"
@@ -35184,7 +35173,7 @@ __metadata:
     agentkeepalive: "npm:^4.6.0"
     app-store-server-api: "npm:^0.16.0"
     autoprefixer: "npm:^10.4.14"
-    axios: "npm:1.8.4"
+    axios: "npm:1.12.0"
     babel-eslint: "npm:^10.1.0"
     babel-jest: "npm:29.7.0"
     base64url: "npm:^3.0.1"