bruce-models 4.2.4 → 4.2.6

package/dist/bruce-models.es5.js

@@ -1449,8 +1449,8 @@ var BruceApi;
                             env: this.env
                         });
                     }
-                    const { account } = yield Account.Get({
-                        accountId: this.accountId,
+                    const { account } = yield Account.GetBySubdomain({
+                        subdomain: this.accountId,
                         api: guardian
                     });
                     // Precalculated URLs exist.
@@ -1594,13 +1594,16 @@ var BruceApi;
             if (!this.cdnBaseUrl) {
                 return null;
             }
-            let cdnUrl = this.cdnBaseUrl + url;
-            if (!urlParams) {
-                urlParams = new URLSearchParams();
+            const tmp = new URL(this.cdnBaseUrl);
+            if (urlParams && urlParams instanceof URLSearchParams) {
+                urlParams.forEach((value, key) => {
+                    tmp.searchParams.append(key, value);
+                });
             }
-            urlParams.set("accountId", this.accountId);
-            cdnUrl += "?" + urlParams.toString();
-            return cdnUrl;
+            if (url) {
+                tmp.pathname += url;
+            }
+            return tmp.toString();
         }
         /**
          * Warning: This will cancel the init process.
@@ -1937,9 +1940,7 @@ class ApiGetters {
             this.bruce[key] = new BruceApi.Api({
                 accountId,
                 env,
-                // We'll load regional config if the accountId matches the default accountId.
-                // We'll also load if it no default is known.
-                loadConfig: loadConfig != null ? loadConfig : (this.accountId == accountId || !this.accountId),
+                loadConfig: loadConfig != null ? true : loadConfig,
                 loadWebSocket: loadWebSocket,
                 guardian: this.GetGuardianApi({
                     env
@@ -1962,10 +1963,7 @@ class ApiGetters {
             getApi: (accountId, env) => {
                 return this.GetBruceApi({
                     accountId,
-                    env,
-                    // We'll load regional config if the accountId matches the default accountId.
-                    // We'll also load if it no default is known.
-                    loadConfig: this.accountId == accountId || !this.accountId
+                    env
                 });
             }
         };
@@ -3843,18 +3841,18 @@ var Entity;
             }
             let totalCount;
             let entities = [];
-            if (analysis || expandRelations || (viaCdn && api.EntityCdnUrl)) {
+            if (analysis || expandRelations || (viaCdn && api.GetCdnBaseUrl())) {
                 let url;
                 if (analysis) {
                     url = new URL(api.GetBaseUrl() + "entities/summary");
                 }
-                else if (viaCdn && api.EntityCdnUrl) {
-                    url = new URL(api.EntityCdnUrl);
+                else if (viaCdn && api.GetCdnBaseUrl()) {
+                    url = new URL(api.ConstructCdnUrl("entities"));
                 }
                 else {
                     url = new URL(api.GetBaseUrl() + "entities");
                 }
-                const urlParams = new URLSearchParams(url.search);
+                const urlParams = url.searchParams;
                 urlParams.set("cacheToken", String(viaCdnCacheToken ? viaCdnCacheToken : 0));
                 if (body.SortOrder) {
                     urlParams.set("SortOrder", body.SortOrder);
@@ -3901,7 +3899,7 @@ var Entity;
                 if (schemaId) {
                     urlParams.set("schema", schemaId);
                 }
-                const urlStr = url.toString() + "?" + urlParams.toString();
+                const urlStr = url.toString();
                 const data = yield api.get(urlStr, Api.PrepReqParams(reqParams));
                 if (!analysis) {
                     entities = data.Items;
@@ -3910,7 +3908,7 @@ var Entity;
             }
             else {
                 const url = new URL(api.GetBaseUrl() + (analysis ? "entities/summary" : "entities"));
-                const urlParams = new URLSearchParams(url.search);
+                const urlParams = url.searchParams;
                 if (expandRelations) {
                     urlParams.append("$expand", "relation");
                 }
@@ -3920,7 +3918,7 @@ var Entity;
                 if (schemaId) {
                     urlParams.set("schema", schemaId);
                 }
-                const urlStr = url.toString() + "?" + urlParams.toString();
+                const urlStr = url.toString();
                 const data = yield api.post(urlStr, body, Api.PrepReqParams(reqParams));
                 if (!analysis) {
                     entities = data.Items;
@@ -9277,7 +9275,9 @@ var Tileset;
             if (!viaCdnCacheToken) {
                 viaCdnCacheToken = 0;
             }
-            return cdnBaseUrl + `tileset/file/${tilesetId}/${file}?accountId=${api.AccountId}&cacheToken=${viaCdnCacheToken}`;
+            const urlParams = new URLSearchParams();
+            urlParams.append("cacheToken", String(viaCdnCacheToken));
+            return api.ConstructCdnUrl(`tileset/file/${tilesetId}/${file}`, urlParams);
         }
         return api.GetBaseUrl() + `tileset/file/${tilesetId}/${file}`;
     }
@@ -9419,10 +9419,13 @@ var Tileset;
          */
         function IsAccessAllowed(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { tilesetId, sourceAccountId, getters, forAccountId, req } = params;
+                let { tilesetId, sourceAccountId, getters, forAccountId, checkFreeOption, req } = params;
                 if (!forAccountId) {
                     forAccountId = ENVIRONMENT.PARAMS.accountId;
                 }
+                if (checkFreeOption == null) {
+                    checkFreeOption = true;
+                }
                 // Null source account id means it's a tileset from within the same account.
                 // We also don't want to bother looking for records if we're loading in our own account.
                 if (forAccountId == sourceAccountId || !sourceAccountId) {
@@ -9454,7 +9457,7 @@ var Tileset;
                         }
                         // If not allowed we'll check if this is a CC3D tileset and if it's set as the selected "free" one.
                         // This is a placeholder feature until a marketplace system is made.
-                        if (String(sourceAccountId).toLowerCase().trim() == "cc3d") {
+                        if (String(sourceAccountId).toLowerCase().trim() == "cc3d" && checkFreeOption) {
                             const settings = (yield Account.GetAppSettings({
                                 accountId: forAccountId,
                                 appId: Account.EAppId.Navigator,
@@ -13242,7 +13245,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.2.4";
+const VERSION = "4.2.6";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, 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, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map