@takaro/auth 0.3.3 → 0.4.0

package/dist/lib/oryAxiosClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oryAxiosClient.d.ts","sourceRoot":"","sources":["../../src/lib/oryAxiosClient.ts"],"names":[],"mappings":"AAKA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,iCA8DhD"}
+{"version":3,"file":"oryAxiosClient.d.ts","sourceRoot":"","sources":["../../src/lib/oryAxiosClient.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,iCAiChD"}

package/dist/lib/oryAxiosClient.js

@@ -1,45 +1,22 @@
-import axios from 'axios';
-import { addCounterToAxios, errors, logger } from '@takaro/util';
-const log = logger('ory:http');
+import { addCounterToAxios, errors, logger, createAxios } from '@takaro/util';
 export function createAxiosClient(baseURL) {
-    const client = axios.create({
+    const log = logger('ory:http');
+    const client = createAxios({
         baseURL,
         headers: {
             'Content-Type': 'application/json',
             'User-Agent': 'Takaro-Agent',
         },
+    }, {
+        logger: log,
     });
     addCounterToAxios(client, {
         name: 'ory_api_requests_total',
         help: 'Total number of requests to the Ory API',
     });
-    client.interceptors.request.use((request) => {
-        log.silly(`➡️ ${request.method?.toUpperCase()} ${request.url}`, {
-            method: request.method,
-            url: request.url,
-        });
-        return request;
-    });
     client.interceptors.response.use((response) => {
-        log.silly(`⬅️ ${response.request.method?.toUpperCase()} ${response.request.path} ${response.status} ${response.statusText}`, {
-            status: response.status,
-            method: response.request.method,
-            url: response.request.url,
-        });
         return response;
     }, (error) => {
-        let details = {};
-        if (error.response?.data) {
-            const data = error.response.data;
-            details = JSON.stringify(data.error_description);
-        }
-        log.error(`☠️ Request errored: [${error.response?.status}] ${details}`, {
-            status: error.response?.status,
-            statusText: error.response?.statusText,
-            method: error.config?.method,
-            url: error.config?.url,
-            response: error.response?.data,
-        });
         if (error.response?.status === 409) {
             return Promise.reject(new errors.ConflictError('User with this identifier already exists'));
         }

package/dist/lib/oryAxiosClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"oryAxiosClient.js","sourceRoot":"","sources":["../../src/lib/oryAxiosClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEjE,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAE/B,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC1B,OAAO;QACP,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,cAAc;SAC7B;KACF,CAAC,CAAC;IAEH,iBAAiB,CAAC,MAAM,EAAE;QACxB,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,yCAAyC;KAChD,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1C,GAAG,CAAC,KAAK,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE;YAC9D,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAC9B,CAAC,QAAQ,EAAE,EAAE;QACX,GAAG,CAAC,KAAK,CACP,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,IACtF,QAAQ,CAAC,UACX,EAAE,EACF;YACE,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;YAC/B,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG;SAC1B,CACF,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,CAAC,KAAiB,EAAE,EAAE;QACpB,IAAI,OAAO,GAAG,EAAE,CAAC;QAEjB,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAA+B,CAAC;YAC5D,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,KAAK,CAAC,wBAAwB,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,EAAE,EAAE;YACtE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM;YAC9B,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,UAAU;YACtC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM;YAC5B,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG;YACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI;SAC/B,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,0CAA0C,CAAC,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"oryAxiosClient.js","sourceRoot":"","sources":["../../src/lib/oryAxiosClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE9E,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,WAAW,CACxB;QACE,OAAO;QACP,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,cAAc;SAC7B;KACF,EACD;QACE,MAAM,EAAE,GAAG;KACZ,CACF,CAAC;IAEF,iBAAiB,CAAC,MAAM,EAAE;QACxB,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,yCAAyC;KAChD,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAC9B,CAAC,QAAQ,EAAE,EAAE;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,CAAC,KAAiB,EAAE,EAAE;QACpB,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,0CAA0C,CAAC,CAAC,CAAC;QAC9F,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takaro/auth",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "An opinionated auth handler",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package/src/lib/__tests__/ory.integration.test.ts

@@ -21,7 +21,7 @@ describe('Ory', () => {
 
     // Make sure they're gone
     await expect(ory.getIdentity(identities[0].id)).to.eventually.be.rejectedWith(
-      'Request failed with status code 404',
+      'Request failed with status 404 Not Found',
     );
   });
 });

package/src/lib/oryAxiosClient.ts

@@ -1,65 +1,34 @@
-import axios, { AxiosError } from 'axios';
-import { addCounterToAxios, errors, logger } from '@takaro/util';
-
-const log = logger('ory:http');
+import { AxiosError } from 'axios';
+import { addCounterToAxios, errors, logger, createAxios } from '@takaro/util';
 
 export function createAxiosClient(baseURL: string) {
-  const client = axios.create({
-    baseURL,
-    headers: {
-      'Content-Type': 'application/json',
-      'User-Agent': 'Takaro-Agent',
+  const log = logger('ory:http');
+  const client = createAxios(
+    {
+      baseURL,
+      headers: {
+        'Content-Type': 'application/json',
+        'User-Agent': 'Takaro-Agent',
+      },
     },
-  });
+    {
+      logger: log,
+    },
+  );
 
   addCounterToAxios(client, {
     name: 'ory_api_requests_total',
     help: 'Total number of requests to the Ory API',
   });
 
-  client.interceptors.request.use((request) => {
-    log.silly(`➡️ ${request.method?.toUpperCase()} ${request.url}`, {
-      method: request.method,
-      url: request.url,
-    });
-    return request;
-  });
-
   client.interceptors.response.use(
     (response) => {
-      log.silly(
-        `⬅️ ${response.request.method?.toUpperCase()} ${response.request.path} ${response.status} ${
-          response.statusText
-        }`,
-        {
-          status: response.status,
-          method: response.request.method,
-          url: response.request.url,
-        },
-      );
-
       return response;
     },
     (error: AxiosError) => {
-      let details = {};
-
-      if (error.response?.data) {
-        const data = error.response.data as Record<string, unknown>;
-        details = JSON.stringify(data.error_description);
-      }
-
-      log.error(`☠️ Request errored: [${error.response?.status}] ${details}`, {
-        status: error.response?.status,
-        statusText: error.response?.statusText,
-        method: error.config?.method,
-        url: error.config?.url,
-        response: error.response?.data,
-      });
-
       if (error.response?.status === 409) {
         return Promise.reject(new errors.ConflictError('User with this identifier already exists'));
       }
-
       return Promise.reject(error);
     },
   );