dalu/ginoidc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up logic

Browse Source
This commit is contained in:
Darko Luketic 2021-11-16 15:55:07 +01:00
parent 4d131928ad
commit 448ee700c8
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gin.go
View File

@ -24,12 +24,11 @@ func onError(c *gin.Context, errorHandler options.ErrorHandler, statusCode int,
c.AbortWithStatusJSON(statusCode, gin.H{"error": err.Error()})
}
// toGinHandler creates a gin.HandlerFunc so the stdlib handler can be used as a gin middleware.
func toGinHandler(parseToken oidc.ParseTokenFunc, setters ...options.Option) gin.HandlerFunc {
opts := options.New(setters...)
return func(c *gin.Context) {
var errorTypes []ginerror.Error
ctx := c.Request.Context()
tokenString, err := oidc.GetTokenString(c.Request.Header.Get, opts.TokenString)
@ -38,41 +37,29 @@ func toGinHandler(parseToken oidc.ParseTokenFunc, setters ...options.Option) gin
onError(c, opts.ErrorHandler, http.StatusBadRequest, options.GetTokenErrorDescription, err)
return
} else {
errorTypes = append(errorTypes, ginerror.Error{
c.Set(string(opts.ErrorsContextKeyName), ginerror.Error{
Description: string(options.GetTokenErrorDescription),
Error: err,
})
c.Next()
return
}
}
token, err := parseToken(ctx, tokenString)
if err != nil {
if !opts.Permissive {
onError(c, opts.ErrorHandler, http.StatusUnauthorized, options.ParseTokenErrorDescription, err)
return
} else {
errorTypes = append(errorTypes, ginerror.Error{
Description: string(options.ParseTokenErrorDescription),
Error: err,
})
}
onError(c, opts.ErrorHandler, http.StatusUnauthorized, options.ParseTokenErrorDescription, err)
return
}
tokenClaims, err := token.AsMap(ctx)
if err != nil {
if !opts.Permissive {
onError(c, opts.ErrorHandler, http.StatusUnauthorized, options.ConvertTokenErrorDescription, err)
return
} else {
errorTypes = append(errorTypes, ginerror.Error{
Description: string(options.ConvertTokenErrorDescription),
Error: err,
})
}
onError(c, opts.ErrorHandler, http.StatusUnauthorized, options.ConvertTokenErrorDescription, err)
return
}
c.Set(string(opts.ClaimsContextKeyName), tokenClaims)
c.Set(string(opts.ErrorsContextKeyName), errorTypes)
c.Next()
}