fix getMapBoxStyle请求携带withCredentials参数 review by xiongjj

chenxianhuii · chenxianhuii · commit ba826b786666 · 2025-06-09T17:49:34.000+08:00
diff --git a/src/common/mapping/WebMapService.js b/src/common/mapping/WebMapService.js
@@ -199,7 +199,11 @@ export class WebMapService {
 
   getMapBoxStyle(styleURL, withoutFormatSuffix = false) {
     return new Promise((resolve, reject) => {
-      FetchRequest.get(styleURL, {}, { withoutFormatSuffix })
+      const proxy = this.handleProxy();
+      FetchRequest.get(styleURL, {}, { 
+        withoutFormatSuffix,
+        withCredentials: this.handleWithCredentials(proxy, styleURL, this.withCredentials)
+       })
         .then(response => {
           return response.json();
         })
diff --git a/test/mapboxgl/mapping/WebMapV2Spec.js b/test/mapboxgl/mapping/WebMapV2Spec.js
@@ -350,14 +350,15 @@ describe('mapboxgl_WebMapV2', () => {
   });
 
   it('test baseLayer layers count maploaded', (done) => {
-    spyOn(FetchRequest, 'get').and.callFake((url) => {
+    spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {
       if (url.indexOf('portal.json') > -1) {
         return Promise.resolve(new Response(JSON.stringify(iportal_serviceProxy)));
       }
       if (url.indexOf('map.json') > -1) {
         return Promise.resolve(new Response(JSON.stringify(webmap_MAPBOXSTYLE_Tile)));
       }
       if (url.indexOf('maps/China_4326/style.json') > -1) {
+        expect(options.withCredentials).not.toBeUndefined();
         return Promise.resolve(new Response(styleJson));
       }
       if (url.indexOf('%E4%BA%AC%E6%B4%A5%E5%9C%B0%E5%8C%BA%E5%9C%B0%E5%9B%BE.json') > -1) {

Original file line number	Diff line number	Diff line change
`@@ -350,14 +350,15 @@ describe('mapboxgl_WebMapV2', () => {`
`350`	`350`	`});`
`351`	`351`
`352`	`352`	`it('test baseLayer layers count maploaded', (done) => {`
`353`		`- spyOn(FetchRequest, 'get').and.callFake((url) => {`
	`353`	`+ spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {`
`354`	`354`	`if (url.indexOf('portal.json') > -1) {`
`355`	`355`	`return Promise.resolve(new Response(JSON.stringify(iportal_serviceProxy)));`
`356`	`356`	`}`
`357`	`357`	`if (url.indexOf('map.json') > -1) {`
`358`	`358`	`return Promise.resolve(new Response(JSON.stringify(webmap_MAPBOXSTYLE_Tile)));`
`359`	`359`	`}`
`360`	`360`	`if (url.indexOf('maps/China_4326/style.json') > -1) {`
	`361`	`+ expect(options.withCredentials).not.toBeUndefined();`
`361`	`362`	`return Promise.resolve(new Response(styleJson));`
`362`	`363`	`}`
`363`	`364`	`if (url.indexOf('%E4%BA%AC%E6%B4%A5%E5%9C%B0%E5%8C%BA%E5%9C%B0%E5%9B%BE.json') > -1) {`