@leapdev/auth-agent 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapdev/auth-agent",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "LEAP Auth Agent",
   "license": "LEAP Legal Software, PTY LTD",
   "main": "./src/index.js",

package/src/index.umd.js

@@ -6310,6 +6310,23 @@
       }
       return result;
     };
+    function createInFlightDedupe() {
+      let inFlight;
+      return factory => __awaiter(this, void 0, void 0, function* () {
+        if (inFlight) return inFlight;
+        console.log('11111111111111');
+        const promise = (() => __awaiter(this, void 0, void 0, function* () {
+          try {
+            return yield factory();
+          } finally {
+            console.log('inFlight-------------------- cleanup');
+            inFlight = undefined;
+          }
+        }))();
+        inFlight = promise;
+        return promise;
+      });
+    }
 
     var _Notification_pubnubKeys, _Notification_pubnub, _Notification_eventListeners, _Notification_userId, _Notification_uniqueSessionTriggerHook, _Notification_userPresenceTriggerHook, _Notification_currentUUIDString, _Notification_joinTimeToken, _Notification_initFirmChannel, _Notification_initUserChannel, _Notification_initUniqueSessionChannel;
     const EMPTY_GUID = '00000000-0000-0000-0000-000000000000';
@@ -6721,9 +6738,18 @@
       let redirection;
       let redirectUrl;
       const topLevelDomains = redirectionConfig.topLevelDomains;
