@commercelayer/sdk 7.0.0-beta.11 → 7.0.0-beta.13

package/lib/client.js

@@ -1,16 +1,10 @@
+import { __privateAdd, __privateSet, __privateGet } from './chunk-AQ5VUG5P.js';
 import { SdkError, handleError, isExpiredTokenError, ErrorType } from './error';
 import config from './config';
 import { fetchURL } from './fetch';
 import { extractTokenData, isTokenExpired } from './util';
 import Debug from './debug';
 
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
 var _baseUrl, _accessToken, _organization, _domain, _clientConfig, _interceptors;
 const debug = Debug("client");
 const baseURL = (organization, domain) => {
@@ -100,6 +94,8 @@ const _ApiClient = class _ApiClient {
     const headers = { ...this.requestHeaders, ...this.customHeaders(options?.headers) };
     const accessToken = options?.accessToken || __privateGet(this, _accessToken);
     if (accessToken) headers.Authorization = "Bearer " + accessToken;
+    const refreshToken = options?.refreshToken || __privateGet(this, _clientConfig).refreshToken;
+    const fetchFunction = options?.fetch || __privateGet(this, _clientConfig).fetch;
     const requestOptions = { method, body: bodyData, headers };
     const timeout = options?.timeout || __privateGet(this, _clientConfig).timeout;
     if (timeout) {
@@ -111,14 +107,14 @@ const _ApiClient = class _ApiClient {
     });
     const clientOptions = {
       interceptors: this.interceptors,
-      fetch: options?.fetch || __privateGet(this, _clientConfig).fetch
+      fetch: fetchFunction
     };
     try {
       return await fetchURL(url, requestOptions, clientOptions).catch((error) => handleError(error));
     } catch (err) {
-      if (isExpiredTokenError(err) && __privateGet(this, _clientConfig).refreshToken && isTokenExpired(__privateGet(this, _accessToken))) {
+      if (isExpiredTokenError(err) && refreshToken && isTokenExpired(accessToken)) {
         debug("Access token has expired");
-        const newAccessToken = await __privateGet(this, _clientConfig).refreshToken(__privateGet(this, _accessToken)).catch((e) => {
+        const newAccessToken = await refreshToken(__privateGet(this, _accessToken)).catch((e) => {
           debug("Refresh token error: %s", e.message);
           const tokenError = new SdkError({ message: "Error refreshing access token", type: ErrorType.TOKEN_REFRESH });
           tokenError.source = e;
@@ -127,6 +123,7 @@ const _ApiClient = class _ApiClient {
         if (newAccessToken) {
           debug("Access token refreshed");
           this.config({ accessToken: newAccessToken });
+          __privateSet(this, _accessToken, newAccessToken);
           if (requestOptions.headers) requestOptions.headers.Authorization = `Bearer ${newAccessToken}`;
           const response = await fetchURL(url, requestOptions, clientOptions).catch((error) => handleError(error));
           return response;