【fix】ISVJ-7398 修复带有token的restmap和叠加的数据401问题

chenxianhuii · chenxianhuii · commit 460bd4b5edcc · 2023-12-28T17:38:32.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -1394,12 +1394,12 @@ export class WebMap extends Observable {
             withCredentials: this.withCredentials,
             withoutFormatSuffix: true
         };
+        let tempUrl = layerInfo.url;
         if (layerInfo.url.indexOf("?token=") > -1) {
-            that.credentialKey = 'token';
-            that.credentialValue = layerInfo.credential = layerInfo.url.split("?token=")[1];
+            layerInfo.credential = { token: layerInfo.url.split("?token=")[1] };
             layerInfo.url = layerInfo.url.split("?token=")[0];
         }
-        let url = this.handleJSONSuffix(layerInfo.url);
+        let url = this.handleJSONSuffix(tempUrl);
         return FetchRequest.get(that.getRequestUrl(url), null, options).then(function (response) {
             return response.json();
         }).then(async function (result) {
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -1579,4 +1579,27 @@ describe('openlayers_WebMap', () => {
             done();
         }
     });
+
+    it('createBaseLayer-SUPERMAP_REST-token', (done) => {
+      spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {
+        if (url.indexOf('map.json') > -1) {
+            var mapJson = datavizWebMap_RestMap_token;
+            return Promise.resolve(new Response(mapJson));
+        } else if (url.indexOf('content.json') > -1) {
+            expect(url.indexOf('testtoken')).toBe(-1);
+            return Promise.resolve(new Response(geojsonData));
+        } else {
+            expect(url.indexOf('testtoken')).not.toBe(-1);
+            return Promise.resolve()
+        }
+      });
+      var datavizWebmap = new WebMap(id, {successCallback, errorCallback, server: defaultServer });
+      function successCallback(map, mapInfo, layers, baseLayer){
+        expect(baseLayer.credential).toEqual({token: 'testtoken'});
+        done();
+      }
+      function errorCallback(error) {
+        console.log(error);
+      }
+    });
 });
diff --git a/test/resources/WebMapV5.js b/test/resources/WebMapV5.js