-      const redirections = redirectionConfig.environments;
-      const suffix = topLevelDomains.find(suffix => origin.endsWith(suffix));
-      const environmentVariables = redirectionConfig.environmentVariables;
+      const topLevelDomainsV2 = redirectionConfig.topLevelDomains_v2;
+      let suffix;
+      let redirections = redirectionConfig.environments;
+      let environmentVariables;
+      suffix = topLevelDomainsV2.find(s => origin.endsWith(s));
+      if (suffix) {
+        redirections = redirectionConfig.environments_v2;
+        environmentVariables = {};
+      } else {
+        suffix = topLevelDomains.find(s => origin.endsWith(s));
+        environmentVariables = redirectionConfig.environmentVariables;
+      }
       if (suffix) {
         for (let i = 0; i < redirections.length; i++) {
           redirection = redirections[i];
@@ -6764,7 +6790,7 @@
       return list.find(appName => app.startsWith(`http://${appName}`) || app.startsWith(`https://${appName}`));
     };
 
-    var _Authentication_accessToken, _Authentication_config, _Authentication_leapAuthService, _Authentication_notification, _Authentication_refreshInfo, _Authentication_exchangeAuthCodeForAccessToken, _Authentication_verifyAndPerformRedirections, _Authentication_startRefreshAccessTokenProcess, _Authentication_destroyRefreshAccessTokenProcess, _Authentication_decodeAccessToken;
+    var _Authentication_accessToken, _Authentication_config, _Authentication_leapAuthService, _Authentication_notification, _Authentication_refreshInfo, _Authentication_dedupeAccessTokenFetch, _Authentication_dedupeUserInfoFetch, _Authentication_exchangeAuthCodeForAccessToken, _Authentication_verifyAndPerformRedirections, _Authentication_startRefreshAccessTokenProcess, _Authentication_destroyRefreshAccessTokenProcess, _Authentication_decodeAccessToken, _Authentication_getRefreshedAccessTokenFactory, _Authentication_getUserInfoFactory;
     const SECONDS_BEFORE_EXPIRE = 30;
     const MAX_SETTIME_OUT = 2147483647;
     const DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS = 60;
@@ -6777,6 +6803,8 @@
         _Authentication_leapAuthService.set(this, void 0);
         _Authentication_notification.set(this, void 0);
         _Authentication_refreshInfo.set(this, void 0);
+        _Authentication_dedupeAccessTokenFetch.set(this, void 0);
+        _Authentication_dedupeUserInfoFetch.set(this, void 0);
         this.registerEventListenerForUserChannel = params => {
           const {
             topic,
@@ -6854,27 +6882,10 @@
           if (__classPrivateFieldGet(this, _Authentication_accessToken, "f") === undefined || !__classPrivateFieldGet(this, _Authentication_accessToken, "f")) {
             return '';
           } else {
-            if (__classPrivateFieldGet(this, _Authentication_refreshInfo, "f") && __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").accessTokenExpireIn) {
-              const decoded = __classPrivateFieldGet(this, _Authentication_decodeAccessToken, "f").call(this, __classPrivateFieldGet(this, _Authentication_accessToken, "f"));
-              if (force || !!decoded && (decoded.exp - SECONDS_BEFORE_EXPIRE) * 1000 < Date.now()) {
-                const data = yield __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").renewAccessToken({
-                  refreshToken: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").refreshToken,
-                  verifier: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").verifier
-                });
-                if (data) {
-                  if (data.refresh_token && data.expires_in) {
-                    __classPrivateFieldSet(this, _Authentication_refreshInfo, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _Authentication_refreshInfo, "f")), {
-                      refreshToken: data.refresh_token,
-                      accessTokenExpireIn: data.expires_in
-                    }), "f");
-                  }
-                  __classPrivateFieldSet(this, _Authentication_accessToken, data.access_token, "f");
-                  yield this.triggerHooks(HookName.afterRefreshToken);
-                  return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
-                }
-              }
-            }
-            return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
+            return __classPrivateFieldGet(this, _Authentication_dedupeAccessTokenFetch, "f").call(this, () => __awaiter(this, void 0, void 0, function* () {
+              const data = yield __classPrivateFieldGet(this, _Authentication_getRefreshedAccessTokenFactory, "f").call(this, force);
+              return data;
+            }));
           }
         });
         this.getDecodedAccessToken = () => {
@@ -7023,8 +7034,10 @@
           }
         });
         this.getUserInfo = () => __awaiter(this, void 0, void 0, function* () {
-          const token = yield this.getRefreshedAccessToken();
-          return __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").userInfo(token);
+          return __classPrivateFieldGet(this, _Authentication_dedupeUserInfoFetch, "f").call(this, () => __awaiter(this, void 0, void 0, function* () {
+            const data = yield __classPrivateFieldGet(this, _Authentication_getUserInfoFactory, "f").call(this);
+            return data;
+          }));
         });
         this.linkUser = params => __awaiter(this, void 0, void 0, function* () {
           const decodeToken = yield this.getDecodedRefreshedAccessToken();
@@ -7183,8 +7196,7 @@
         });
         this.triggerHooks = hookName => __awaiter(this, void 0, void 0, function* () {
           const hooks = this.getHooks();
-          const token = yield this.getRefreshedAccessToken();
-          const hookFn = hooks && !!hooks[hookName] && lodash.isFunction(hooks[hookName]) ? hooks[hookName](token) : false;
+          const hookFn = hooks && !!hooks[hookName] && lodash.isFunction(hooks[hookName]) ? hooks[hookName]() : false;
           return Promise.resolve(hookFn);
         });
         this.afterAuthenticated = () => {
@@ -7338,13 +7350,44 @@
           }
           return undefined;
         });
