diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 10:03:11 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 10:03:11 -0400 |
| commit | d73aae9b27204e224db0a0ca62ce4fbf7f2af31f (patch) | |
| tree | 848be2171e52d4bd10da7f1ed71c8ee7837452fc | |
| parent | cb079aff4937c906c942fad047a4bcfd7e3a0738 (diff) | |
| parent | 7284d8628ac7fdca3b7ed2f3e4479aefd992d507 (diff) | |
| download | chat-d73aae9b27204e224db0a0ca62ce4fbf7f2af31f.tar.gz chat-d73aae9b27204e224db0a0ca62ce4fbf7f2af31f.tar.bz2 chat-d73aae9b27204e224db0a0ca62ce4fbf7f2af31f.zip | |
Merge pull request #850 from mattermost/sso-fix
Fixing some SSO error messages.
| -rw-r--r-- | api/user.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index 9718d534e..4240a795e 100644 --- a/api/user.go +++ b/api/user.go @@ -1420,7 +1420,7 @@ func GetAuthorizationCode(c *Context, w http.ResponseWriter, r *http.Request, te func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser, *model.Team, *model.AppError) { sso := utils.Cfg.GetSSOService(service) - if sso != nil && !sso.Enable { + if sso == nil || !sso.Enable { return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Unsupported OAuth service provider", "service="+service) } @@ -1462,6 +1462,9 @@ func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Token request failed", err.Error()) } else { ar = model.AccessResponseFromJson(resp.Body) + if ar == nil { + return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Bad response from token request", "") + } } if strings.ToLower(ar.TokenType) != model.ACCESS_TOKEN_TYPE { |