mapbox · peterqliu · Jul 10, 2019 · Jun 17, 2019 · Jun 17, 2019 · Jun 18, 2019
diff --git a/debug/token.html b/debug/token.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Mapbox GL JS debug page</title>
+    <meta charset='utf-8'>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <link rel='stylesheet' href='/dist/mapbox-gl.css' />
+    <style>
+        body { margin: 0; padding: 0; }
+        html, body, #map { height: 100%; }
+    </style>
+</head>
+
+<body>
+<div id='map'></div>
+<div id='hidden' style='display:none'></div>
+<script src='/dist/mapbox-gl-dev.js'></script>
+<script src='/debug/access_token_generated.js'></script>
+<script>
+
+    // 1) first map should work with its valid local accessToken, despite the bad global mapboxgl token
+    // 2) first map should keep working properly, despite the bad token in the second map
+
+    var mapToken = mapboxgl.accessToken;
+    mapboxgl.accessToken = 'notAToken';
+
+    var map = window.map = new mapboxgl.Map({
+        container: 'map',
+        zoom: 12.5,
+        center: [-77.01866, 38.888],
+        style: 'mapbox://styles/mapbox/streets-v10',
+        hash: true,
+        accessToken: mapToken
+    });
+
+    var map2 = new mapboxgl.Map({
+        container: 'hidden',
+        zoom: 12.5,
+        center: [-77.01866, 38.888],
+        style: 'mapbox://styles/mapbox/dark-v10',
+        hash: true,
+        accessToken: 'anotherBadToken'
+    });
+
+</script>
+</body>
+</html>
diff --git a/src/index.js b/src/index.js
@@ -70,6 +70,7 @@ const exported = {
     },
 
     set baseApiUrl(url: string) {
+        console.log('setting');
         config.API_URL = url;
     },
 

