bruce-models 6.7.6 → 6.7.8

package/dist/bruce-models.umd.js

@@ -976,7 +976,7 @@
                 // Indicates if the init process has finished loading.
                 // While this is not resolved requests will be in a pending state.
                 this.loadProm = Promise.resolve();
-                let { accountId, env, guardian, loadRegionalBaseUrl, loadConfig, loadWebSocket, dummy } = params;
+                let { accountId, env, guardian, loadRegionalBaseUrl, loadConfig, loadWebSocket, dummy, account } = params;
                 this.accountId = accountId;
                 this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
                 if (!dummy) {
@@ -988,16 +988,20 @@
                         // Mark it as attempted right away because we don't want any external calls while it gets to that async point.
                         this.configLoadAttempted = true;
                     }
-                    this.loadProm = this.init(guardian, loadConfig, loadWebSocket);
+                    this.loadProm = this.init(guardian, loadConfig, loadWebSocket, account);
                 }
             }
             /**
              * Loads regional base url and sets up message broker.
              * @param guardian Required for loading regional base url.
              * @param loadConfig
+             * @param loadWebSocket
+             * @param account
              * @returns
              */
-            init(guardian, loadConfig, loadWebSocket) {
+            init(guardian, loadConfig, loadWebSocket, 
+            // Preloaded account to save doing an API call.
+            account) {
                 return __awaiter(this, void 0, void 0, function* () {
                     if (!this.accountId) {
                         throw ("accountId is required.");
@@ -1011,7 +1015,8 @@
                             guardian: guardian,
                             // We marked it as attempted to load outside this method to fight any external calls.
                             // So we'll force load it now.
-                            forceLoad: true
+                            forceLoad: true,
+                            account: account
                         });
                     }
                     // Get the version.
@@ -1066,7 +1071,7 @@
              */
             LoadConfig(params) {
                 return __awaiter(this, void 0, void 0, function* () {
-                    let { guardian, forceLoad } = (params !== null && params !== void 0 ? params : {});
+                    let { guardian, forceLoad, account } = (params !== null && params !== void 0 ? params : {});
                     if (this.configLoadAttempted && forceLoad != true) {
                         return;
                     }
@@ -1077,10 +1082,12 @@
                                 env: this.env
                             });
                         }
-                        const { account } = yield exports.Account.GetBySubdomain({
-                            subdomain: this.accountId,
-                            api: guardian
-                        });
+                        if (!account) {
+                            account = (yield exports.Account.GetBySubdomain({
+                                subdomain: this.accountId,
+                                api: guardian
+                            })).account;
+                        }
                         if (!this.loadCancelled) {
                             // Set the calculated base url.
                             // If this is not available then this is considered a critical failure.
@@ -11823,18 +11830,29 @@
          */
         function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, accountId: id, req: reqParams } = params;
+                let { api, accountId: id, req: reqParams, expand, appId } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cacheKey = GetCacheKey(api.GetSessionId(), id);
+                const expandParam = (expand === null || expand === void 0 ? void 0 : expand.length) ? expand.join(",") : undefined;
+                const cacheKey = GetCacheKey(api.GetSessionId(), id, appId, expandParam);
                 const cache = api.GetCacheItem(cacheKey, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET(`accountbyid/${id}`, reqParams);
+                        let url = `accountbyid/${id}`;
+                        let added = false;
+                        if (expandParam) {
+                            url += (added ? "&" : "?") + `Expand=${expandParam}`;
+                            added = true;
+                        }
+                        if (appId) {
+                            url += (added ? "&" : "?") + `App=${encodeURIComponent(appId)}`;
+                            added = true;
+                        }
+                        const data = yield api.GET(url, reqParams);
                         // Update the cache by subdomain as well in case it's different to the ID.
                         if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
                             api.SetCacheItem({
@@ -11862,6 +11880,7 @@
         Account.Get = Get;
         /**
          * Returns a client account record by subdomain or ID.
+         * @deprecated use Get() as both will check against ID and subdomain.
          * @param params
          * @returns
          */
@@ -12071,16 +12090,22 @@
          * @param sessionId
          * @param accountId
          * @param appSettingsId
+         * @param expandParam Comma delimited list of expand params.
          * @returns
          */
-        function GetCacheKey(sessionId, accountId, appSettingsId) {
+        function GetCacheKey(sessionId, accountId, appSettingsId, expandParam) {
             if (!sessionId) {
                 sessionId = "anonymous";
             }
+            let cacheKey = [exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId];
+            if (expandParam) {
+                cacheKey.push(exports.Api.ECacheKey.Id + expandParam);
+            }
             if (appSettingsId) {
-                return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey + appSettingsId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
+                cacheKey.push(exports.Api.ECacheKey + appSettingsId);
             }
-            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId;
+            cacheKey.push(exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + sessionId);
+            return cacheKey.join("");
         }
         Account.GetCacheKey = GetCacheKey;
         /**
@@ -16137,7 +16162,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.7.6";
+    const VERSION = "6.7.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;