Use host header for successful OAuth redirect (3.7) #6220
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
hmhealey
force-pushed
the
siteurlheader-37
branch
from
3c40660
to
ffe0fc5
Compare
jwilander
requested changes
Apr 24, 2017
| @@ -271,7 +271,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { | |||
|
|
|||
| state := r.URL.Query().Get("state") | |||
|
|
|||
| uri := c.GetSiteURL() + "/signup/" + service + "/complete" | |||
| uri := c.GetSiteURLHeader() + "/signup/" + service + "/complete" | |||
There was a problem hiding this comment.
Need on line 706 as well I believe
hmhealey
force-pushed
the
siteurlheader-37
branch
from
ffe0fc5
to
247663c
Compare
hmhealey
commented
Apr 24, 2017
There was a problem hiding this comment.
@jwilander Fixed and I changed it everywhere else in that file that it was using GetSiteURL to redirect the user
jwilander
approved these changes
Apr 24, 2017
coreyhulen
approved these changes
Apr 24, 2017
coreyhulen
added
4: Reviews Complete
coreyhulen
approved these changes
Apr 24, 2017
esethna
added
Changelog/Not Needed
danmaas
added a commit
to spinpunch/battlehouse-mattermost
that referenced
this pull request
Sep 8, 2017
* commit '51cdce09634cd30ce9e23095c86ddc9f680671d7': (37 commits) Email fix Update channel header Minor fix Fixed detection of HTTPS without a proxy (mattermost#6232) Use host header for successful OAuth redirect (mattermost#6220) Invite salt fix for 3.8 (mattermost#6149) PLT-6368 Changed client to always use window.location.origin over SiteURL (3.7) (mattermost#6191) PLT-5900 Removed automatic configuration of Site URL (mattermost#6135) Fix configuration setting PLT-5702 Added special error page for private browsing error message (mattermost#5985) (mattermost#6023) PLT-6207: Fix EE policy application. (mattermost#5997) PLT-5905 Fix saml certificates for 3.7 (mattermost#5843) Fix telemetry. (mattermost#5841) Fxing some unit tests PLT-5943 Reduce minimum username length (mattermost#5798) Fix policy application in team edition. (mattermost#5771) PLT-5804 Fix email blue error not showing up (mattermost#5749) Fix permalink in email for DMs/GMs (mattermost#5751) Report correct session for React Native app (mattermost#5734) PLT-5800 Cleaned up duplicated code for adding slack attachments to posts (mattermost#5711) ... # Conflicts: # api/post.go # app/channel.go
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.
This is to keep GitLab SSO working when the SiteURL isn't configured
Checklist