summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorMaxime Buquet <pep+code@bouah.net>2017-07-31 14:31:28 +0200
committerJoram Wilander <jwawilander@gmail.com>2017-07-31 08:31:28 -0400
commitcf32b59e645bbba562485606be7fbc5cd2fede30 (patch)
treea32dbf2e55e2dd4b345eab659ffc201566c5ebf8 /webapp
parent6ec24867bc75057fa58c11e80a6b28334473983b (diff)
downloadchat-cf32b59e645bbba562485606be7fbc5cd2fede30.tar.gz
chat-cf32b59e645bbba562485606be7fbc5cd2fede30.tar.bz2
chat-cf32b59e645bbba562485606be7fbc5cd2fede30.zip
Make login_controller consistent with signup_controller by using Client4.getOAuthRoute (#7033)
* Use Client4.getOAuthUrl instead of making the url by hand with getUrl * Use the correct function name. thanks jwilander
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/login/login_controller.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 3e9869226..e54f2cbfa 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -490,7 +490,7 @@ export default class LoginController extends React.Component {
<a
className='btn btn-custom-login gitlab'
key='gitlab'
- href={Client4.getUrl() + '/oauth/gitlab/login' + this.props.location.search}
+ href={Client4.getOAuthRoute() + '/gitlab/login' + this.props.location.search}
>
<span>
<span className='icon'/>
@@ -510,7 +510,7 @@ export default class LoginController extends React.Component {
<a
className='btn btn-custom-login google'
key='google'
- href={Client4.getUrl() + '/oauth/google/login' + this.props.location.search}
+ href={Client4.getOAuthRoute() + '/google/login' + this.props.location.search}
>
<span>
<span className='icon'/>
@@ -530,7 +530,7 @@ export default class LoginController extends React.Component {
<a
className='btn btn-custom-login office365'
key='office365'
- href={Client4.getUrl() + '/oauth/office365/login' + this.props.location.search}
+ href={Client4.getOAuthRoute() + '/office365/login' + this.props.location.search}
>
<span>
<span className='icon'/>