+        _Authentication_getRefreshedAccessTokenFactory.set(this, force => __awaiter(this, void 0, void 0, function* () {
+          if (__classPrivateFieldGet(this, _Authentication_refreshInfo, "f") && __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").accessTokenExpireIn) {
+            const decoded = __classPrivateFieldGet(this, _Authentication_decodeAccessToken, "f").call(this, __classPrivateFieldGet(this, _Authentication_accessToken, "f"));
+            if (force || !!decoded && (decoded.exp - SECONDS_BEFORE_EXPIRE) * 1000 < Date.now()) {
+              const data = yield __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").renewAccessToken({
+                refreshToken: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").refreshToken,
+                verifier: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").verifier
+              });
+              if (data) {
+                if (data.refresh_token && data.expires_in) {
+                  __classPrivateFieldSet(this, _Authentication_refreshInfo, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _Authentication_refreshInfo, "f")), {
+                    refreshToken: data.refresh_token,
+                    accessTokenExpireIn: data.expires_in
+                  }), "f");
+                }
+                if (data) {
+                  yield this.triggerHooks(HookName.afterRefreshToken);
+                }
+                __classPrivateFieldSet(this, _Authentication_accessToken, data.access_token, "f");
+                return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
+              }
+            }
+          }
+          return __classPrivateFieldGet(this, _Authentication_accessToken, "f") || '';
+        }));
+        _Authentication_getUserInfoFactory.set(this, () => __awaiter(this, void 0, void 0, function* () {
+          const token = yield this.getRefreshedAccessToken();
+          return __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").userInfo(token);
+        }));
         __classPrivateFieldSet(this, _Authentication_accessToken, undefined, "f");
         __classPrivateFieldSet(this, _Authentication_config, init$1(options), "f");
         __classPrivateFieldSet(this, _Authentication_leapAuthService, new LeapAuthService(__classPrivateFieldGet(this, _Authentication_config, "f").authHost, __classPrivateFieldGet(this, _Authentication_config, "f").clientId), "f");
         __classPrivateFieldSet(this, _Authentication_notification, new Notification(), "f");
+        __classPrivateFieldSet(this, _Authentication_dedupeAccessTokenFetch, createInFlightDedupe(), "f");
+        __classPrivateFieldSet(this, _Authentication_dedupeUserInfoFetch, createInFlightDedupe(), "f");
       }
     }
