bruce-models 4.2.4 → 4.2.6

package/dist/bruce-models.umd.js

@@ -1430,8 +1430,8 @@
                                 env: this.env
                             });
                         }
-                        const { account } = yield exports.Account.Get({
-                            accountId: this.accountId,
+                        const { account } = yield exports.Account.GetBySubdomain({
+                            subdomain: this.accountId,
                             api: guardian
                         });
                         // Precalculated URLs exist.
@@ -1575,13 +1575,16 @@
                 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.
@@ -1912,9 +1915,7 @@
                 this.bruce[key] = new exports.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
@@ -1937,10 +1938,7 @@
                 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
                     });
                 }
             };
@@ -3789,18 +3787,18 @@
                 }
                 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);
@@ -3847,7 +3845,7 @@
                     if (schemaId) {
                         urlParams.set("schema", schemaId);
                     }
-                    const urlStr = url.toString() + "?" + urlParams.toString();
+                    const urlStr = url.toString();
                     const data = yield api.get(urlStr, exports.Api.PrepReqParams(reqParams));
                     if (!analysis) {
                         entities = data.Items;
@@ -3856,7 +3854,7 @@
                 }
                 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");
                     }
@@ -3866,7 +3864,7 @@
                     if (schemaId) {
                         urlParams.set("schema", schemaId);
                     }
-                    const urlStr = url.toString() + "?" + urlParams.toString();
+                    const urlStr = url.toString();
                     const data = yield api.post(urlStr, body, exports.Api.PrepReqParams(reqParams));
                     if (!analysis) {
                         entities = data.Items;
@@ -9100,7 +9098,9 @@
                 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}`;
         }
@@ -9242,10 +9242,13 @@
              */
             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 = exports.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) {
@@ -9277,7 +9280,7 @@
                             }
                             // 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 exports.Account.GetAppSettings({
                                     accountId: forAccountId,
                                     appId: exports.Account.EAppId.Navigator,
@@ -12976,7 +12979,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.2.4";
+    const VERSION = "4.2.6";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;