diff options
| author | Corey Hulen <corey@hulen.com> | 2015-08-28 07:33:01 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-08-28 07:33:01 -0700 |
| commit | bdf53884f567a46216fc1b8f3462fd15ab53ae92 (patch) | |
| tree | b747f0911f5e540d6f00354ab72f2e10ef0a9905 /web/web.go | |
| parent | 604166068ea8cd881a1c0a513cea3f992e9a65ea (diff) | |
| parent | 4ea9635b502ed41f541ae27713f7736fdeda0ce7 (diff) | |
| download | chat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.tar.gz chat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.tar.bz2 chat-bdf53884f567a46216fc1b8f3462fd15ab53ae92.zip | |
Merge pull request #514 from mattermost/mm-2039
MM-2039 Remove Google as a SSO service.
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 6 |
1 files changed, 0 insertions, 6 deletions
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 { |