[FIX] Issue #7365: added check for the existence of a parameter in the CAS URL#7471
Merged
rodrigok merged 2 commits intoRocketChat:developfrom Jul 14, 2017
Merged
[FIX] Issue #7365: added check for the existence of a parameter in the CAS URL#7471rodrigok merged 2 commits intoRocketChat:developfrom
rodrigok merged 2 commits intoRocketChat:developfrom
Conversation
|
|
gdelavald
reviewed
Jul 11, 2017
| const loginUrl = `${ login_url }?service=${ appUrl }/_cas/${ credentialToken }`; | ||
| // check if the provided CAS URL already has some parameters | ||
| if (login_url.split('?').length > 1) { | ||
| const loginUrl = `${ login_url }&service=${ appUrl }/_cas/${ credentialToken }`; |
Contributor
There was a problem hiding this comment.
There is an issue here, since const is block scoped it will not exist outside the if/else blocks, so I recommend using a
let loginurl = [else value here]
and then changing it in case the if condition is true.
rodrigok
approved these changes
Jul 14, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
@RocketChat/core
Closes #7365
The fix checks whether the URL contains
?, which means that the configured URL already has parameters(s). In that case instead of adding a?, a&will allow the chaining of parameters.