diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:54:02 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:54:02 -0400 |
commit | 8362d3ac0b3e59fa7747544f3ed21be3a1bd26fd (patch) | |
tree | c943a53bd8373d52890d648c65786892939f71f5 /webapp | |
parent | 84f9c018e5e990676e45572ea4dcdd08ffa73f1d (diff) | |
parent | de2f7f4e529e697c07bb786bd099683d746044d2 (diff) | |
download | chat-8362d3ac0b3e59fa7747544f3ed21be3a1bd26fd.tar.gz chat-8362d3ac0b3e59fa7747544f3ed21be3a1bd26fd.tar.bz2 chat-8362d3ac0b3e59fa7747544f3ed21be3a1bd26fd.zip |
Merge pull request #2537 from mattermost/oauth-fix
Fix OAuth routes and link issues
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/login.jsx | 12 | ||||
-rw-r--r-- | webapp/components/signup_user_complete.jsx | 12 | ||||
-rw-r--r-- | webapp/components/team_signup_with_sso.jsx | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/webapp/components/login.jsx b/webapp/components/login.jsx index e8180895d..ff9cd74a8 100644 --- a/webapp/components/login.jsx +++ b/webapp/components/login.jsx @@ -60,10 +60,10 @@ export default class Login extends React.Component { let loginMessage = []; if (global.window.mm_config.EnableSignUpWithGitLab === 'true') { loginMessage.push( - <Link + <a className='btn btn-custom-login gitlab' key='gitlab' - to={'/api/v1/oauth/gitlab/login?team=' + encodeURIComponent(teamName)} + href={'/api/v1/oauth/gitlab/login?team=' + encodeURIComponent(teamName)} > <span className='icon'/> <span> @@ -72,16 +72,16 @@ export default class Login extends React.Component { defaultMessage='with GitLab' /> </span> - </Link> + </a> ); } if (global.window.mm_config.EnableSignUpWithGoogle === 'true') { loginMessage.push( - <Link + <a className='btn btn-custom-login google' key='google' - to={'/api/v1/oauth/google/login?team=' + encodeURIComponent(teamName)} + href={'/api/v1/oauth/google/login?team=' + encodeURIComponent(teamName)} > <span className='icon'/> <span> @@ -90,7 +90,7 @@ export default class Login extends React.Component { defaultMessage='with Google Apps' /> </span> - </Link> + </a> ); } diff --git a/webapp/components/signup_user_complete.jsx b/webapp/components/signup_user_complete.jsx index 5460daf29..78ab1bd8c 100644 --- a/webapp/components/signup_user_complete.jsx +++ b/webapp/components/signup_user_complete.jsx @@ -317,10 +317,10 @@ class SignupUserComplete extends React.Component { var signupMessage = []; if (global.window.mm_config.EnableSignUpWithGitLab === 'true') { signupMessage.push( - <Link + <a className='btn btn-custom-login gitlab' key='gitlab' - to={'/api/v1/oauth/gitlab/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)} + href={'/api/v1/oauth/gitlab/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)} > <span className='icon'/> <span> @@ -329,16 +329,16 @@ class SignupUserComplete extends React.Component { defaultMessage='with GitLab' /> </span> - </Link> + </a> ); } if (global.window.mm_config.EnableSignUpWithGoogle === 'true') { signupMessage.push( - <Link + <a className='btn btn-custom-login google' key='google' - to={'/api/v1/oauth/google/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)} + href={'/api/v1/oauth/google/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)} > <span className='icon'/> <span> @@ -347,7 +347,7 @@ class SignupUserComplete extends React.Component { defaultMessage='with Google' /> </span> - </Link> + </a> ); } diff --git a/webapp/components/team_signup_with_sso.jsx b/webapp/components/team_signup_with_sso.jsx index 9a46b2d6b..78396eea8 100644 --- a/webapp/components/team_signup_with_sso.jsx +++ b/webapp/components/team_signup_with_sso.jsx @@ -64,7 +64,7 @@ class SSOSignUpPage extends React.Component { this.props.service, (data) => { if (data.follow_link) { - browserHistory.push(data.follow_link); + window.location.href = data.follow_link; } else { browserHistory.push('/' + team.name + '/channels/town-square'); } |