Skip to content

Allow overriding username claim name #11

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

Open
singhman13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow overriding username claim name #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions auth_jwt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ type JWTMiddleware struct {
// Secret key used for signing. Required.
Key []byte

// UsernameClaimName identifies the payload claim which contains the username.
// Optional, default is 'id'
UsernameClaimName string

// Duration that a jwt token is valid. Optional, defaults to one hour.
Timeout time.Duration

Expand Down Expand Up @@ -67,6 +71,9 @@ func (mw *JWTMiddleware) MiddlewareFunc(handler rest.HandlerFunc) rest.HandlerFu
if mw.Key == nil {
log.Fatal("Key required")
}
if mw.UsernameClaimName == "" {
mw.UsernameClaimName = "id"
}
if mw.Timeout == 0 {
mw.Timeout = time.Hour
}
Expand All @@ -90,7 +97,7 @@ func (mw *JWTMiddleware) middlewareImpl(writer rest.ResponseWriter, request *res
return
}

id := token.Claims["id"].(string)
id := token.Claims[mw.UsernameClaimName].(string)

request.Env["REMOTE_USER"] = id
request.Env["JWT_PAYLOAD"] = token.Claims
Expand Down Expand Up @@ -147,7 +154,7 @@ func (mw *JWTMiddleware) LoginHandler(writer rest.ResponseWriter, request *rest.
}
}

token.Claims["id"] = loginVals.Username
token.Claims[mw.UsernameClaimName] = loginVals.Username
token.Claims["exp"] = time.Now().Add(mw.Timeout).Unix()
if mw.MaxRefresh != 0 {
token.Claims["orig_iat"] = time.Now().Unix()
Expand Down Expand Up @@ -207,7 +214,7 @@ func (mw *JWTMiddleware) RefreshHandler(writer rest.ResponseWriter, request *res
newToken.Claims[key] = token.Claims[key]
}

newToken.Claims["id"] = token.Claims["id"]
newToken.Claims[mw.UsernameClaimName] = token.Claims[mw.UsernameClaimName]
newToken.Claims["exp"] = time.Now().Add(mw.Timeout).Unix()
newToken.Claims["orig_iat"] = origIat
tokenString, err := newToken.SignedString(mw.Key)
Expand Down