summaryrefslogtreecommitdiffstats
path: root/web/react/components/signup_user_oauth.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-18 08:47:35 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-18 08:47:35 -0400
commit2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218 (patch)
tree1de5578c9050a33635960fc046fdf97339254be0 /web/react/components/signup_user_oauth.jsx
parent96d1eb1c800a427e31e63970e57d0824a3bc91e3 (diff)
parenta7f09be9783f3354ab38d4fb4fb82085241d018f (diff)
downloadchat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.gz
chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.bz2
chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.zip
Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
Diffstat (limited to 'web/react/components/signup_user_oauth.jsx')
-rw-r--r--web/react/components/signup_user_oauth.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/signup_user_oauth.jsx b/web/react/components/signup_user_oauth.jsx
index 6322aedee..8b2800bde 100644
--- a/web/react/components/signup_user_oauth.jsx
+++ b/web/react/components/signup_user_oauth.jsx
@@ -33,7 +33,10 @@ module.exports = React.createClass({
client.createUser(user, "", "",
function(data) {
client.track('signup', 'signup_user_oauth_02');
- window.location.href = '/' + this.props.teamName + '/login/'+user.auth_service;
+ UserStore.setCurrentUser(data);
+ UserStore.setLastEmail(data.email);
+
+ window.location.href = '/' + this.props.teamName + '/login/' + user.auth_service + '?login_hint=' + user.email;
}.bind(this),
function(err) {
this.state.server_error = err.message;