bruce-models 1.5.3 → 1.5.5

package/dist/bruce-models.es5.js

@@ -476,15 +476,16 @@ function parseResult(data) {
                 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 = 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();
@@ -841,6 +842,75 @@ var Account;
     Account.GetDbRegions = GetDbRegions;
 })(Account || (Account = {}));
 
+/**
+ * This is the request handler for Cam Api,
+ * it should be passed to any method that wants to communicate with this particular api.
+ */
+var CamApi;
+(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 : Api.EEnv.PROD;
+            this.setBaseUrl();
+        }
+        setBaseUrl() {
+            const prefix = "https://cam.nextspace";
+            let url;
+            const env = this.env.toUpperCase();
+            switch (env) {
+                case Api.EEnv.DEV:
+                    url = prefix + "-dev.net/";
+                    break;
+                case Api.EEnv.STG:
+                    url = prefix + "-stg.net/";
+                    break;
+                case Api.EEnv.UAT:
+                    url = prefix + "-uat.net/";
+                    break;
+                case 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;
+})(CamApi || (CamApi = {}));
+
 var MessageBroker;
 (function (MessageBroker) {
     let EAction;
@@ -995,9 +1065,14 @@ var BruceApi;
                 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 : Api.EEnv.PROD;
+            if (loadRegionalBaseUrl && !cam) {
+                cam = new CamApi.Api({
+                    env: this.env
+                });
+            }
             this.loadProm = this.init(cam, loadRegionalBaseUrl);
         }
         get MessageBroker() {
@@ -1146,75 +1221,6 @@ var BruceApi;
     BruceApi.Api = Api$$1;
 })(BruceApi || (BruceApi = {}));
 
-/**
- * This is the request handler for Cam Api,
- * it should be passed to any method that wants to communicate with this particular api.
- */
-var CamApi;
-(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 : Api.EEnv.PROD;
-            this.setBaseUrl();
-        }
-        setBaseUrl() {
-            const prefix = "https://cam.nextspace";
-            let url;
-            const env = this.env.toUpperCase();
-            switch (env) {
-                case Api.EEnv.DEV:
-                    url = prefix + "-dev.net/";
-                    break;
-                case Api.EEnv.STG:
-                    url = prefix + "-stg.net/";
-                    break;
-                case Api.EEnv.UAT:
-                    url = prefix + "-uat.net/";
-                    break;
-                case 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;
-})(CamApi || (CamApi = {}));
-
 var IdmApi;
 (function (IdmApi) {
     /**
@@ -3450,9 +3456,6 @@ var EntityRelation;
             if (data["Data.Entity.ID"]) {
                 api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
             }
-            return {
-                relation: res
-            };
         });
     }
     EntityRelation.Update = Update;