@sebspark/openapi-client 2.0.0 → 2.1.0

package/dist/index.js

@@ -29,16 +29,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   TypedClient: () => TypedClient
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/client.ts
 var import_openapi_core = require("@sebspark/openapi-core");
 var import_retry = require("@sebspark/retry");
 var import_axios = __toESM(require("axios"));
+var import_axios_auth_refresh = __toESM(require("axios-auth-refresh"));
 
 // src/paramsSerializer.ts
 var encodeParam = (param) => encodeURIComponent(param);
@@ -92,6 +93,34 @@ var paramsSerializer = (format) => (params) => {
 
 // src/client.ts
 var TypedClient = (baseURL, globalOptions, logger) => {
+  if (globalOptions?.authorizationTokenGenerator) {
+    import_axios.default.interceptors.request.use(async (request) => {
+      if (globalOptions?.authorizationTokenGenerator) {
+        const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(request.url);
+        if (authorizationTokenHeaders) {
+          for (const [key, value] of Object.entries(
+            authorizationTokenHeaders
+          )) {
+            request.headers.set(key, value);
+          }
+        }
+      }
+      return request;
+    });
+  }
+  if (globalOptions?.authorizationTokenRefresh) {
+    const refreshAuthLogic = async (failedRequest) => {
+      if (!import_axios.default.isAxiosError(failedRequest)) {
+        return;
+      }
+      const axiosError = failedRequest;
+      const url = `${axiosError.config?.baseURL}${axiosError.config?.url}`;
+      if (globalOptions?.authorizationTokenRefresh && url) {
+        await globalOptions?.authorizationTokenRefresh(axiosError.request.url);
+      }
+    };
+    (0, import_axios_auth_refresh.default)(import_axios.default, refreshAuthLogic);
+  }
   if (logger) {
     import_axios.default.interceptors.request.use((request) => {
       const requestObject = {
@@ -122,10 +151,9 @@ var TypedClient = (baseURL, globalOptions, logger) => {
   return client;
 };
 var callServer = async (args) => {
-  var _a, _b;
   try {
     const serializer = paramsSerializer(args.arrayFormat);
-    const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
+    const body = args.method?.toLowerCase() === "get" || args.method?.toLowerCase() === "delete" ? void 0 : args.body;
     const { headers, data } = await (0, import_retry.retry)(
       () => import_axios.default.request({
         baseURL: args.baseUrl,
@@ -159,20 +187,20 @@ var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
     headers,
     body,
     retry: retry2,
-    arrayFormat: global == null ? void 0 : global.arrayFormat,
-    httpsAgent: extras == null ? void 0 : extras.httpsAgent,
-    httpAgent: extras == null ? void 0 : extras.httpAgent
+    arrayFormat: global?.arrayFormat,
+    httpsAgent: extras?.httpsAgent,
+    httpAgent: extras?.httpAgent
   };
   return merged;
 };
-var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
+var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => a?.[prop] || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url
 );
 
 // src/index.ts
-__reExport(src_exports, require("@sebspark/retry"), module.exports);
+__reExport(index_exports, require("@sebspark/retry"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   TypedClient,

package/dist/index.mjs

@@ -4,6 +4,7 @@ import {
 } from "@sebspark/openapi-core";
 import { retry } from "@sebspark/retry";
 import axios from "axios";
+import createAuthRefreshInterceptor from "axios-auth-refresh";
 
 // src/paramsSerializer.ts
 var encodeParam = (param) => encodeURIComponent(param);
@@ -57,6 +58,34 @@ var paramsSerializer = (format) => (params) => {
 
 // src/client.ts
 var TypedClient = (baseURL, globalOptions, logger) => {
+  if (globalOptions?.authorizationTokenGenerator) {
+    axios.interceptors.request.use(async (request) => {
+      if (globalOptions?.authorizationTokenGenerator) {
+        const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(request.url);
+        if (authorizationTokenHeaders) {
+          for (const [key, value] of Object.entries(
+            authorizationTokenHeaders
+          )) {
+            request.headers.set(key, value);
+          }
+        }
+      }
+      return request;
+    });
+  }
+  if (globalOptions?.authorizationTokenRefresh) {
+    const refreshAuthLogic = async (failedRequest) => {
+      if (!axios.isAxiosError(failedRequest)) {
+        return;
+      }
+      const axiosError = failedRequest;
+      const url = `${axiosError.config?.baseURL}${axiosError.config?.url}`;
+      if (globalOptions?.authorizationTokenRefresh && url) {
+        await globalOptions?.authorizationTokenRefresh(axiosError.request.url);
+      }
+    };
+    createAuthRefreshInterceptor(axios, refreshAuthLogic);
+  }
   if (logger) {
     axios.interceptors.request.use((request) => {
       const requestObject = {
@@ -87,10 +116,9 @@ var TypedClient = (baseURL, globalOptions, logger) => {
   return client;
 };
 var callServer = async (args) => {
-  var _a, _b;
   try {
     const serializer = paramsSerializer(args.arrayFormat);
-    const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
+    const body = args.method?.toLowerCase() === "get" || args.method?.toLowerCase() === "delete" ? void 0 : args.body;
     const { headers, data } = await retry(
       () => axios.request({
         baseURL: args.baseUrl,
@@ -124,13 +152,13 @@ var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
     headers,
     body,
     retry: retry2,
-    arrayFormat: global == null ? void 0 : global.arrayFormat,
-    httpsAgent: extras == null ? void 0 : extras.httpsAgent,
-    httpAgent: extras == null ? void 0 : extras.httpAgent
+    arrayFormat: global?.arrayFormat,
+    httpsAgent: extras?.httpsAgent,
+    httpAgent: extras?.httpAgent
   };
   return merged;
 };
-var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
+var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => a?.[prop] || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce(
   (url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`),
   url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-client",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -19,11 +19,14 @@
   },
   "devDependencies": {
     "@sebspark/openapi-typegen": "*",
-    "tsconfig": "*"
+    "nock": "14.0.1",
+    "tsconfig": "*",
+    "vitest": "^3.0.7"
   },
   "dependencies": {
     "@sebspark/openapi-core": "*",
     "@sebspark/retry": "*",
-    "axios": "1.7.9"
+    "axios": "1.8.1",
+    "axios-auth-refresh": "3.3.6"
   }
 }