bruce-models 3.2.5 → 3.2.6

package/dist/bruce-models.umd.js

@@ -1128,13 +1128,28 @@
          */
         function GetKeyByAccountId(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { accountId, apiSettings, api, req } = params;
+                let { accountId, apiSettings, api, account, req } = params;
                 if (!accountId && !apiSettings) {
                     throw ("Invalid accountId or apiSettings");
                 }
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
+                // We'll prioritize account record if provided.
+                if (accountId && !account) {
+                    account = (yield exports.Account.Get({
+                        accountId,
+                        api,
+                        req
+                    })).account;
+                }
+                if (account === null || account === void 0 ? void 0 : account["HostingLocation.Key"]) {
+                    return {
+                        key: account["HostingLocation.Key"],
+                        isLegacy: false
+                    };
+                }
+                // Fallback to settings JSON for older records.
                 const settings = apiSettings ? apiSettings : (yield exports.Account.GetAppSettings({
                     api,
                     accountId,
@@ -1166,12 +1181,13 @@
          */
         function GetByAccountId(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { accountId, apiSettings, api, req } = params;
+                let { accountId, apiSettings, api, req, account } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 const data = yield GetKeyByAccountId({
                     accountId,
+                    account,
                     apiSettings,
                     api,
                     req
@@ -1357,6 +1373,25 @@
             GetCdnBaseUrl() {
                 return this.cdnBaseUrl;
             }
+            /**
+             * Returns a url routed through the API's CDN.
+             * If the CDN is not enabled for the account, this will return null.
+             * @param url suffix to append to the base url.
+             * @param urlParams
+             * @returns
+             */
+            ConstructCdnUrl(url, urlParams) {
+                if (!this.cdnBaseUrl) {
+                    return null;
+                }
+                let cdnUrl = this.cdnBaseUrl + url;
+                if (!urlParams) {
+                    urlParams = new URLSearchParams();
+                }
+                urlParams.set("accountId", this.accountId);
+                cdnUrl += "?" + urlParams.toString();
+                return cdnUrl;
+            }
             /**
              * Warning: This will cancel the init process.
              * The init process loads a region specific endpoint.
@@ -1664,7 +1699,7 @@
             if (!params) {
                 params = {};
             }
-            let { accountId, env } = params;
+            let { accountId, env, loadConfig, loadWebSocket } = params;
             accountId = accountId ? accountId : this.accountId;
             env = env ? env : this.env;
             const key = `${accountId}-${env}`;
@@ -1672,7 +1707,11 @@
                 this.bruce[key] = new exports.BruceApi.Api({
                     accountId,
                     env,
-                    loadRegionalBaseUrl: true
+                    loadConfig: loadConfig,
+                    loadWebSocket: loadWebSocket,
+                    guardian: this.GetGuardianApi({
+                        env
+                    }),
                 });
                 this.bruce[key].SetSessionId(this.sessionId);
             }
@@ -1689,7 +1728,12 @@
                 accountId: this.accountId,
                 env: this.env,
                 getApi: (accountId, env) => {
-                    return this.GetBruceApi({ accountId, env });
+                    return this.GetBruceApi({
+                        accountId,
+                        env,
+                        loadWebSocket: this.accountId == accountId,
+                        loadConfig: this.accountId == accountId
+                    });
                 }
             };
         }
@@ -6151,11 +6195,16 @@
          * @returns
          */
         function GetUrl(params) {
-            let { api, fileId } = params;
+            let { api, fileId, viaCdn } = params;
             if (!api) {
                 api = exports.ENVIRONMENT.Api().GetBruceApi();
             }
-            return `${api.GetBaseUrl()}file/${fileId}`;
+            const urlSuffix = `file/${fileId}`;
+            const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
+            if (cdnUrl) {
+                return cdnUrl;
+            }
+            return `${api.GetBaseUrl()}${urlSuffix}`;
         }
         ClientFile.GetUrl = GetUrl;
         /**
@@ -6164,11 +6213,16 @@
          * @returns
          */
         function GetUrlWithExt(params) {
-            let { api, file } = params;
+            let { api, file, viaCdn } = params;
             if (!api) {
                 api = exports.ENVIRONMENT.Api().GetBruceApi();
             }
-            return `${api.GetBaseUrl()}file/${file.ID}${file.FileExt ? file.FileExt : ""}`;
+            const urlSuffix = file.FileExt ? `file/${file.ID}${file.FileExt}` : `file/${file.ID}`;
+            const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
+            if (cdnUrl) {
+                return cdnUrl;
+            }
+            return `${api.GetBaseUrl()}${urlSuffix}`;
         }
         ClientFile.GetUrlWithExt = GetUrlWithExt;
         /**
@@ -10229,7 +10283,7 @@
         DataSource.GetList = GetList;
     })(exports.DataSource || (exports.DataSource = {}));
 
-    const VERSION = "3.2.5";
+    const VERSION = "3.2.6";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;