Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(oauth): add debug logs

pull/2749/head
Chaim Lev Ari 2018-12-30 18:25:30 +02:00
parent 241a701eca
commit 2ee6f2780b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/auth/authenticate.go
View File

@ -111,11 +111,13 @@ func (handler *Handler) authenticateOAuth(w http.ResponseWriter, r *http.Request
token, err := handler.OAuthService.GetAccessToken(payload.Code, &settings.OAuthSettings)
if err != nil {
log.Printf("[DEBUG] - Failed retrieving access token: %v", err)
return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid access token", portainer.ErrUnauthorized}
}
username, err := handler.OAuthService.GetUsername(token, &settings.OAuthSettings)
if err != nil {
log.Printf("[DEBUG] - Failed acquiring username: %v", err)
return &httperror.HandlerError{http.StatusForbidden, "Unable to acquire username", portainer.ErrUnauthorized}
}

3
api/oauth/oauth.go
View File

@ -51,7 +51,6 @@ func (*Service) GetAccessToken(code string, settings *portainer.OAuthSettings) (
}
if r.StatusCode != http.StatusOK {
log.Printf("[Error] - request returned with bad status code %v, body is %v", r.StatusCode, string(body))
type ErrorMessage struct {
Message string
Type string
@ -157,7 +156,7 @@ func (*Service) GetUsername(token string, settings *portainer.OAuthSettings) (st
if !ok {
username, ok := datamap[settings.UserIdentifier].(float64)
if ok {
if ok && username != 0 {
return fmt.Sprint(int(username)), nil
}
}