Skip to content

fix(router): establish claims before user on logout #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ecrupper merged 2 commits into from
May 22, 2023
+3 −3
Merged

fix(router): establish claims before user on logout #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
509e9d3
fix(router): establish claims before user on logout
ecrupper May 22, 2023
17290b3
add a basic nil check in user establish
ecrupper May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions router/middleware/user/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ func Establish() gin.HandlerFunc {
return func(c *gin.Context) {
cl := claims.Retrieve(c)

// if token is not a user token, establish empty user to better handle nil checks
if !strings.EqualFold(cl.TokenType, constants.UserAccessTokenType) {
// if token is not a user token or claims were not retrieved, establish empty user to better handle nil checks
if cl == nil || !strings.EqualFold(cl.TokenType, constants.UserAccessTokenType) {
u := new(library.User)

ToContext(c, u)
Expand Down
2 changes: 1 addition & 1 deletion router/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func Load(options ...gin.HandlerFunc) *gin.Engine {
r.GET("/login", auth.Login)

// Logout endpoint
r.GET("/logout", user.Establish(), auth.Logout)
r.GET("/logout", claims.Establish(), user.Establish(), auth.Logout)

// Refresh Access Token endpoint
r.GET("/token-refresh", auth.RefreshAccessToken)
Expand Down