bruce-models 2.2.9 → 2.3.1

package/dist/bruce-models.umd.js

@@ -727,158 +727,6 @@
         }
     }
 
-    const ACCOUNT_EXCLUSIONS = ["hyperportal", "hypeportal", "bviewer"];
-    (function (Account) {
-        function GetCacheKey(accountId, appSettingsId) {
-            if (appSettingsId) {
-                return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey + appSettingsId;
-            }
-            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
-        }
-        Account.GetCacheKey = GetCacheKey;
-        function GetListCacheKey(ssid) {
-            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + ssid;
-        }
-        Account.GetListCacheKey = GetListCacheKey;
-        function GetDbRegionListCacheKey() {
-            return exports.Api.ECacheKey.DatabaseRegion;
-        }
-        Account.GetDbRegionListCacheKey = GetDbRegionListCacheKey;
-        let EAppId;
-        (function (EAppId) {
-            EAppId["BruceApi"] = "BruceAPI";
-            EAppId["Navigator"] = "Navigator";
-        })(EAppId = Account.EAppId || (Account.EAppId = {}));
-        let EStarterContent;
-        (function (EStarterContent) {
-            EStarterContent["Default"] = "default";
-            EStarterContent["None"] = "none";
-        })(EStarterContent = Account.EStarterContent || (Account.EStarterContent = {}));
-        function Get(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { api, accountId: id, req: reqParams } = params;
-                const cacheData = yield api.GetCacheItem(GetCacheKey(id), reqParams);
-                if (cacheData) {
-                    return cacheData;
-                }
-                const req = yield api.GET(`account/${id}`, reqParams);
-                const resData = {
-                    account: req
-                };
-                yield api.SetCacheItem({
-                    key: GetCacheKey(id),
-                    value: resData,
-                    req: reqParams
-                });
-                return resData;
-            });
-        }
-        Account.Get = Get;
-        function GetRelatedList(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { api, req: reqParams } = params;
-                const cacheData = yield api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
-                if (cacheData) {
-                    return cacheData;
-                }
-                const req = api.GET("user/relatedClientAccounts", reqParams);
-                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const data = yield req;
-                        const items = data.Items.filter((x) => !ACCOUNT_EXCLUSIONS.includes(x.ID));
-                        res({
-                            accounts: items
-                        });
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                }));
-                yield api.SetCacheItem({
-                    key: GetListCacheKey(api.GetSessionId()),
-                    value: prom,
-                    req: reqParams
-                });
-                return prom;
-            });
-        }
-        Account.GetRelatedList = GetRelatedList;
-        function GetAppSettings(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { api, accountId: id, appId, req: reqParams } = params;
-                const cacheData = yield api.GetCacheItem(GetCacheKey(id, appId), reqParams);
-                if (cacheData) {
-                    return cacheData;
-                }
-                const req = yield api.GET(`account/${id}?ApplicationID=${appId}`, reqParams);
-                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    try {
-                        const data = yield req;
-                        const settings = (_a = data === null || data === void 0 ? void 0 : data["Application.Settings"]) !== null && _a !== void 0 ? _a : {};
-                        res({
-                            settings: settings
-                        });
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                }));
-                yield api.SetCacheItem({
-                    key: GetCacheKey(id, appId),
-                    value: prom,
-                    req: reqParams
-                });
-                return prom;
-            });
-        }
-        Account.GetAppSettings = GetAppSettings;
-        /**
-         * WARNING: Do not update API settings without knowing what you're doing.
-         * @param params
-         * @returns
-         */
-        function UpdateAppSettings(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { api, accountId: id, appId, settings: data, req: reqParams } = params;
-                const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
-                return {
-                    settings: res
-                };
-            });
-        }
-        Account.UpdateAppSettings = UpdateAppSettings;
-        /**
-         * Creates a new Bruce account using given details.
-         * @param params
-         * @returns
-         */
-        function Create(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let { api, accountId: id, name, hostingLocationKey, starterContent, req: reqParams } = params;
-                if (!id || !name || !hostingLocationKey) {
-                    throw new Error("Id, Name and hostingLocationKey are required.");
-                }
-                if (!starterContent) {
-                    starterContent = EStarterContent.None;
-                }
-                const reqData = {
-                    "Name": name,
-                    "HostingLocation.Key": hostingLocationKey,
-                    "StarterContent": starterContent
-                };
-                const res = yield api.POST(`clientAccount/${id}`, reqData, exports.Api.PrepReqParams(reqParams));
-                const resData = {
-                    account: res
-                };
-                api.Cache.Remove(GetListCacheKey(api.GetSessionId()));
-                return resData;
-            });
-        }
-        Account.Create = Create;
-    })(exports.Account || (exports.Account = {}));
-
     (function (MessageBroker) {
         let EAction;
         (function (EAction) {
@@ -1081,6 +929,158 @@
         GuardianApi.Api = Api$$1;
     })(exports.GuardianApi || (exports.GuardianApi = {}));
 
+    const ACCOUNT_EXCLUSIONS = ["hyperportal", "hypeportal", "bviewer"];
+    (function (Account) {
+        function GetCacheKey(accountId, appSettingsId) {
+            if (appSettingsId) {
+                return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId + exports.Api.ECacheKey + appSettingsId;
+            }
+            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + accountId;
+        }
+        Account.GetCacheKey = GetCacheKey;
+        function GetListCacheKey(ssid) {
+            return exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Session + exports.Api.ECacheKey.Id + ssid;
+        }
+        Account.GetListCacheKey = GetListCacheKey;
+        function GetDbRegionListCacheKey() {
+            return exports.Api.ECacheKey.DatabaseRegion;
+        }
+        Account.GetDbRegionListCacheKey = GetDbRegionListCacheKey;
+        let EAppId;
+        (function (EAppId) {
+            EAppId["BruceApi"] = "BruceAPI";
+            EAppId["Navigator"] = "Navigator";
+        })(EAppId = Account.EAppId || (Account.EAppId = {}));
+        let EStarterContent;
+        (function (EStarterContent) {
+            EStarterContent["Default"] = "default";
+            EStarterContent["None"] = "none";
+        })(EStarterContent = Account.EStarterContent || (Account.EStarterContent = {}));
+        function Get(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId: id, req: reqParams } = params;
+                const cacheData = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                if (cacheData) {
+                    return cacheData;
+                }
+                const req = yield api.GET(`account/${id}`, reqParams);
+                const resData = {
+                    account: req
+                };
+                yield api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: resData,
+                    req: reqParams
+                });
+                return resData;
+            });
+        }
+        Account.Get = Get;
+        function GetRelatedList(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, req: reqParams } = params;
+                const cacheData = yield api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
+                if (cacheData) {
+                    return cacheData;
+                }
+                const req = api.GET("user/relatedClientAccounts", reqParams);
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield req;
+                        const items = data.Items.filter((x) => !ACCOUNT_EXCLUSIONS.includes(x.ID));
+                        res({
+                            accounts: items
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                yield api.SetCacheItem({
+                    key: GetListCacheKey(api.GetSessionId()),
+                    value: prom,
+                    req: reqParams
+                });
+                return prom;
+            });
+        }
+        Account.GetRelatedList = GetRelatedList;
+        function GetAppSettings(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId: id, appId, req: reqParams } = params;
+                const cacheData = yield api.GetCacheItem(GetCacheKey(id, appId), reqParams);
+                if (cacheData) {
+                    return cacheData;
+                }
+                const req = yield api.GET(`account/${id}?ApplicationID=${appId}`, reqParams);
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    try {
+                        const data = yield req;
+                        const settings = (_a = data === null || data === void 0 ? void 0 : data["Application.Settings"]) !== null && _a !== void 0 ? _a : {};
+                        res({
+                            settings: settings
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                yield api.SetCacheItem({
+                    key: GetCacheKey(id, appId),
+                    value: prom,
+                    req: reqParams
+                });
+                return prom;
+            });
+        }
+        Account.GetAppSettings = GetAppSettings;
+        /**
+         * WARNING: Do not update API settings without knowing what you're doing.
+         * @param params
+         * @returns
+         */
+        function UpdateAppSettings(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { api, accountId: id, appId, settings: data, req: reqParams } = params;
+                const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
+                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
+                return {
+                    settings: res
+                };
+            });
+        }
+        Account.UpdateAppSettings = UpdateAppSettings;
+        /**
+         * Creates a new Bruce account using given details.
+         * @param params
+         * @returns
+         */
+        function Create(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { api, accountId: id, name, hostingLocationKey, starterContent, req: reqParams } = params;
+                if (!id || !name || !hostingLocationKey) {
+                    throw new Error("Id, Name and hostingLocationKey are required.");
+                }
+                if (!starterContent) {
+                    starterContent = EStarterContent.None;
+                }
+                const reqData = {
+                    "Name": name,
+                    "HostingLocation.Key": hostingLocationKey,
+                    "StarterContent": starterContent
+                };
+                const res = yield api.POST(`clientAccount/${id}`, reqData, exports.Api.PrepReqParams(reqParams));
+                const resData = {
+                    account: res
+                };
+                api.Cache.Remove(GetListCacheKey(api.GetSessionId()));
+                return resData;
+            });
+        }
+        Account.Create = Create;
+    })(exports.Account || (exports.Account = {}));
+
     (function (HostingLocation) {
         /**
          * @Warning: This will not return the Settings property.
@@ -1166,7 +1166,7 @@
             return null;
         }
         HostingLocation.GuessKey = GuessKey;
-        function GetByAccountId(params) {
+        function GetKeyByAccountId(params) {
             return __awaiter(this, void 0, void 0, function* () {
                 const { accountId, apiSettings, api, req } = params;
                 if (!accountId && !apiSettings) {
@@ -1178,23 +1178,42 @@
                     appId: exports.Account.EAppId.BruceApi
                 })).settings;
                 let hostingKey = settings["HostingLocation.Key"];
+                let isLegacy = false;
                 if (!hostingKey) {
                     hostingKey = settings.DBLocation;
+                    isLegacy = true;
                 }
                 if (!hostingKey) {
                     hostingKey = GuessKey({
                         DBServer: settings.DBServer
                     });
+                    isLegacy = true;
                 }
-                if (!hostingKey) {
+                return {
+                    key: hostingKey,
+                    isLegacy
+                };
+            });
+        }
+        HostingLocation.GetKeyByAccountId = GetKeyByAccountId;
+        function GetByAccountId(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { accountId, apiSettings, api, req } = params;
+                const data = yield GetKeyByAccountId({
+                    accountId,
+                    apiSettings,
+                    api,
+                    req
+                });
+                if (!(data === null || data === void 0 ? void 0 : data.key)) {
                     return null;
                 }
-                const data = yield GetByKey({
-                    key: hostingKey,
+                const key = yield GetByKey({
+                    key: data.key,
                     api,
                     req
                 });
-                return data;
+                return key;
             });
         }
         HostingLocation.GetByAccountId = GetByAccountId;
@@ -1243,70 +1262,60 @@
              * @returns
              */
             init(guardian, loadConfig) {
-                var _a, _b, _c, _d;
+                var _a, _b;
                 return __awaiter(this, void 0, void 0, function* () {
                     if (!this.accountId) {
                         throw ("accountId is required.");
                     }
-                    // Set using a stable default.
-                    const prefix = `https://${this.accountId}.api.nextspace`;
-                    let url;
                     const env = this.env.toUpperCase();
+                    let domain = "nextspace.host";
                     switch (env) {
                         case exports.Api.EEnv.DEV:
-                            url = prefix + "-dev.net/";
+                            domain = "nextspace-dev.net";
                             break;
                         case exports.Api.EEnv.STG:
-                            url = prefix + "-stg.net/";
+                            domain = "nextspace-stg.net";
                             break;
                         case exports.Api.EEnv.UAT:
-                            url = prefix + "-uat.net/";
+                            domain = "nextspace-uat.net";
                             break;
                         case exports.Api.EEnv.PROD:
-                            url = prefix + ".host/";
+                            domain = "nextspace.host";
                             break;
                         default:
-                            throw ("Specified Environment is not valid. SuppliedEnv=" + env);
+                            console.error("Specified Environment is not valid. SuppliedEnv=" + env);
                     }
-                    this.baseUrl = url;
+                    // Set using a stable default.
+                    this.baseUrl = `https://${this.accountId}.api.${domain}/`;
                     if (guardian && loadConfig) {
-                        // Attempt to load an account specific base url.
-                        // This could be one with a region specific endpoint.
                         try {
-                            const settings = (yield exports.Account.GetAppSettings({
-                                api: guardian,
-                                accountId: this.accountId,
-                                appId: exports.Account.EAppId.BruceApi
-                            })).settings;
-                            if (this.loadCancelled) {
-                                console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
-                                return;
-                            }
-                            let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
-                            if (typeof endpoint == "string") {
-                                if (!endpoint.endsWith("/")) {
-                                    endpoint += "/";
-                                }
-                                this.baseUrl = endpoint;
-                            }
                             const host = yield exports.HostingLocation.GetByAccountId({
                                 accountId: this.accountId,
-                                apiSettings: settings,
                                 api: guardian
                             });
-                            const hostSettings = (_b = host === null || host === void 0 ? void 0 : host.location) === null || _b === void 0 ? void 0 : _b.Settings;
-                            if (hostSettings === null || hostSettings === void 0 ? void 0 : hostSettings.CDN) {
-                                this.EntityCdnUrl = (_c = hostSettings.CDN.entityURL) === null || _c === void 0 ? void 0 : _c[env];
-                                // We need to fix our configs.
-                                if (this.EntityCdnUrl) {
-                                    if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
+                            if (host === null || host === void 0 ? void 0 : host.location) {
+                                // Attempt to load regional base url.
+                                if (host.location.BruceAPIURL) {
+                                    const regionalUrl = host.location.BruceAPIURL.replace("<ACCOUNT>", this.accountId).replace("<DOMAIN>", domain);
+                                    if (regionalUrl && regionalUrl.length > 1) {
+                                        this.baseUrl = regionalUrl;
                                     }
-                                    else {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                }
+                                // Attempt to load CDN settings.
+                                const settings = host.location.Settings;
+                                if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
+                                    this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
+                                    // We need to fix our configs.
+                                    if (this.EntityCdnUrl) {
+                                        if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
+                                        }
+                                        else {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                        }
                                     }
+                                    this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
                                 }
-                                this.LegacyTilesetCdnUrl = (_d = hostSettings.CDN.legacyTilesetURL) === null || _d === void 0 ? void 0 : _d[env];
                             }
                         }
                         catch (e) {