bruce-models 5.4.3 → 5.4.5

package/dist/bruce-models.es5.js

@@ -307,6 +307,19 @@ function parseResult(data) {
         return text;
     });
 }
+/**
+ * Ensuring obvious faults in our session ID storage don't waste DB time.
+ * @param ssid
+ * @returns
+ */
+const prepSessionId = (ssid) => {
+    let tmp = ssid;
+    if (!tmp || "null" == tmp || "undefined" == tmp) {
+        tmp = "";
+    }
+    // Anonymous SSID will mean Guardian doesn't bother touching the DB.
+    return tmp ? tmp : "anonymous";
+};
 /**
  * This is a base class for communication with an arbitrary Nextspace API.
  */
@@ -382,14 +395,14 @@ class AbstractApi {
      * @returns
      */
     GetSessionId() {
-        return this.ssid;
+        return prepSessionId(this.ssid);
     }
     /**
      * Sets the session ID.
      * @param value
      */
     SetSessionId(value) {
-        this.ssid = value;
+        this.ssid = prepSessionId(value);
     }
     /**
      * Returns the session header.
@@ -419,8 +432,8 @@ class AbstractApi {
             }
             params.headers = params.headers || {};
             params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-            if (this.ssidHeader && this.ssid) {
-                params.headers[this.ssidHeader] = this.ssid;
+            if (this.ssidHeader) {
+                params.headers[this.ssidHeader] = this.GetSessionId();
             }
             const res = yield fetch(url, {
                 headers: params.headers,
@@ -443,8 +456,8 @@ class AbstractApi {
             }
             params.headers = params.headers || {};
             params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-            if (this.ssidHeader && this.ssid) {
-                params.headers[this.ssidHeader] = this.ssid;
+            if (this.ssidHeader) {
+                params.headers[this.ssidHeader] = this.GetSessionId();
             }
             const res = yield fetch(url, {
                 headers: params.headers,
@@ -469,8 +482,8 @@ class AbstractApi {
             }
             params.headers = params.headers || {};
             params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-            if (this.ssidHeader && this.ssid) {
-                params.headers[this.ssidHeader] = this.ssid;
+            if (this.ssidHeader) {
+                params.headers[this.ssidHeader] = this.GetSessionId();
             }
             if (!data) {
                 data = {};
@@ -502,8 +515,8 @@ class AbstractApi {
             }
             params.headers = params.headers || {};
             params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-            if (this.ssidHeader && this.ssid) {
-                params.headers[this.ssidHeader] = this.ssid;
+            if (this.ssidHeader) {
+                params.headers[this.ssidHeader] = this.GetSessionId();
             }
             if (!data) {
                 data = {};
@@ -534,8 +547,8 @@ class AbstractApi {
                 params = {};
             }
             params.headers = Object.assign({}, params.headers);
-            if (this.ssidHeader && this.ssid) {
-                params.headers[this.ssidHeader] = this.ssid;
+            if (this.ssidHeader) {
+                params.headers[this.ssidHeader] = this.GetSessionId();
             }
             const formData = params.formData instanceof FormData ? params.formData : new FormData();
             if (formData.has("file")) {
@@ -3246,11 +3259,23 @@ var Entity;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            const cacheKeyData = {
+                expandLocation,
+                expandRelations,
+                expandImports,
+                expandSources,
+                entityTypeId: null,
+                historicFrom: historicFrom,
+                historicKey: historicKey,
+                historicTo: historicTo,
+                historicPoint: historicPoint,
+                schemaId: schemaId
+            };
             const crashRiskReqs = [];
             const reqIds = [];
             for (let i = 0; i < entityIds.length; i++) {
                 const entityId = entityIds[i];
-                const key = GetCacheKey({ entityId, expandRelations, expandLocation });
+                const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                 const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     crashRiskReqs.push(cache.data);
@@ -3315,19 +3340,7 @@ var Entity;
                 const req = api.POST(url, reqData, Api.PrepReqParams(reqParams));
                 for (let i = 0; i < reqIds.length; i++) {
                     const entityId = reqIds[i];
-                    const key = GetCacheKey({
-                        entityId,
-                        expandLocation,
-                        expandRelations,
-                        expandImports,
-                        expandSources,
-                        entityTypeId: null,
-                        historicFrom: historicFrom,
-                        historicKey: historicKey,
-                        historicTo: historicTo,
-                        historicPoint: historicPoint,
-                        schemaId: schemaId
-                    });
+                    const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                     const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield req;
@@ -14745,7 +14758,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "5.4.3";
+const VERSION = "5.4.5";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map