-    _Authentication_accessToken = new WeakMap(), _Authentication_config = new WeakMap(), _Authentication_leapAuthService = new WeakMap(), _Authentication_notification = new WeakMap(), _Authentication_refreshInfo = new WeakMap(), _Authentication_exchangeAuthCodeForAccessToken = new WeakMap(), _Authentication_verifyAndPerformRedirections = new WeakMap(), _Authentication_startRefreshAccessTokenProcess = new WeakMap(), _Authentication_destroyRefreshAccessTokenProcess = new WeakMap(), _Authentication_decodeAccessToken = new WeakMap();
+    _Authentication_accessToken = new WeakMap(), _Authentication_config = new WeakMap(), _Authentication_leapAuthService = new WeakMap(), _Authentication_notification = new WeakMap(), _Authentication_refreshInfo = new WeakMap(), _Authentication_dedupeAccessTokenFetch = new WeakMap(), _Authentication_dedupeUserInfoFetch = new WeakMap(), _Authentication_exchangeAuthCodeForAccessToken = new WeakMap(), _Authentication_verifyAndPerformRedirections = new WeakMap(), _Authentication_startRefreshAccessTokenProcess = new WeakMap(), _Authentication_destroyRefreshAccessTokenProcess = new WeakMap(), _Authentication_decodeAccessToken = new WeakMap(), _Authentication_getRefreshedAccessTokenFactory = new WeakMap(), _Authentication_getUserInfoFactory = new WeakMap();
 
     var _IdleTimer_timeoutInMinutes, _IdleTimer_timer, _IdleTimer_onTimeout, _IdleTimer_cleanUpTracker, _IdleTimer_clearTimeout, _IdleTimer_resetTimer;
     class IdleTimer {

package/src/lib/authentication.js

@@ -1,11 +1,11 @@
-var _Authentication_accessToken, _Authentication_config, _Authentication_leapAuthService, _Authentication_notification, _Authentication_refreshInfo, _Authentication_exchangeAuthCodeForAccessToken, _Authentication_verifyAndPerformRedirections, _Authentication_startRefreshAccessTokenProcess, _Authentication_destroyRefreshAccessTokenProcess, _Authentication_decodeAccessToken;
+var _Authentication_accessToken, _Authentication_config, _Authentication_leapAuthService, _Authentication_notification, _Authentication_refreshInfo, _Authentication_dedupeAccessTokenFetch, _Authentication_dedupeUserInfoFetch, _Authentication_exchangeAuthCodeForAccessToken, _Authentication_verifyAndPerformRedirections, _Authentication_startRefreshAccessTokenProcess, _Authentication_destroyRefreshAccessTokenProcess, _Authentication_decodeAccessToken, _Authentication_getRefreshedAccessTokenFactory, _Authentication_getUserInfoFactory;
 import { __awaiter, __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { isFunction } from 'lodash';
 import { init } from './config';
 import { LeapAuthService } from './auth.service';
 import { HookName, } from './types';
 import { Notification } from './notification';
-import { createCodeChallenge, createLoginUrl, createRandomString, deleteQueryParameter, getQueryParameter } from './utils';
+import { createCodeChallenge, createInFlightDedupe, createLoginUrl, createRandomString, deleteQueryParameter, getQueryParameter } from './utils';
 import { getRedirectUri } from './redirections';
 const SECONDS_BEFORE_EXPIRE = 30;
 const MAX_SETTIME_OUT = 2147483647;
@@ -19,6 +19,8 @@ export class Authentication {
         _Authentication_leapAuthService.set(this, void 0);
         _Authentication_notification.set(this, void 0);
         _Authentication_refreshInfo.set(this, void 0);
+        _Authentication_dedupeAccessTokenFetch.set(this, void 0);
+        _Authentication_dedupeUserInfoFetch.set(this, void 0);
         this.registerEventListenerForUserChannel = (params) => {
             const { topic, messageType, callback } = params;
             __classPrivateFieldGet(this, _Authentication_notification, "f").registerEventListenerForUserChannel({
@@ -88,24 +90,10 @@ export class Authentication {
                 return '';
             }
             else {
-                if (__classPrivateFieldGet(this, _Authentication_refreshInfo, "f") && __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").accessTokenExpireIn) {
-                    const decoded = __classPrivateFieldGet(this, _Authentication_decodeAccessToken, "f").call(this, __classPrivateFieldGet(this, _Authentication_accessToken, "f"));
-                    if (force || (!!decoded && ((decoded.exp - SECONDS_BEFORE_EXPIRE) * 1000 < Date.now()))) {
-                        const data = yield __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").renewAccessToken({
-                            refreshToken: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").refreshToken,
-                            verifier: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").verifier,
-                        });
-                        if (data) {
-                            if (data.refresh_token && data.expires_in) {
-                                __classPrivateFieldSet(this, _Authentication_refreshInfo, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _Authentication_refreshInfo, "f")), { refreshToken: data.refresh_token, accessTokenExpireIn: data.expires_in }), "f");
-                            }
-                            __classPrivateFieldSet(this, _Authentication_accessToken, data.access_token, "f");
-                            yield this.triggerHooks(HookName.afterRefreshToken);
-                            return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
-                        }
-                    }
-                }
-                return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
+                return __classPrivateFieldGet(this, _Authentication_dedupeAccessTokenFetch, "f").call(this, () => __awaiter(this, void 0, void 0, function* () {
+                    const data = yield __classPrivateFieldGet(this, _Authentication_getRefreshedAccessTokenFactory, "f").call(this, force);
+                    return data;
+                }));
             }
         });
         this.getDecodedAccessToken = () => {
@@ -242,8 +230,10 @@ export class Authentication {
             }
         });
         this.getUserInfo = () => __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.getRefreshedAccessToken();
