bruce-models 6.7.8 → 6.7.9

package/dist/bruce-models.umd.js

@@ -1083,9 +1083,11 @@
                             });
                         }
                         if (!account) {
-                            account = (yield exports.Account.GetBySubdomain({
-                                subdomain: this.accountId,
-                                api: guardian
+                            account = (yield exports.Account.Get({
+                                accountId: this.accountId,
+                                api: guardian,
+                                appId: exports.ENVIRONMENT.PARAMS.appId,
+                                expand: ["limit"]
                             })).account;
                         }
                         if (!this.loadCancelled) {
@@ -1778,7 +1780,9 @@
             // Default environment.
             env: exports.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.
@@ -1811,6 +1815,12 @@
             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) {
@@ -13975,28 +13985,16 @@
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 req = exports.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 exports.Account.Get({
+                    accountId: accountId,
+                    api: api,
+                    expand: ["limit"],
+                    appId: exports.ENVIRONMENT.PARAMS.appId
                 });
-                return prom;
+                const limits = account["Limits"] || {};
+                return {
+                    limits: limits
+                };
             });
         }
         AccountLimits.GetLimits = GetLimits;
@@ -14586,14 +14584,6 @@
             }
             Assert.GetDenyPublicAccess = GetDenyPublicAccess;
         })(Assert = AccountLimits.Assert || (AccountLimits.Assert = {}));
-        /**
-         * Cache key for requesting account limits for a specific account.
-         * @param accountId
-         */
-        function GetLimitsCacheKey(accountId) {
-            return exports.Api.ECacheKey.AccountLimits + exports.Api.ECacheKey.Id + accountId;
-        }
-        AccountLimits.GetLimitsCacheKey = GetLimitsCacheKey;
     })(exports.AccountLimits || (exports.AccountLimits = {}));
 
     (function (AccountTemplate) {
@@ -16162,7 +16152,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.7.8";
+    const VERSION = "6.7.9";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;