[fix]leaflet wmts token不对 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 199cc61b36fa · 2022-10-11T15:17:37.000+08:00
diff --git a/src/leaflet/mapping/TileLayer.WMTS.js b/src/leaflet/mapping/TileLayer.WMTS.js
@@ -3,6 +3,8 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import L from "leaflet";
 import "../core/Base";
+import { SecurityManager } from '@supermap/iclient-common/security/SecurityManager';
+import { Util as CommonUtil } from '@supermap/iclient-common/commontypes/Util';
 
 /**
  * @class WMTSLayer
@@ -81,8 +83,11 @@ export var WMTSLayer = L.TileLayer.extend({
     getTileUrl: function (coords) { // (Point, Number) -> String
         var zoom = this._getZoomForUrl();
         var ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
+        var index = this._url.indexOf('?');
+        var url = index > -1 ? this._url.substring(0, this._url.indexOf('?')) : this._url;
+        var urlParams = index > -1 ? this._url.substring(this._url.indexOf('?')) : '';
 
-        var url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
+        url = L.Util.template(url, {s: this._getSubdomain(coords)});
 
         var obj = {
             service: 'WMTS',
@@ -108,7 +113,9 @@ export var WMTSLayer = L.TileLayer.extend({
         } else if (this.options.requestEncoding === 'REST') {
             var params = "/" + obj.layer + "/" + obj.style + "/" + obj.tilematrixSet + "/" + obj.tilematrix + "/" + obj.tilerow + "/" + obj.tilecol + this.formatSuffix;
             url += params;
-        }
+        } 
+        url = CommonUtil.urlAppend(url, urlParams);
+        url = SecurityManager.appendCredential(url);
         return url;
     }
 });
diff --git a/test/leaflet/mapping/TileLayer.WMTSSpec.js b/test/leaflet/mapping/TileLayer.WMTSSpec.js
@@ -1,4 +1,5 @@
 import {wmtsLayer} from '../../../src/leaflet/mapping/TileLayer.WMTS';
+import { SecurityManager } from '../../../src/common/security/SecurityManager';
 
 var url = GlobeParameter.WMTSURL;
 describe('leaflet_TileLayerWMTS', () => {
@@ -71,4 +72,36 @@ describe('leaflet_TileLayerWMTS', () => {
         expect(WMTStiledMapLayerObject.getTileUrl(coords)).toBe(url + '/China/default/Custom_China/NaN/0/0.png');
     });
 
+    it("getTileUrl_params Token", () => {
+      var coords = {x: 0, y: 0, z: 0};
+      var option = {
+          layer: "China",
+          style: "default",
+          tilematrixSet: "Custom_China",
+          format: "image/png",
+          requestEncoding: 'REST'
+      };
+      var url = GlobeParameter.WMTSURL+'?token=test';
+      WMTStiledMapLayerObject = wmtsLayer(url, option);
+      const tileUrl = WMTStiledMapLayerObject.getTileUrl(coords)
+      expect(tileUrl).not.toBeNull();
+      expect(tileUrl).toBe(GlobeParameter.WMTSURL + '/China/default/Custom_China/NaN/0/0.png?token=test');
+    });
+
+    it("getTileUrl_registerToken", () => {
+      var coords = {x: 0, y: 0, z: 0};
+      var option = {
+          layer: "China",
+          style: "default",
+          tilematrixSet: "Custom_China",
+          format: "image/png",
+          requestEncoding: 'REST'
+      };
+      var url = GlobeParameter.WMTSURL;
+      SecurityManager.registerToken(url, 'test');
+      WMTStiledMapLayerObject = wmtsLayer(url, option);
+      const tileUrl = WMTStiledMapLayerObject.getTileUrl(coords)
+      expect(tileUrl).not.toBeNull();
+      expect(tileUrl).toBe(GlobeParameter.WMTSURL + '/China/default/Custom_China/NaN/0/0.png?token=test');
+  });
 });