-            return __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").userInfo(token);
+            return __classPrivateFieldGet(this, _Authentication_dedupeUserInfoFetch, "f").call(this, () => __awaiter(this, void 0, void 0, function* () {
+                const data = yield __classPrivateFieldGet(this, _Authentication_getUserInfoFactory, "f").call(this);
+                return data;
+            }));
         });
         this.linkUser = (params) => __awaiter(this, void 0, void 0, function* () {
             const decodeToken = yield this.getDecodedRefreshedAccessToken();
@@ -385,8 +375,7 @@ export class Authentication {
         });
         this.triggerHooks = (hookName) => __awaiter(this, void 0, void 0, function* () {
             const hooks = this.getHooks();
-            const token = yield this.getRefreshedAccessToken();
-            const hookFn = hooks && !!hooks[hookName] && isFunction(hooks[hookName]) ? hooks[hookName](token) : false;
+            const hookFn = hooks && !!hooks[hookName] && isFunction(hooks[hookName]) ? hooks[hookName]() : false;
             return Promise.resolve(hookFn);
         });
         this.afterAuthenticated = () => {
@@ -530,10 +519,38 @@ export class Authentication {
             }
             return undefined;
         });
+        _Authentication_getRefreshedAccessTokenFactory.set(this, (force) => __awaiter(this, void 0, void 0, function* () {
+            if (__classPrivateFieldGet(this, _Authentication_refreshInfo, "f") && __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").accessTokenExpireIn) {
+                const decoded = __classPrivateFieldGet(this, _Authentication_decodeAccessToken, "f").call(this, __classPrivateFieldGet(this, _Authentication_accessToken, "f"));
+                if (force || (!!decoded && ((decoded.exp - SECONDS_BEFORE_EXPIRE) * 1000 < Date.now()))) {
+                    const data = yield __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").renewAccessToken({
+                        refreshToken: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").refreshToken,
+                        verifier: __classPrivateFieldGet(this, _Authentication_refreshInfo, "f").verifier,
+                    });
+                    if (data) {
+                        if (data.refresh_token && data.expires_in) {
+                            __classPrivateFieldSet(this, _Authentication_refreshInfo, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _Authentication_refreshInfo, "f")), { refreshToken: data.refresh_token, accessTokenExpireIn: data.expires_in }), "f");
+                        }
+                        if (data) {
+                            yield this.triggerHooks(HookName.afterRefreshToken);
+                        }
+                        __classPrivateFieldSet(this, _Authentication_accessToken, data.access_token, "f");
+                        return __classPrivateFieldGet(this, _Authentication_accessToken, "f");
+                    }
+                }
+            }
+            return __classPrivateFieldGet(this, _Authentication_accessToken, "f") || '';
+        }));
+        _Authentication_getUserInfoFactory.set(this, () => __awaiter(this, void 0, void 0, function* () {
+            const token = yield this.getRefreshedAccessToken();
+            return __classPrivateFieldGet(this, _Authentication_leapAuthService, "f").userInfo(token);
+        }));
         __classPrivateFieldSet(this, _Authentication_accessToken, undefined, "f");
         __classPrivateFieldSet(this, _Authentication_config, init(options), "f");
         __classPrivateFieldSet(this, _Authentication_leapAuthService, new LeapAuthService(__classPrivateFieldGet(this, _Authentication_config, "f").authHost, __classPrivateFieldGet(this, _Authentication_config, "f").clientId), "f");
         __classPrivateFieldSet(this, _Authentication_notification, new Notification(), "f");
+        __classPrivateFieldSet(this, _Authentication_dedupeAccessTokenFetch, createInFlightDedupe(), "f");
+        __classPrivateFieldSet(this, _Authentication_dedupeUserInfoFetch, createInFlightDedupe(), "f");
     }
 }
