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

revocation

Browse source
This commit is contained in:
Livio Amstutz 2021-10-28 07:40:06 +02:00
parent 9721c25336
commit d0b8dfe340
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/http/marshal.go
View file

@ -14,6 +14,9 @@ func MarshalJSON(w http.ResponseWriter, i interface{}) {
func MarshalJSONWithStatus(w http.ResponseWriter, i interface{}, status int) {
w.Header().Set("content-type", "application/json")
w.WriteHeader(status)
if i == nil {
return
}
err := json.NewEncoder(w).Encode(i)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)

15
pkg/op/token_revocation.go
View file

@ -37,19 +37,14 @@ func Revoke(w http.ResponseWriter, r *http.Request, revoker Revoker) {
}
tokenID, subject, ok := getTokenIDAndSubjectForRevocation(r.Context(), revoker, token)
if ok {
err := revoker.Storage().RevokeToken(r.Context(), tokenID, subject, clientID)
if err != nil {
RevocationRequestError(w, r, err)
return
}
httphelper.MarshalJSON(w, err)
token = tokenID
}
if err := revoker.Storage().RevokeToken(r.Context(), token, subject, clientID); err != nil {
RevocationRequestError(w, r, err)
return
}
//if tokenID != "" {
// token = tokenID
//}
err = revoker.Storage().RevokeToken(r.Context(), token, subject, clientID)
httphelper.MarshalJSON(w, nil)
return
}
func ParseTokenRevocationRequest(r *http.Request, revoker Revoker) (token, tokenTypeHint, clientID string, err error) {