bruce-models 1.5.2 → 1.5.4

package/dist/bruce-models.umd.js

@@ -470,15 +470,16 @@
                     encoding = charset.split("=")[1];
                     encoding = encoding.toLowerCase();
                 }
-                if (!encoding) {
-                    return null;
-                }
                 // Our API has a very specific utf-16 encoding.
                 if (encoding == "utf-16") {
                     encoding = exports.Api.EEncoding.UTF16;
                 }
-                if (encoding == "utf-8") {
-                    return data.json();
+                if (!encoding || encoding == "utf-8") {
+                    const text = yield data.text();
+                    if (!text || !text.trim()) {
+                        return null;
+                    }
+                    return JSON.parse(text);
                 }
                 else {
                     const buffer = yield data.arrayBuffer();
@@ -830,6 +831,70 @@
         Account.GetDbRegions = GetDbRegions;
     })(exports.Account || (exports.Account = {}));
 
+    (function (CamApi) {
+        class Api$$1 extends AbstractApi {
+            constructor(params) {
+                super({
+                    ssidHeader: "SSID"
+                });
+                this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
+                this.setBaseUrl();
+            }
+            setBaseUrl() {
+                const prefix = "https://cam.nextspace";
+                let url;
+                const env = this.env.toUpperCase();
+                switch (env) {
+                    case exports.Api.EEnv.DEV:
+                        url = prefix + "-dev.net/";
+                        break;
+                    case exports.Api.EEnv.STG:
+                        url = prefix + "-stg.net/";
+                        break;
+                    case exports.Api.EEnv.UAT:
+                        url = prefix + "-uat.net/";
+                        break;
+                    case exports.Api.EEnv.PROD:
+                        url = prefix + ".host/";
+                        break;
+                    default:
+                        throw ("Specified Environment is not valid. SuppliedEnv=" + env);
+                }
+                this.baseUrl = url;
+            }
+            GetBaseUrl() {
+                return this.baseUrl;
+            }
+            SetBaseUrl(url) {
+                this.baseUrl = url;
+                if (!this.baseUrl.endsWith("/")) {
+                    this.baseUrl += "/";
+                }
+            }
+            GET(url, params) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return this.get(this.baseUrl + url, params);
+                });
+            }
+            DELETE(url, params) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return this.delete(this.baseUrl + url, params);
+                });
+            }
+            POST(url, data, params) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return this.post(this.baseUrl + url, data, params);
+                });
+            }
+            UPLOAD(url, blob, params) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return this.upload(this.baseUrl + url, blob, params);
+                });
+            }
+        }
+        CamApi.Api = Api$$1;
+    })(exports.CamApi || (exports.CamApi = {}));
+
     (function (MessageBroker) {
         let EAction;
         (function (EAction) {
@@ -982,9 +1047,14 @@
                     ssidHeader: "x-sessionid"
                 });
                 this.loadCancelled = false;
-                const { accountId, env, cam, loadRegionalBaseUrl } = params;
+                let { accountId, env, cam, loadRegionalBaseUrl } = params;
                 this.accountId = accountId;
                 this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
+                if (loadRegionalBaseUrl && !cam) {
+                    cam = new exports.CamApi.Api({
+                        env: this.env
+                    });
+                }
                 this.loadProm = this.init(cam, loadRegionalBaseUrl);
             }
             get MessageBroker() {
@@ -1133,70 +1203,6 @@
         BruceApi.Api = Api$$1;
     })(exports.BruceApi || (exports.BruceApi = {}));
 
-    (function (CamApi) {
-        class Api$$1 extends AbstractApi {
-            constructor(params) {
-                super({
-                    ssidHeader: "SSID"
-                });
-                this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
-                this.setBaseUrl();
-            }
-            setBaseUrl() {
-                const prefix = "https://cam.nextspace";
-                let url;
-                const env = this.env.toUpperCase();
-                switch (env) {
-                    case exports.Api.EEnv.DEV:
-                        url = prefix + "-dev.net/";
-                        break;
-                    case exports.Api.EEnv.STG:
-                        url = prefix + "-stg.net/";
-                        break;
-                    case exports.Api.EEnv.UAT:
-                        url = prefix + "-uat.net/";
-                        break;
-                    case exports.Api.EEnv.PROD:
-                        url = prefix + ".host/";
-                        break;
-                    default:
-                        throw ("Specified Environment is not valid. SuppliedEnv=" + env);
-                }
-                this.baseUrl = url;
-            }
-            GetBaseUrl() {
-                return this.baseUrl;
-            }
-            SetBaseUrl(url) {
-                this.baseUrl = url;
-                if (!this.baseUrl.endsWith("/")) {
-                    this.baseUrl += "/";
-                }
-            }
-            GET(url, params) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return this.get(this.baseUrl + url, params);
-                });
-            }
-            DELETE(url, params) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return this.delete(this.baseUrl + url, params);
-                });
-            }
-            POST(url, data, params) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return this.post(this.baseUrl + url, data, params);
-                });
-            }
-            UPLOAD(url, blob, params) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return this.upload(this.baseUrl + url, blob, params);
-                });
-            }
-        }
-        CamApi.Api = Api$$1;
-    })(exports.CamApi || (exports.CamApi = {}));
-
     (function (IdmApi) {
         /**
          * This is the request handler for Idm Api,
@@ -3363,9 +3369,6 @@
                 if (data["Data.Entity.ID"]) {
                     api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
-                return {
-                    relation: res
-                };
             });
         }
         EntityRelation.Update = Update;