-_Authentication_accessToken = new WeakMap(), _Authentication_config = new WeakMap(), _Authentication_leapAuthService = new WeakMap(), _Authentication_notification = new WeakMap(), _Authentication_refreshInfo = new WeakMap(), _Authentication_exchangeAuthCodeForAccessToken = new WeakMap(), _Authentication_verifyAndPerformRedirections = new WeakMap(), _Authentication_startRefreshAccessTokenProcess = new WeakMap(), _Authentication_destroyRefreshAccessTokenProcess = new WeakMap(), _Authentication_decodeAccessToken = new WeakMap();
+_Authentication_accessToken = new WeakMap(), _Authentication_config = new WeakMap(), _Authentication_leapAuthService = new WeakMap(), _Authentication_notification = new WeakMap(), _Authentication_refreshInfo = new WeakMap(), _Authentication_dedupeAccessTokenFetch = new WeakMap(), _Authentication_dedupeUserInfoFetch = new WeakMap(), _Authentication_exchangeAuthCodeForAccessToken = new WeakMap(), _Authentication_verifyAndPerformRedirections = new WeakMap(), _Authentication_startRefreshAccessTokenProcess = new WeakMap(), _Authentication_destroyRefreshAccessTokenProcess = new WeakMap(), _Authentication_decodeAccessToken = new WeakMap(), _Authentication_getRefreshedAccessTokenFactory = new WeakMap(), _Authentication_getUserInfoFactory = new WeakMap();

package/src/lib/redirections.js

@@ -3,9 +3,19 @@ export const getRedirectUri = (origin, decodedToken, redirectionConfig) => {
     let redirection;
     let redirectUrl;
     const topLevelDomains = redirectionConfig.topLevelDomains;
-    const redirections = redirectionConfig.environments;
-    const suffix = topLevelDomains.find((suffix) => origin.endsWith(suffix));
-    const environmentVariables = redirectionConfig.environmentVariables;
+    const topLevelDomainsV2 = redirectionConfig.topLevelDomains_v2;
+    let suffix;
+    let redirections = redirectionConfig.environments;
+    let environmentVariables;
+    suffix = topLevelDomainsV2.find((s) => origin.endsWith(s));
+    if (suffix) {
+        redirections = redirectionConfig.environments_v2;
+        environmentVariables = {};
+    }
+    else {
+        suffix = topLevelDomains.find((s) => origin.endsWith(s));
+        environmentVariables = redirectionConfig.environmentVariables;
+    }
     if (suffix) {
         for (let i = 0; i < redirections.length; i++) {
             redirection = redirections[i];

package/src/lib/types.d.ts

@@ -75,10 +75,22 @@ export declare type LeapToken = {
 };
 export declare type Redirections = {
     topLevelDomains: Array<string>;
+    topLevelDomains_v2: Array<string>;
     environments: Array<{
         criteria: {
             region: string;
             environment: 'test' | 'live' | 'liveb';
+            countryCode: number;
+        };
+        topLevelDomain: string;
+        authHost: string;
+        applications: Array<string>;
+    }>;
+    environments_v2: Array<{
+        criteria: {
+            region: string;
+            environment: 'test' | 'live' | 'liveb';
+            countryCode: number;
         };
         topLevelDomain: string;
         authHost: string;

package/src/lib/utils.d.ts

@@ -20,3 +20,4 @@ export declare const createLoginUrl: (params: {
 }>;
 export declare const getCrypto: () => Crypto;
 export declare const createRandomString: (size: number) => string;
+export declare function createInFlightDedupe<V>(): (factory: () => Promise<V>) => Promise<V>;

package/src/lib/utils.js

@@ -99,3 +99,22 @@ const parseParams = (url) => {
     }
     return result;
 };
+export function createInFlightDedupe() {
+    let inFlight;
+    return (factory) => __awaiter(this, void 0, void 0, function* () {
+        if (inFlight)
+            return inFlight;
+        console.log('11111111111111');
+        const promise = (() => __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield factory();
+            }
+            finally {
+                console.log('inFlight-------------------- cleanup');
+                inFlight = undefined;
+            }
+        }))();
+        inFlight = promise;
+        return promise;
+    });
+}