diff options
-rw-r--r-- | config/config.json | 9 | ||||
-rw-r--r-- | docker/dev/config_docker.json | 9 | ||||
-rw-r--r-- | docker/local/config_docker.json | 9 | ||||
-rw-r--r-- | model/google.go | 56 | ||||
-rw-r--r-- | web/react/components/login.jsx | 12 | ||||
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 9 | ||||
-rw-r--r-- | web/react/components/team_signup_choose_auth.jsx | 18 | ||||
-rw-r--r-- | web/react/components/team_signup_with_sso.jsx | 12 | ||||
-rw-r--r-- | web/react/utils/constants.jsx | 1 | ||||
-rw-r--r-- | web/web.go | 6 |
10 files changed, 0 insertions, 141 deletions
diff --git a/config/config.json b/config/config.json index e0f3232ed..e0a13a9eb 100644 --- a/config/config.json +++ b/config/config.json @@ -34,15 +34,6 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" - }, - "google": { - "Allow": false, - "Secret": "", - "Id": "", - "Scope": "email profile", - "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth", - "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token", - "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me" } }, "SqlSettings": { diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index f566cea61..fdcb938b9 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -34,15 +34,6 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" - }, - "google": { - "Allow": false, - "Secret": "", - "Id": "", - "Scope": "email profile", - "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth", - "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token", - "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me" } }, "SqlSettings": { diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index f566cea61..fdcb938b9 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -34,15 +34,6 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" - }, - "google": { - "Allow": false, - "Secret": "", - "Id": "", - "Scope": "email profile", - "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth", - "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token", - "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me" } }, "SqlSettings": { diff --git a/model/google.go b/model/google.go deleted file mode 100644 index bc65d0817..000000000 --- a/model/google.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. -// See License.txt for license information. - -package model - -import ( - "encoding/json" - "io" - "strings" -) - -const ( - USER_AUTH_SERVICE_GOOGLE = "google" -) - -type GoogleUser struct { - Id string `json:"id"` - Nickname string `json:"nickname"` - DisplayName string `json:"displayName"` - Emails []map[string]string `json:"emails"` - Names map[string]string `json:"name"` -} - -func UserFromGoogleUser(gu *GoogleUser) *User { - user := &User{} - user.FirstName = gu.Names["givenName"] - user.LastName = gu.Names["familyName"] - user.Nickname = gu.Nickname - - for _, e := range gu.Emails { - if e["type"] == "account" { - user.Email = e["value"] - user.Username = CleanUsername(strings.Split(user.Email, "@")[0]) - } - } - - user.AuthData = gu.Id - user.AuthService = USER_AUTH_SERVICE_GOOGLE - - return user -} - -func GoogleUserFromJson(data io.Reader) *GoogleUser { - decoder := json.NewDecoder(data) - var gu GoogleUser - err := decoder.Decode(&gu) - if err == nil { - return &gu - } else { - return nil - } -} - -func (gu *GoogleUser) GetAuthData() string { - return gu.Id -} diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 489ff6960..0f3aa42db 100644 --- a/web/react/components/login.jsx +++ b/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'; diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index e5c602c16..2080cc191 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/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 = ( diff --git a/web/react/components/team_signup_choose_auth.jsx b/web/react/components/team_signup_choose_auth.jsx index 2d35785c2..92ade5d24 100644 --- a/web/react/components/team_signup_choose_auth.jsx +++ b/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 diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx index 57996d7cc..6cb62efc7 100644 --- a/web/react/components/team_signup_with_sso.jsx +++ b/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 ( diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 6678790e2..8721ced7c 100644 --- a/web/react/utils/constants.jsx +++ b/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, diff --git a/web/web.go b/web/web.go index 03dbdde6a..c79815a35 100644 --- a/web/web.go +++ b/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 { |