diff --git a/src/source/vector_tile_source.js b/src/source/vector_tile_source.js
@@ -72,9 +72,8 @@ class VectorTileSource extends Evented implements Source {
             } else if (tileJSON) {
                 extend(this, tileJSON);
                 if (tileJSON.bounds) this.tileBounds = new TileBounds(tileJSON.bounds, this.minzoom, this.maxzoom);
-
-                postTurnstileEvent(tileJSON.tiles);
-                postMapLoadEvent(tileJSON.tiles, this.map._getMapId(), this.map._requestManager._skuToken);
+                postTurnstileEvent(tileJSON.tiles, this.map._requestManager._customAccessToken);
+                postMapLoadEvent(tileJSON.tiles, this.map._getMapId(), this.map._requestManager._skuToken, this.map._requestManager._customAccessToken);
 
                 // `content` is included here to prevent a race condition where `Style#_updateSources` is called
                 // before the TileJSON arrives. this makes sure the tiles needed are loaded once TileJSON arrives

diff --git a/src/style/style.js b/src/style/style.js
@@ -195,7 +195,6 @@ class Style extends Evented {
 
         url = this.map._requestManager.normalizeStyleURL(url, options.accessToken);
         const request = this.map._requestManager.transformRequest(url, ResourceType.Style);
-
         this._request = getJSON(request, (error: ?Error, json: ?Object) => {
             this._request = null;
             if (error) {

diff --git a/src/ui/map.js b/src/ui/map.js
@@ -91,7 +91,8 @@ type MapOptions = {
     pitch?: number,
     renderWorldCopies?: boolean,
     maxTileCacheSize?: number,
-    transformRequest?: RequestTransformFunction
+    transformRequest?: RequestTransformFunction,
+    accessToken: string
 };
 
 const defaultMinZoom = 0;
@@ -128,6 +129,7 @@ const defaultOptions = {
     maxTileCacheSize: null,
     localIdeographFontFamily: 'sans-serif',
     transformRequest: null,
+    accessToken: null,
     fadeDuration: 300,
     crossSourceCollisions: true
 };
@@ -211,6 +213,8 @@ const defaultOptions = {
  * @param {boolean} [options.collectResourceTiming=false] If `true`, Resource Timing API information will be collected for requests made by GeoJSON and Vector Tile web workers (this information is normally inaccessible from the main Javascript thread). Information will be returned in a `resourceTiming` property of relevant `data` events.
  * @param {number} [options.fadeDuration=300] Controls the duration of the fade-in/fade-out animation for label collisions, in milliseconds. This setting affects all symbol layers. This setting does not affect the duration of runtime styling transitions or raster tile cross-fading.
  * @param {boolean} [options.crossSourceCollisions=true] If `true`, symbols from multiple sources can collide with each other during collision detection. If `false`, collision detection is run separately for the symbols in each source.
+ * @param {string} [options.accessToken=null] If specified, map will use this token instead of the one defined in mapboxgl.accessToken.
+
  * @example
  * var map = new mapboxgl.Map({
  *   container: 'map',
@@ -331,7 +335,8 @@ class Map extends Camera {
         this._renderTaskQueue = new TaskQueue();
         this._controls = [];
         this._mapId = uniqueId();
-        this._requestManager = new RequestManager(options.transformRequest);
+
+        this._requestManager = new RequestManager(options.transformRequest, options.accessToken);
 
         if (typeof options.container === 'string') {
             this._container = window.document.getElementById(options.container);

diff --git a/src/util/mapbox.js b/src/util/mapbox.js
@@ -41,9 +41,11 @@ export class RequestManager {
     _skuToken: string;
     _skuTokenExpiresAt: number;
     _transformRequestFn: ?RequestTransformFunction;
+    _customAccessToken: ?string;
 
-    constructor(transformRequestFn?: RequestTransformFunction) {
+    constructor(transformRequestFn?: RequestTransformFunction, customAccessToken?: string) {
         this._transformRequestFn = transformRequestFn;
+        this._customAccessToken = customAccessToken;
         this._createSkuToken();
     }
 
@@ -66,27 +68,27 @@ export class RequestManager {
     }
 
     normalizeStyleURL(url: string, accessToken?: string): string {
-        return normalizeStyleURL(url, accessToken);
+        return normalizeStyleURL(url, this._customAccessToken || accessToken);
     }
 
     normalizeGlyphsURL(url: string, accessToken?: string): string {
-        return normalizeGlyphsURL(url, accessToken);
+        return normalizeGlyphsURL(url, this._customAccessToken || accessToken);
     }
 
     normalizeSourceURL(url: string, accessToken?: string): string {
-        return normalizeSourceURL(url, accessToken);
+        return normalizeSourceURL(url, this._customAccessToken || accessToken);
     }
 
     normalizeSpriteURL(url: string, format: string, extension: string, accessToken?: string): string {
-        return normalizeSpriteURL(url, format, extension, accessToken);
+        return normalizeSpriteURL(url, format, extension, this._customAccessToken || accessToken);
     }
 
     normalizeTileURL(tileURL: string, sourceURL?: ?string, tileSize?: ?number): string {
         if (this._isSkuTokenExpired()) {
             this._createSkuToken();
         }
 
-        return normalizeTileURL(tileURL, sourceURL, tileSize, this._skuToken);
+        return normalizeTileURL(tileURL, sourceURL, tileSize, this._skuToken, this._customAccessToken);
     }
 
     canonicalizeTileURL(url: string) {
@@ -166,7 +168,7 @@ const normalizeSpriteURL = function(url: string, format: string, extension: stri
 
 const imageExtensionRe = /(\.(png|jpg)\d*)(?=$)/;
 
-const normalizeTileURL = function(tileURL: string, sourceURL?: ?string, tileSize?: ?number, skuToken?: string): string {
+const normalizeTileURL = function(tileURL: string, sourceURL?: ?string, tileSize?: ?number, skuToken?: string, customAccessToken?: ?string): string {
     if (!sourceURL || !isMapboxURL(sourceURL)) return tileURL;
 
     const urlObject = parseUrl(tileURL);
@@ -183,7 +185,7 @@ const normalizeTileURL = function(tileURL: string, sourceURL?: ?string, tileSize
         urlObject.params.push(`sku=${skuToken}`);
     }
 
-    return makeAPIURL(urlObject);
+    return makeAPIURL(urlObject, customAccessToken);
 };
 
 // matches any file extension specified by a dot and one or more alphanumeric characters
@@ -269,6 +271,7 @@ class TelemetryEvent {
     queue: Array<any>;
     type: TelemetryEventType;
     pendingRequest: ?Cancelable;
+    _customAccessToken: ?string;
 
     constructor(type: TelemetryEventType) {
         this.type = type;
@@ -329,17 +332,18 @@ class TelemetryEvent {
 
     }
 
-    processRequests() {}
+    processRequests(customAccessToken?: ?string) {}
 
     /*
     * If any event data should be persisted after the POST request, the callback should modify eventData`
     * to the values that should be saved. For this reason, the callback should be invoked prior to the call
     * to TelemetryEvent#saveData
     */
-    postEvent(timestamp: number, additionalPayload: {[string]: any}, callback: (err: ?Error) => void) {
+    postEvent(timestamp: number, additionalPayload: {[string]: any}, callback: (err: ?Error) => void, customAccessToken?: ?string) {
         if (!config.EVENTS_URL) return;
         const eventsUrlObject: UrlObject = parseUrl(config.EVENTS_URL);
-        eventsUrlObject.params.push(`access_token=${config.ACCESS_TOKEN || ''}`);
+        eventsUrlObject.params.push(`access_token=${customAccessToken || config.ACCESS_TOKEN || ''}`);
+
         const payload: Object = {
             event: this.type,
             created: new Date(timestamp).toISOString(),
@@ -362,13 +366,13 @@ class TelemetryEvent {
             this.pendingRequest = null;
             callback(error);
             this.saveEventData();
-            this.processRequests();
+            this.processRequests(customAccessToken);
         });
     }
 
-    queueRequest(event: number | {id: number, timestamp: number}) {
+    queueRequest(event: number | {id: number, timestamp: number}, customAccessToken?: ?string) {
         this.queue.push(event);
-        this.processRequests();
+        this.processRequests(customAccessToken);
     }
 }
 
@@ -382,20 +386,20 @@ export class MapLoadEvent extends TelemetryEvent {
         this.skuToken = '';
     }
 
-    postMapLoadEvent(tileUrls: Array<string>, mapId: number, skuToken: string) {
+    postMapLoadEvent(tileUrls: Array<string>, mapId: number, skuToken: string, customAccessToken: string) {
         //Enabled only when Mapbox Access Token is set and a source uses
         // mapbox tiles.
         this.skuToken = skuToken;
 
         if (config.EVENTS_URL &&
-            config.ACCESS_TOKEN &&
+            customAccessToken || config.ACCESS_TOKEN &&
             Array.isArray(tileUrls) &&
             tileUrls.some(url => isMapboxURL(url) || isMapboxHTTPURL(url))) {
-            this.queueRequest({id: mapId, timestamp: Date.now()});
+            this.queueRequest({id: mapId, timestamp: Date.now()}, customAccessToken);
         }
     }
 
-    processRequests() {
+    processRequests(customAccessToken?: ?string) {
         if (this.pendingRequest || this.queue.length === 0) return;
         const {id, timestamp} = this.queue.shift();
 
@@ -414,13 +418,14 @@ export class MapLoadEvent extends TelemetryEvent {
             if (!err) {
                 if (id) this.success[id] = true;
             }
-        });
+        }, customAccessToken);
     }
 }
 
 export class TurnstileEvent extends TelemetryEvent {
-    constructor() {
+    constructor(customAccessToken?: ?string) {
         super('appUserTurnstile');
+        this._customAccessToken = customAccessToken;
     }
 
     postTurnstileEvent(tileUrls: Array<string>) {
@@ -430,7 +435,7 @@ export class TurnstileEvent extends TelemetryEvent {
             config.ACCESS_TOKEN &&
             Array.isArray(tileUrls) &&
             tileUrls.some(url => isMapboxURL(url) || isMapboxHTTPURL(url))) {
-            this.queueRequest(Date.now());
+            this.queueRequest(Date.now(), this._customAccessToken);
         }
     }
 
@@ -475,7 +480,7 @@ export class TurnstileEvent extends TelemetryEvent {
                 this.eventData.lastSuccess = nextUpdate;
                 this.eventData.tokenU = tokenU;
             }
-        });
+        }, this._customAccessToken);
     }
 }
 

diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
@@ -50,6 +50,15 @@ test('Map', (t) => {
         t.end();
     });
 
+    t.test('bad map-specific token breaks map', (t) => {
+        const container = window.document.createElement('div');
+        Object.defineProperty(container, 'offsetWidth', {value: 512});
+        Object.defineProperty(container, 'offsetHeight', {value: 512});
+        createMap(t, {accessToken:'notAToken'});
+        t.error();
+        t.end();
+    });
+
     t.test('initial bounds in constructor options', (t) => {
         const container = window.document.createElement('div');
         Object.defineProperty(container, 'offsetWidth', {value: 512});

diff --git a/test/unit/util/mapbox.test.js b/test/unit/util/mapbox.test.js
@@ -66,6 +66,12 @@ test("mapbox", (t) => {
             t.end();
         });
 
+        t.test('takes map-specific tokens correctly', (t) => {
+            const m = new mapbox.RequestManager(undefined, 'customAccessToken');
+            t.equal(m.normalizeStyleURL('mapbox://styles/user/style'), 'https://api.mapbox.com/styles/v1/user/style?access_token=customAccessToken');
+            t.end();
+        });
+
         webpSupported.supported = false;
 
         t.test('.normalizeStyleURL', (t) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ const exported = { @@
         },
         set baseApiUrl(url: string) {
+            console.log('setting');
             config.API_URL = url;
         },
@@ Expand Down @@