revocation
This commit is contained in:
parent
9721c25336
commit
d0b8dfe340
2 changed files with 8 additions and 10 deletions
|
@ -14,6 +14,9 @@ func MarshalJSON(w http.ResponseWriter, i interface{}) {
|
||||||
func MarshalJSONWithStatus(w http.ResponseWriter, i interface{}, status int) {
|
func MarshalJSONWithStatus(w http.ResponseWriter, i interface{}, status int) {
|
||||||
w.Header().Set("content-type", "application/json")
|
w.Header().Set("content-type", "application/json")
|
||||||
w.WriteHeader(status)
|
w.WriteHeader(status)
|
||||||
|
if i == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
err := json.NewEncoder(w).Encode(i)
|
err := json.NewEncoder(w).Encode(i)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
|
@ -37,19 +37,14 @@ func Revoke(w http.ResponseWriter, r *http.Request, revoker Revoker) {
|
||||||
}
|
}
|
||||||
tokenID, subject, ok := getTokenIDAndSubjectForRevocation(r.Context(), revoker, token)
|
tokenID, subject, ok := getTokenIDAndSubjectForRevocation(r.Context(), revoker, token)
|
||||||
if ok {
|
if ok {
|
||||||
err := revoker.Storage().RevokeToken(r.Context(), tokenID, subject, clientID)
|
token = tokenID
|
||||||
if err != nil {
|
}
|
||||||
RevocationRequestError(w, r, err)
|
if err := revoker.Storage().RevokeToken(r.Context(), token, subject, clientID); err != nil {
|
||||||
return
|
RevocationRequestError(w, r, err)
|
||||||
}
|
|
||||||
httphelper.MarshalJSON(w, err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//if tokenID != "" {
|
|
||||||
// token = tokenID
|
|
||||||
//}
|
|
||||||
err = revoker.Storage().RevokeToken(r.Context(), token, subject, clientID)
|
|
||||||
httphelper.MarshalJSON(w, nil)
|
httphelper.MarshalJSON(w, nil)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseTokenRevocationRequest(r *http.Request, revoker Revoker) (token, tokenTypeHint, clientID string, err error) {
|
func ParseTokenRevocationRequest(r *http.Request, revoker Revoker) (token, tokenTypeHint, clientID string, err error) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue