Send version header #1564
Merged
Send version header #1564
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
| const allowedClients = req.uppy.options.clients | ||
| // if no preset clients then allow any client | ||
| if (!allowedClients || hasMatch(origin, allowedClients) || hasMatch(parseUrl(origin).host, allowedClients)) { | ||
| return res.send(htmlContent(uppyAuthToken, origin)) | ||
| return res.send(clientVersion ? htmlContent(uppyAuthToken, origin) : oldHtmlContent(uppyAuthToken, origin)) |
There was a problem hiding this comment.
This works but we should add a todo to the changelog to use https://www.npmjs.com/package/semver for these checks, especially if we're going to have more breaking changes.
There was a problem hiding this comment.
adding on asana so you can ignore the above
e; nvm you already did it, both is fine :P
goto-bus-stop
approved these changes
May 17, 2019
arturi
approved these changes
May 17, 2019
|
Yeah, +100 thanks for fast turnaround! |
arturi
reviewed
May 20, 2019
| @@ -63,7 +63,7 @@ module.exports.app = (options = {}) => { | |||
| app.use((req, res, next) => { | |||
| res.header( | |||
| 'Access-Control-Allow-Headers', | |||
| [res.get('Access-Control-Allow-Headers'), 'uppy-auth-token'].join(', ') | |||
| [res.get('Access-Control-Allow-Headers'), 'uppy-auth-token', 'uppy-client'].join(', ') | |||
| ) | |||
There was a problem hiding this comment.
Node.js will lowercase it for us, but i think so far we've tried to use uppercasing like that in tus/uppy headers
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.
We’ve accidentally introduced breaking changes in
@uppy/companion@1.0.1in 156e86e#diff-7b39a69472a3e796126259ddff14f820R45.This fix restores backwards-compatibility with Uppy Client
^1.0.0, by introducinguppyVersionsparam (in the future also anuppy-versionsheader). If this param is present, the authentication token is sent in a new way, as a string, otherwise it’s sent the old way, as JSON object (incompatible with IE).You should use
@uppy/companion@1.0.2for backwards-compatibility,@uppy/companion@1.0.1is deprecated.