Merge pull request #514 from mattermost/mm-2039

MM-2039 Remove Google as a SSO service.

web/react/components/login.jsx

@@ -110,18 +110,6 @@ export default class Login extends React.Component {
            );
         }
 
-        if (authServices.indexOf(Constants.GOOGLE_SERVICE) !== -1) {
-            loginMessage.push(
-                    <a
-                        className='btn btn-custom-login google'
-                        href={'/' + teamName + '/login/google'}
-                    >
-                        <span className='icon' />
-                        <span>with Google Apps</span>
-                    </a>
-           );
-        }
-
         var errorClass = '';
         if (serverError) {
             errorClass = ' has-error';

web/react/components/signup_user_complete.jsx

@@ -162,15 +162,6 @@ module.exports = React.createClass({
            );
         }
 
-        if (authServices.indexOf(Constants.GOOGLE_SERVICE) >= 0) {
-            signupMessage.push(
-                    <a className='btn btn-custom-login google' href={'/' + this.props.teamName + '/signup/google' + window.location.search}>
-                        <span className='icon' />
-                        <span>with Google</span>
-                    </a>
-           );
-        }
-
         var emailSignup;
         if (authServices.indexOf(Constants.EMAIL_SERVICE) !== -1) {
             emailSignup = (

web/react/components/team_signup_choose_auth.jsx

@@ -28,24 +28,6 @@ export default class ChooseAuthPage extends React.Component {
             );
         }
 
-        if (this.props.services.indexOf(Constants.GOOGLE_SERVICE) !== -1) {
-            buttons.push(
-                    <a
-                        className='btn btn-custom-login google btn-full'
-                        href='#'
-                        onClick={
-                            function clickGoogle(e) {
-                                e.preventDefault();
-                                this.props.updatePage('service', Constants.GOOGLE_SERVICE);
-                            }.bind(this)
-                        }
-                        >
-                        <span className='icon' />
-                        <span>Create new {strings.Team} with Google Apps Account</span>
-                    </a>
-            );
-        }
-
         if (this.props.services.indexOf(Constants.EMAIL_SERVICE) !== -1) {
             buttons.push(
                     <a

web/react/components/team_signup_with_sso.jsx

@@ -86,18 +86,6 @@ export default class SSOSignUpPage extends React.Component {
                     <span>Create {strings.Team} with GitLab Account</span>
                 </a>
             );
-        } else if (this.props.service === Constants.GOOGLE_SERVICE) {
-            button = (
-                <a
-                    className='btn btn-custom-login google btn-full'
-                    href='#'
-                    onClick={this.handleSubmit}
-                    disabled={disabled}
-                >
-                    <span className='icon'/>
-                    <span>Create {strings.Team} with Google Apps Account</span>
-                </a>
-            );
         }
 
         return (

web/react/utils/constants.jsx

@@ -60,7 +60,6 @@ module.exports = {
   DEFAULT_CHANNEL: 'town-square',
   OFFTOPIC_CHANNEL: 'off-topic',
   GITLAB_SERVICE: 'gitlab',
-  GOOGLE_SERVICE: 'google',
   EMAIL_SERVICE: 'email',
   POST_CHUNK_SIZE: 60,
   MAX_POST_CHUNKS: 3,

web/web.go

@@ -521,9 +521,6 @@ func signupCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request)
 		if service == model.USER_AUTH_SERVICE_GITLAB {
 			glu := model.GitLabUserFromJson(body)
 			user = model.UserFromGitLabUser(glu)
-		} else if service == model.USER_AUTH_SERVICE_GOOGLE {
-			gu := model.GoogleUserFromJson(body)
-			user = model.UserFromGoogleUser(gu)
 		}
 
 		if user == nil {
@@ -620,9 +617,6 @@ func loginCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request)
 		if service == model.USER_AUTH_SERVICE_GITLAB {
 			glu := model.GitLabUserFromJson(body)
 			authData = glu.GetAuthData()
-		} else if service == model.USER_AUTH_SERVICE_GOOGLE {
-			gu := model.GoogleUserFromJson(body)
-			authData = gu.GetAuthData()
 		}
 
 		if len(authData) == 0 {