[fix]ICL-1576 mapboxgl设置token后，url参数中未包含token

Author: luoxiao-supermap

src/mapboxgl/mapping/InitMap.js

@@ -3,6 +3,7 @@ import { MapService } from '../services/MapService';
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import { InitMapServiceBase, isPlaneProjection, getZoom, getTileset, getTileFormat } from '@supermapgis/iclient-common/iServer/InitMapServiceBase';
 import { Util } from '@supermapgis/iclient-common/commontypes/Util';
+import { SecurityManager } from '@supermapgis/iclient-common/security/SecurityManager';
 import proj4 from 'proj4';
 
 /**
@@ -179,6 +180,7 @@ async function createMapOptions(url, resetServiceInfo, options) {
     sourceType === 'vector-tile'
       ? Util.urlAppend(Util.urlPathAppend(url, 'tileFeature/vectorstyles.json'), 'type=MapBox_GL&styleonly=true&tileURLTemplate=ZXY')
       : url;
+  tileUrl = SecurityManager.appendCredential(tileUrl);
   let nonEnhanceExtraInfo = {};
   let enhanceExtraInfo = {};
   let zoom;

src/maplibregl/mapping/InitMap.js

@@ -3,6 +3,7 @@ import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import { MapService } from '../services/MapService';
 import { InitMapServiceBase, isPlaneProjection, getZoom, getTileset, getTileFormat } from '@supermapgis/iclient-common/iServer/InitMapServiceBase';
 import { Util } from '@supermapgis/iclient-common/commontypes/Util';
+import { SecurityManager } from '@supermapgis/iclient-common/security/SecurityManager';
 import proj4 from 'proj4';
 /**
  * @function initMap
@@ -172,6 +173,7 @@ async function createMapOptions(url, resetServiceInfo, options) {
     sourceType === 'vector-tile'
       ? Util.urlAppend(Util.urlPathAppend(url, 'tileFeature/vectorstyles.json'), 'type=MapBox_GL&styleonly=true&tileURLTemplate=ZXY')
       : url;
+  tileUrl = SecurityManager.appendCredential(tileUrl);
   let nonEnhanceExtraInfo = {};
   let enhanceExtraInfo = {};
   let zoom;

test/mapboxgl/mapping/InitMapSpec.js

@@ -2,6 +2,7 @@ import mapboxgl from 'mapbox-gl';
 import mbglmap from '../../tool/mock_mapboxgl_map';
 import { initMap } from '../../../src/mapboxgl/mapping/InitMap';
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
+import { SecurityManager } from '../../../src/common/security/SecurityManager';
 
 describe('mapboxgl_InitMap', () => {
   let originalTimeout, testDiv;
@@ -126,6 +127,46 @@ describe('mapboxgl_InitMap', () => {
       url + '/zxyTileImage.png?z={z}&x={x}&y={y}&width=256&height=256&transparent=true'
     );
   });
+  it('initMap 3857, registerToken', async () => {
+    const url = 'http:/fake:8090/iserver/iserver/services/map-china400/rest/maps/China';
+    const mapServiceInfo = {
+      dynamicProjection: false,
+      prjCoordSys: {
+        epsgCode: 3857
+      },
+      bounds: {
+        top: 20037508.342789087,
+        left: -20037508.342789248,
+        bottom: -20037508.34278914,
+        leftBottom: {
+          x: -20037508.342789248,
+          y: -20037508.34278914
+        },
+        right: 20037508.342789244,
+        rightTop: {
+          x: 20037508.342789244,
+          y: 20037508.342789087
+        }
+      },
+      center: {
+        x: -7.450580596923828e-9,
+        y: -2.60770320892334e-8
+      }
+    };
+    spyOn(FetchRequest, 'get').and.callFake(() => {
+      return Promise.resolve(new Response(JSON.stringify(mapServiceInfo)));
+    });
+    SecurityManager.registerToken(url, "test-token")
+    const resData = await initMap(url);
+    const map = resData.map;
+    expect(map).not.toBeUndefined();
+    expect(map.options.crs).toBe('EPSG:3857');
+    expect(map.options.style.layers.length).toBe(1);
+    expect(Object.values(map.options.style.sources)[0].tiles[0]).toBe(
+      url + '/zxyTileImage.png?token=test-token&z={z}&x={x}&y={y}&width=256&height=256&transparent=true'
+    );
+    SecurityManager.destroyToken(url)
+  });
 
   it('initMap 4326, dynamicProjection true, non mapbox-gl-enhance', async () => {
     const url = 'http:/fake:8090/iserver/iserver/services/map-china400/rest/maps/China';

test/maplibregl/mapping/InitMapSpec.js

@@ -2,6 +2,7 @@ import maplibregl from 'maplibre-gl';
 import mbglmap from '../../tool/mock_maplibregl_map';
 import { initMap } from '../../../src/maplibregl/mapping/InitMap';
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
+import { SecurityManager } from '../../../src/common/security/SecurityManager';
 
 describe('maplibregl_InitMap', () => {
   let originalTimeout, testDiv;
@@ -120,6 +121,47 @@ describe('maplibregl_InitMap', () => {
     expect(map.getCenter().toArray()).not.toEqual([mapServiceInfo.center.x, mapServiceInfo.center.y]);
   });
 
+  it('initMap 3857, registerToken', async () => {
+    const url = GlobeParameter.ChinaURL;
+    const mapServiceInfo = {
+      dynamicProjection: false,
+      prjCoordSys: {
+        epsgCode: 3857
+      },
+      bounds: {
+        top: 20037508.342789087,
+        left: -20037508.342789248,
+        bottom: -20037508.34278914,
+        leftBottom: {
+          x: -20037508.342789248,
+          y: -20037508.34278914
+        },
+        right: 20037508.342789244,
+        rightTop: {
+          x: 20037508.342789244,
+          y: 20037508.342789087
+        }
+      },
+      center: {
+        x: -7.450580596923828e-9,
+        y: -2.60770320892334e-8
+      }
+    };
+    spyOn(FetchRequest, 'get').and.callFake(() => {
+      return Promise.resolve(new Response(JSON.stringify(mapServiceInfo)));
+    });
+    SecurityManager.registerToken(url, "test-token")
+    const resData = await initMap(url);
+    const map = resData.map;
+    expect(map).not.toBeUndefined();
+    expect(map.getCenter().toArray()).not.toEqual([mapServiceInfo.center.x, mapServiceInfo.center.y]);
+    expect(Object.values(map.options.style.sources)[0].tiles[0]).toBe(
+      url + '/zxyTileImage.png?token=test-token&z={z}&x={x}&y={y}&width=256&height=256&transparent=true'
+    );
+    SecurityManager.destroyToken(url)
+  });
+
+
   it('initMap 4326, dynamicProjection true', async () => {
     const url = GlobeParameter.ChinaURL;
     const mapServiceInfo = {