Handle configured API_URLs that have a path: #4995
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For the case when a user has modified mapboxgl.config.API_URL that includes a path such as http://test.example.com/api.mapbox.com the path was getting removed when building the full URL as it was being overwritten by the original path from the request. This pull request checks if the generation of the apiUrlObject has a path other than '/' (which is the default) we need to prepend it to the original urlObject path. This fixes the case where users using a reverse proxy to mapbox have filtered on the specific path set in their API_URL, and when it has been removed the lack of a match causes the proxy to not forward the requests .
jfirebaugh
suggested changes
Jul 19, 2017
src/util/mapbox.js
Outdated
| @@ -17,6 +17,10 @@ function makeAPIURL(urlObject: UrlObject, accessToken: string | null | void): st | |||
| urlObject.protocol = apiUrlObject.protocol; | |||
| urlObject.authority = apiUrlObject.authority; | |||
|
|
|||
| if (apiUrlObject.path !== '/') { | |||
| urlObject.authority = `${urlObject.authority}${apiUrlObject.path}`; | |||
There was a problem hiding this comment.
Could this prepend apiUrlObject.path to urlObject.path, rather than appending it to authority? That would be clearer and more robust.
There was a problem hiding this comment.
More than happy to make that change.
There was a problem hiding this comment.
@jfirebaugh Changes made - we now prepend to the urlObject.path instead of appending to urlObject.authority.
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For the case when a user has modified
mapboxgl.config.API_URLthatincludes a path such as http://test.example.com/api.mapbox.com the
path was getting removed when building the full URL as it was being
overwritten by the original path from the request.
This pull request checks if the generation of the
apiUrlObjecthas apath other than
'/'(which is the default), and if so we need to prepend it to theoriginal
urlObjectpath.This fixes the case where users using a reverse proxy to mapbox have
filtered on the specific path set in their API_URL, and when it has been
removed the lack of a match causes the proxy to not forward the requests
.
Debug page:
Benchmarks:
Launch Checklist