Move remaining actions over to use redux and v4 endpoints (#6720)

1 files changed, 5 insertions, 8 deletions

diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 212a09bf2..3e9869226 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -11,8 +11,7 @@ import {checkMfa, webLogin} from 'actions/user_actions.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 
-import Client from 'client/web_client.jsx';
-import * as AsyncClient from 'utils/async_client.jsx';
+import {Client4} from 'mattermost-redux/client';
 import * as TextFormatting from 'utils/text_formatting.jsx';
 
 import * as Utils from 'utils/utils.jsx';
@@ -71,8 +70,6 @@ export default class LoginController extends React.Component {
         if (this.props.location.query.extra === Constants.SIGNIN_VERIFIED && this.props.location.query.email) {
             this.refs.password.focus();
         }
-
-        AsyncClient.checkVersion();
     }
 
     preSubmit(e) {
@@ -243,7 +240,7 @@ export default class LoginController extends React.Component {
             return (
                 <div>
                     <img
-                        src={Client.getAdminRoute() + '/get_brand_image'}
+                        src={Client4.getBrandImageUrl(0)}
                     />
                     <p dangerouslySetInnerHTML={{__html: TextFormatting.formatText(text)}}/>
                 </div>
@@ -493,7 +490,7 @@ export default class LoginController extends React.Component {
                 <a
                     className='btn btn-custom-login gitlab'
                     key='gitlab'
-                    href={Client.getOAuthRoute() + '/gitlab/login' + this.props.location.search}
+                    href={Client4.getUrl() + '/oauth/gitlab/login' + this.props.location.search}
                 >
                     <span>
                         <span className='icon'/>
@@ -513,7 +510,7 @@ export default class LoginController extends React.Component {
                 <a
                     className='btn btn-custom-login google'
                     key='google'
-                    href={Client.getOAuthRoute() + '/google/login' + this.props.location.search}
+                    href={Client4.getUrl() + '/oauth/google/login' + this.props.location.search}
                 >
                     <span>
                         <span className='icon'/>
@@ -533,7 +530,7 @@ export default class LoginController extends React.Component {
                 <a
                     className='btn btn-custom-login office365'
                     key='office365'
-                    href={Client.getOAuthRoute() + '/office365/login' + this.props.location.search}
+                    href={Client4.getUrl() + '/oauth/office365/login' + this.props.location.search}
                 >
                     <span>
                         <span className='icon'/>