cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

error handling

Browse source
This commit is contained in:
Livio Amstutz 2019-12-02 16:15:59 +01:00
parent d5e1dfff61
commit 89bcd1a0c3
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkg/op/error.go
View file

@ -2,6 +2,7 @@ package op
import (
"net/http"
"net/url"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/utils"
@ -92,20 +93,20 @@ func (e *OAuthError) AuthRequestResponse(w http.ResponseWriter, r *http.Request,
http.Error(w, e.Error(), http.StatusBadRequest)
return
}
url := authReq.GetRedirectURI()
callback := authReq.GetRedirectURI()
if authReq.GetResponseType() == oidc.ResponseTypeCode {
url += "?"
callback += "?"
} else {
url += "#"
callback += "#"
}
url += "error=" + string(e.ErrorType)
callback += "error=" + string(e.ErrorType)
if e.Description != "" {
url += "&error_description=" + e.Description
callback += "&error_description=" + url.QueryEscape(e.Description)
}
if authReq.GetState() != "" {
url += "&state=" + authReq.GetState()
callback += "&state=" + authReq.GetState()
}
http.Redirect(w, r, url, http.StatusFound)
http.Redirect(w, r, callback, http.StatusFound)
}
func (e *OAuthError) Error() string {

14
pkg/rp/default_rp.go
View file

@ -124,12 +124,16 @@ func (p *DefaultRP) CodeExchangeHandler(callback func(http.ResponseWriter, *http
http.Error(w, "failed to get state: "+err.Error(), http.StatusUnauthorized)
return
}
tokens, err := p.CodeExchange(r.Context(), r.URL.Query().Get("code"))
if err != nil {
http.Error(w, "failed to exchange token: "+err.Error(), http.StatusUnauthorized)
return
params := r.URL.Query()
if params.Get("code") != "" {
tokens, err := p.CodeExchange(r.Context(), params.Get("code"))
if err != nil {
http.Error(w, "failed to exchange token: "+err.Error(), http.StatusUnauthorized)
return
}
callback(w, r, tokens, state)
}
callback(w, r, tokens, state)
w.Write([]byte(params.Get("error")))
}
}