bruce-cesium 6.6.9 → 6.7.0

package/dist/bruce-cesium.umd.js

@@ -16067,7 +16067,19 @@
                         // Already exists, no need to re-initialize.
                         return;
                     }
-                    const validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
+                    const ionCheckApi = this.getters.GetBruceApi({});
+                    await ionCheckApi.Loading;
+                    const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
+                    const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
+                    // Use if marked as available.
+                    let validToken;
+                    if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
+                        validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                    }
+                    // Legacy route, to be killed off.
+                    else {
+                        validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                    }
                     if (!validToken) {
                         console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
                         return;
@@ -22997,7 +23009,18 @@
                         // If we need a cesium token, and we don't have one, then we can't render this.
                         let shouldCreate = true;
                         if (NEEDS_CESIUM_TOKEN.includes(defaultImg.id)) {
-                            shouldCreate = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
+                            const ionCheckApi = apiGetter.getApi(apiGetter.accountId);
+                            await ionCheckApi.Loading;
+                            const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
+                            const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
+                            // Use if marked as available.
+                            if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
+                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                            }
+                            // Legacy route, to be killed off.
+                            else {
+                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                            }
                         }
                         if (shouldCreate) {
                             try {
@@ -23440,7 +23463,18 @@
                         // Cesium token is required for Cesium World Terrain.
                         let shouldCreate = true;
                         if (defaultTerr.id == BModels.ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain) {
-                            shouldCreate = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
+                            const ionCheckApi = params.apiGetter.getApi(params.apiGetter.accountId);
+                            await ionCheckApi.Loading;
+                            const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
+                            const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
+                            // Use if marked as available.
+                            if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
+                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                            }
+                            // Legacy route, to be killed off.
+                            else {
+                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                            }
                         }
                         if (shouldCreate) {
                             provider = await renderDefaultTerrTile(defaultTerr.id);
@@ -23772,31 +23806,27 @@
             try {
                 const bruceApi = getters.GetBruceApi();
                 await bruceApi.Loading;
-                // Proxy path: token injected server-side.
+                // Get token record to check availability.
+                const { programKeys } = await BModels.ProgramKey.GetList({ api: bruceApi });
+                const ionKey = programKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
                 if (bruceApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
-                    Cesium.Ion.defaultServer = bruceApi.GetBaseUrl() + "proxy/cesium-ion/";
-                    Cesium.Ion.defaultAccessToken = "proxy";
-                    cTokenSet = true;
+                    // Marked as available.
+                    if (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) {
+                        Cesium.Ion.defaultServer = bruceApi.GetBaseUrl() + "proxy/cesium-ion/";
+                        Cesium.Ion.defaultAccessToken = "proxy";
+                        cTokenSet = true;
+                    }
                 }
-                // Legacy path: fetch real Ion token from DB.
-                // Kill off once API instances are migrated.
                 else {
-                    try {
-                        const { programKey } = await BModels.ProgramKey.Get({
-                            programId: BModels.ProgramKey.EProgramId.CesiumIon,
-                            api: bruceApi
-                        });
-                        if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
-                            const valid = await exports.ViewerUtils.AssertIonToken(programKey.Key);
-                            if (valid) {
-                                Cesium.Ion.defaultAccessToken = programKey.Key;
-                                cTokenSet = true;
-                            }
+                    // Legacy path: fetch real Ion token from DB.
+                    // Kill off once API instances are migrated.
+                    if (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) {
+                        const valid = await exports.ViewerUtils.AssertIonToken(ionKey.Key);
+                        if (valid) {
+                            Cesium.Ion.defaultAccessToken = ionKey.Key;
+                            cTokenSet = true;
                         }
                     }
-                    catch (e) {
-                        console.error(e);
-                    }
                 }
             }
             catch (e) {
@@ -29609,16 +29639,12 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
         /**
          * Returns if the given token is valid or not.
-         * This will perform a test request to Cesium API.
+         * Returns true if the supplied Cesium Ion access token is valid by probing the Ion endpoint.
+         * @warning don't use when going through the proxy API route.
          * @param token
          * @returns
          */
         async function AssertIonToken(token) {
-            // If routed through a proxy then we don't need auth on client side for it.
-            const defaultServer = Cesium.Ion.defaultServer;
-            if (defaultServer && typeof defaultServer === "string" && !defaultServer.includes("cesium.com")) {
-                return true;
-            }
             if (!token) {
                 return false;
             }
@@ -36203,7 +36229,7 @@
         }
     }
 
-    const VERSION = "6.6.9";
+    const VERSION = "6.7.0";
     /**
      * Updates the environment instance used by bruce-cesium to one specified.
      * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.