@extrahorizon/javascript-sdk 8.14.1 → 8.14.2-dev-208-aa6da5c

package/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.14.2]
+
+### Fixed
+- OAuth2 token refreshes are now shared between parallel requests
+
 ## [8.14.1]
 
 ### Fixed

package/build/index.cjs.js

@@ -2390,6 +2390,7 @@ function btoa(input) {
 const TOKEN_ENDPOINT = `${AUTH_BASE}/oauth2/tokens`;
 function createOAuth2HttpClient(http, options) {
     let tokenData;
+    let refreshingTokensPromise = null;
     if ('refreshToken' in options && 'accessToken' in options) {
         tokenData = {
             refreshToken: options.refreshToken,
@@ -2443,7 +2444,7 @@ function createOAuth2HttpClient(http, options) {
             // Refresh 10 seconds before the token is about to expire.
             // This is to prevent being just too late with a refresh of the token due to latencies
             if (Date.now() > expireTime - 10 * 1000) {
-                await authenticate({ refreshToken: tokenData.refreshToken });
+                await refreshTokens();
             }
         }
         return {
@@ -2467,7 +2468,7 @@ function createOAuth2HttpClient(http, options) {
             [118, 117].includes((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.code) &&
             !originalRequest.isRetryWithRefreshedTokens) {
             originalRequest.isRetryWithRefreshedTokens = true;
-            await authenticate({ refreshToken: tokenData.refreshToken });
+            await refreshTokens();
             return httpWithAuth(originalRequest);
         }
         throw error;
@@ -2508,6 +2509,18 @@ function createOAuth2HttpClient(http, options) {
             {});
         return await dateAndSetTokenData(tokenResult.data);
     }
+    async function refreshTokens() {
+        if (refreshingTokensPromise) {
+            return refreshingTokensPromise;
+        }
+        refreshingTokensPromise = authenticate({ refreshToken: tokenData.refreshToken });
+        try {
+            return await refreshingTokensPromise;
+        }
+        finally {
+            refreshingTokensPromise = null;
+        }
+    }
     async function confirmMfa({ token, methodId, code, }) {
         const tokenResult = await http.post(TOKEN_ENDPOINT, {
             ...clientCredentials,
@@ -5768,7 +5781,7 @@ const templatesV2Service = (httpWithAuth) => {
     };
 };
 
-const version = '8.14.1';
+const version = '8.14.2-dev-208-aa6da5c';
 
 /**
  * Create ExtraHorizon client.

package/build/index.mjs

@@ -2360,6 +2360,7 @@ function btoa(input) {
 const TOKEN_ENDPOINT = `${AUTH_BASE}/oauth2/tokens`;
 function createOAuth2HttpClient(http, options) {
     let tokenData;
+    let refreshingTokensPromise = null;
     if ('refreshToken' in options && 'accessToken' in options) {
         tokenData = {
             refreshToken: options.refreshToken,
@@ -2413,7 +2414,7 @@ function createOAuth2HttpClient(http, options) {
             // Refresh 10 seconds before the token is about to expire.
             // This is to prevent being just too late with a refresh of the token due to latencies
             if (Date.now() > expireTime - 10 * 1000) {
-                await authenticate({ refreshToken: tokenData.refreshToken });
+                await refreshTokens();
             }
         }
         return {
@@ -2437,7 +2438,7 @@ function createOAuth2HttpClient(http, options) {
             [118, 117].includes((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.code) &&
             !originalRequest.isRetryWithRefreshedTokens) {
             originalRequest.isRetryWithRefreshedTokens = true;
-            await authenticate({ refreshToken: tokenData.refreshToken });
+            await refreshTokens();
             return httpWithAuth(originalRequest);
         }
         throw error;
@@ -2478,6 +2479,18 @@ function createOAuth2HttpClient(http, options) {
             {});
         return await dateAndSetTokenData(tokenResult.data);
     }
+    async function refreshTokens() {
+        if (refreshingTokensPromise) {
+            return refreshingTokensPromise;
+        }
+        refreshingTokensPromise = authenticate({ refreshToken: tokenData.refreshToken });
+        try {
+            return await refreshingTokensPromise;
+        }
+        finally {
+            refreshingTokensPromise = null;
+        }
+    }
     async function confirmMfa({ token, methodId, code, }) {
         const tokenResult = await http.post(TOKEN_ENDPOINT, {
             ...clientCredentials,
@@ -5738,7 +5751,7 @@ const templatesV2Service = (httpWithAuth) => {
     };
 };
 
-const version = '8.14.1';
+const version = '8.14.2-dev-208-aa6da5c';
 
 /**
  * Create ExtraHorizon client.

package/build/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.14.1";
+export declare const version = "8.14.2-dev-208-aa6da5c";

package/build/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.14.1";
+export declare const version = "8.14.2-dev-208-aa6da5c";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/javascript-sdk",
-  "version": "8.14.1",
+  "version": "8.14.2-dev-208-aa6da5c",
   "description": "This package serves as a JavaScript wrapper around all Extra Horizon cloud services.",
   "main": "build/index.cjs.js",
   "types": "build/types/index.d.ts",