bruce-models 1.5.6 → 1.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -546,7 +546,7 @@ class AbstractApi {
546
546
  }
547
547
  params.headers = params.headers || {};
548
548
  params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
549
- if (this.ssidHeader) {
549
+ if (this.ssidHeader && this.ssid) {
550
550
  params.headers[this.ssidHeader] = this.ssid;
551
551
  }
552
552
  const res = yield fetch(url, {
@@ -561,7 +561,10 @@ class AbstractApi {
561
561
  params = {};
562
562
  }
563
563
  params.headers = params.headers || {};
564
- params.headers = Object.assign({ "Content-Type": "application/json;", [this.ssidHeader]: this.ssid }, params.headers);
564
+ params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
565
+ if (this.ssidHeader && this.ssid) {
566
+ params.headers[this.ssidHeader] = this.ssid;
567
+ }
565
568
  const res = yield fetch(url, {
566
569
  headers: params.headers,
567
570
  method: "DELETE"
@@ -575,7 +578,10 @@ class AbstractApi {
575
578
  params = {};
576
579
  }
577
580
  params.headers = params.headers || {};
578
- params.headers = Object.assign({ "Content-Type": "application/json;", [this.ssidHeader]: this.ssid }, params.headers);
581
+ params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
582
+ if (this.ssidHeader && this.ssid) {
583
+ params.headers[this.ssidHeader] = this.ssid;
584
+ }
579
585
  if (!data) {
580
586
  data = {};
581
587
  }
@@ -596,7 +602,10 @@ class AbstractApi {
596
602
  params = {};
597
603
  }
598
604
  params.headers = params.headers || {};
599
- params.headers = Object.assign({ "Content-Type": "application/json;", [this.ssidHeader]: this.ssid }, params.headers);
605
+ params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
606
+ if (this.ssidHeader && this.ssid) {
607
+ params.headers[this.ssidHeader] = this.ssid;
608
+ }
600
609
  if (!data) {
601
610
  data = {};
602
611
  }
@@ -650,7 +659,7 @@ class AbstractApi {
650
659
  }
651
660
  };
652
661
  xhr.open("POST", url, true);
653
- if (this.ssid) {
662
+ if (this.ssidHeader && this.ssid) {
654
663
  xhr.setRequestHeader(this.ssidHeader, this.ssid);
655
664
  }
656
665
  const formData = new FormData();
@@ -857,7 +866,8 @@ var CamApi;
857
866
  this.setBaseUrl();
858
867
  }
859
868
  setBaseUrl() {
860
- const prefix = "https://cam.nextspace";
869
+ // Using proxy through admin-app until CORS stops dying.
870
+ const prefix = `https://${Api.TEMPLATE_ACCOUNT_ID}.nextspace`;
861
871
  let url;
862
872
  const env = this.env.toUpperCase();
863
873
  switch (env) {
@@ -876,7 +886,7 @@ var CamApi;
876
886
  default:
877
887
  throw ("Specified Environment is not valid. SuppliedEnv=" + env);
878
888
  }
879
- this.baseUrl = url;
889
+ this.baseUrl = url + "@CAM/";
880
890
  }
881
891
  GetBaseUrl() {
882
892
  return this.baseUrl;