@orbis-systems/orbis-api-clients 0.5.1 → 0.5.2

package/dist/uma/index.js

@@ -1,8 +1,8 @@
+var $l6jTM$jwtdecode = require("jwt-decode");
 var $l6jTM$autobind = require("auto-bind");
 var $l6jTM$asyncmutex = require("async-mutex");
 var $l6jTM$consola = require("consola");
 var $l6jTM$datefns = require("date-fns");
-var $l6jTM$jwtdecode = require("jwt-decode");
 var $l6jTM$axios = require("axios");
 var $l6jTM$axiosbetterstacktrace = require("axios-better-stacktrace");
 var $l6jTM$lodash = require("lodash");
@@ -36,6 +36,7 @@ var $e0cb59dd918b422a$exports = {};
 
 $parcel$export($e0cb59dd918b422a$exports, "UmaApi", () => $e0cb59dd918b422a$export$ae615290d7b354e);
 
+
 class $780091c10287ceed$export$3ad201792064a82b {
     // request: ApiClient['request'];
     // get: ApiClient['get'];
@@ -234,8 +235,8 @@ class $538ed1203bac2e79$export$f280b732bbc5934b extends (0, $3621850f1f570615$ex
         }
         if (this.config.autoRenewToken !== false && this.isTokenExpired(accessToken)) try {
             await this.lock.runExclusive(async ()=>{
-                (0, $l6jTM$consola.consola).info("Token expired. Renewing\u2026");
-                await this.renewToken();
+                if (this.config.debug) (0, $l6jTM$consola.consola).debug("Token expired. Renewing\u2026");
+                accessToken = (await this.renewToken()).accessToken;
                 this.lock.cancel();
             });
         } catch (error) {
@@ -254,9 +255,11 @@ class $538ed1203bac2e79$export$f280b732bbc5934b extends (0, $3621850f1f570615$ex
         return (0, $l6jTM$datefns.isBefore)((0, $l6jTM$datefns.subMinutes)(payload.exp * 1000, 5), Date.now());
     }
     async renewToken() {
-        if (!this.renewTokenCallback) throw new Error('No renew token callback provided');
-        const authData = await this.renewTokenCallback();
+        const callback = this.config.onRenewToken ?? this.renewTokenCallback;
+        if (!callback) throw new Error('No renew token callback provided');
+        const authData = await callback();
         this.setAuthData(authData);
+        return authData;
     }
 }
 
@@ -3752,10 +3755,6 @@ $parcel$exportWildcard($dbc7cbd402bafa1b$exports, $e568b1faeb20dc39$exports);
 
 
 class $f95085163b769504$export$d0994445e90c353b extends (0, $9d5428c2d0a8567e$export$d0994445e90c353b) {
-    constructor(apiClient){
-        super(apiClient);
-        this.apiClient.setRenewTokenCallback(this.renewToken);
-    }
     /**
      * @description Login B2B user by email/password.
      * @tags b2b_auth
@@ -3770,27 +3769,11 @@ class $f95085163b769504$export$d0994445e90c353b extends (0, $9d5428c2d0a8567e$ex
         });
         return response;
     }
-    async renewToken() {
-        const refreshToken = this.apiClient.getAuthData()?.refreshToken;
-        if (!refreshToken) throw new Error('Refresh token not found');
-        const response = await this.refreshTokens({
-            refresh_token: refreshToken
-        });
-        if (response.success) return {
-            accessToken: response.data.login_basic.tokens.access_token ?? '',
-            refreshToken: response.data.login_basic.tokens.refresh_token ?? ''
-        };
-        else throw new Error(`Could not renew token: ${String(response.error)}`);
-    }
 }
 
 
 
 class $ea740c3dc351b0e9$export$191c573f104d53f4 extends (0, $b2299ac954a8fc8d$export$191c573f104d53f4) {
-    constructor(apiClient){
-        super(apiClient);
-        this.apiClient.setRenewTokenCallback(this.renewToken);
-    }
     /**
      * @description Login B2C user by email/password.
      * @tags b2c_auth
@@ -3805,26 +3788,13 @@ class $ea740c3dc351b0e9$export$191c573f104d53f4 extends (0, $b2299ac954a8fc8d$ex
         });
         return response;
     }
-    async renewToken() {
-        const refreshToken = this.apiClient.getAuthData()?.refreshToken;
-        if (!refreshToken) throw new Error('Refresh token not found');
-        const response = await this.refreshTokens({
-            refresh_token: refreshToken,
-            auth_form_slug: this.apiClient.getConfig().authFormSlug
-        });
-        if (response.success) return {
-            accessToken: response.data.login_basic.tokens.access_token ?? '',
-            refreshToken: response.data.login_basic.tokens.refresh_token ?? ''
-        };
-        else throw new Error(`Could not renew token: ${String(response.error)}`);
-    }
 }
 
 
 
 class $e0cb59dd918b422a$export$ae615290d7b354e extends (0, $780091c10287ceed$export$3ad201792064a82b) {
     constructor(config){
-        super(new (0, $538ed1203bac2e79$export$f280b732bbc5934b)(config));
+        super(new (0, $538ed1203bac2e79$export$f280b732bbc5934b)(config)), this.config = config;
         this.actionLog = new (0, $467e4c6e7d89aebd$export$e241ab6b9aa14723)(this.apiClient);
         this.apiKeys = new (0, $9f9d15a2ead3d19e$export$a67a305ca3f5ec6a)(this.apiClient);
         this.authApps = new (0, $9afc25bb6382508d$export$d3eceb771169d266)(this.apiClient);
@@ -3855,6 +3825,25 @@ class $e0cb59dd918b422a$export$ae615290d7b354e extends (0, $780091c10287ceed$exp
         this.usersCommon = new (0, $9d93f73b1440f840$export$12728e6e259e1581)(this.apiClient);
         this.watchmenAuth = new (0, $3d93a2bbc8d670c7$export$b5681ba9d8d05c26)(this.apiClient);
         this.watchmenInstances = new (0, $e568b1faeb20dc39$export$a780f46fdf729420)(this.apiClient);
+        this.apiClient.setRenewTokenCallback(this.renewToken);
+    }
+    async renewToken() {
+        const refreshToken = this.apiClient.getAuthData()?.refreshToken;
+        if (!refreshToken) throw new Error('Refresh token not found');
+        const payload = (0, $l6jTM$jwtdecode.jwtDecode)(refreshToken);
+        let response;
+        if (payload.u_type === 'b2b') response = await this.b2bAuth.refreshTokens({
+            refresh_token: refreshToken
+        });
+        else response = await this.b2cAuth.refreshTokens({
+            refresh_token: refreshToken,
+            auth_form_slug: this.apiClient.getConfig().authFormSlug
+        });
+        if (response.success) return {
+            accessToken: response.data.login_basic.tokens.access_token ?? '',
+            refreshToken: response.data.login_basic.tokens.refresh_token ?? ''
+        };
+        else throw new Error(`Could not renew token: ${String(response.error)}`);
     }
 }