bruce-models 6.7.7 → 6.7.9

package/dist/bruce-models.es5.js

@@ -1092,9 +1092,11 @@ var BruceApi;
                         });
                     }
                     if (!account) {
-                        account = (yield Account.GetBySubdomain({
-                            subdomain: this.accountId,
-                            api: guardian
+                        account = (yield Account.Get({
+                            accountId: this.accountId,
+                            api: guardian,
+                            appId: ENVIRONMENT.PARAMS.appId,
+                            expand: ["limit"]
                         })).account;
                     }
                     if (!this.loadCancelled) {
@@ -1794,7 +1796,9 @@ var ENVIRONMENT;
         // Default environment.
         env: Api.EEnv.PROD,
         // Default session ID.
-        sessionId: ENVIRONMENT.GetPageLoadSessionId()
+        sessionId: ENVIRONMENT.GetPageLoadSessionId(),
+        // Default app ID to use when loading account data.
+        appId: null
     };
     // Subscribe to get notified when someone calls Reset.
     // If you are manually updating params, call OnParamsChange.Trigger() to notify others.
@@ -1827,6 +1831,12 @@ var ENVIRONMENT;
         if (ENVIRONMENT.IS_SELF_MANAGED) {
             throw ("Self managed mode ON. You are getting this error because you didn't pass an Api instance to a function.");
         }
+        if (params.appId) {
+            ENVIRONMENT.PARAMS.appId = params.appId;
+        }
+        if (params.env) {
+            ENVIRONMENT.PARAMS.env = params.env;
+        }
         if (_getters) {
             _getters.ClearCache();
             if (params.accountId) {
@@ -12056,18 +12066,29 @@ var Account;
      */
     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 = 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({
@@ -12095,6 +12116,7 @@ var Account;
     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
      */
@@ -12304,16 +12326,22 @@ var Account;
      * @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 = [Api.ECacheKey.Account + Api.ECacheKey.Id + accountId];
+        if (expandParam) {
+            cacheKey.push(Api.ECacheKey.Id + expandParam);
+        }
         if (appSettingsId) {
-            return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey + appSettingsId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
+            cacheKey.push(Api.ECacheKey + appSettingsId);
         }
-        return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
+        cacheKey.push(Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId);
+        return cacheKey.join("");
     }
     Account.GetCacheKey = GetCacheKey;
     /**
@@ -14220,28 +14248,16 @@ var AccountLimits;
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             req = Api.PrepReqParams(req);
-            const cacheData = api.GetCacheItem(GetLimitsCacheKey(accountId));
-            if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.found) {
-                return cacheData.data;
-            }
-            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const data = yield api.GET(`account/${accountId}?WithLimits=true`);
-                    const limits = data.Limits ? data.Limits : {};
-                    res({
-                        limits: limits
-                    });
-                }
-                catch (e) {
-                    rej(e);
-                }
-            }));
-            api.SetCacheItem({
-                key: GetLimitsCacheKey(accountId),
-                value: prom,
-                req: req
+            const { account } = yield Account.Get({
+                accountId: accountId,
+                api: api,
+                expand: ["limit"],
+                appId: ENVIRONMENT.PARAMS.appId
             });
-            return prom;
+            const limits = account["Limits"] || {};
+            return {
+                limits: limits
+            };
         });
     }
     AccountLimits$$1.GetLimits = GetLimits;
@@ -14831,14 +14847,6 @@ var AccountLimits;
         }
         Assert.GetDenyPublicAccess = GetDenyPublicAccess;
     })(Assert = AccountLimits$$1.Assert || (AccountLimits$$1.Assert = {}));
-    /**
-     * Cache key for requesting account limits for a specific account.
-     * @param accountId
-     */
-    function GetLimitsCacheKey(accountId) {
-        return Api.ECacheKey.AccountLimits + Api.ECacheKey.Id + accountId;
-    }
-    AccountLimits$$1.GetLimitsCacheKey = GetLimitsCacheKey;
 })(AccountLimits || (AccountLimits = {}));
 
 /**
@@ -16459,7 +16467,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.7";
+const VERSION = "6.7.9";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, UserMfaMethod, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking };
 //# sourceMappingURL=bruce-models.es5.js.map