Skip to content

Commit

Permalink
feat: add username to session JWT and public session API responses
Browse files Browse the repository at this point in the history
  • Loading branch information
lfleischmann authored Jan 30, 2025
1 parent 79ba30f commit 7010db9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
7 changes: 7 additions & 0 deletions backend/dto/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ type Claims struct {
Audience []string `json:"audience,omitempty"`
Issuer *string `json:"issuer,omitempty"`
Email *EmailJwt `json:"email,omitempty"`
Username *string `json:"username,omitempty"`
SessionID uuid.UUID `json:"session_id"`
}

Expand Down Expand Up @@ -109,6 +110,12 @@ func GetClaimsFromToken(token jwt.Token) (*Claims, error) {
}
}

if username, valid := token.Get("username"); valid {
if usernameStr, validStr := username.(string); validStr {
claims.Username = &usernameStr
}
}

claims.Expiration = token.Expiration()

return claims, nil
Expand Down
8 changes: 7 additions & 1 deletion backend/flow_api/flow/shared/hook_issue_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/teamhanko/hanko/backend/dto"
"github.com/teamhanko/hanko/backend/flowpilot"
"github.com/teamhanko/hanko/backend/persistence/models"
"github.com/teamhanko/hanko/backend/session"
"time"
)

Expand Down Expand Up @@ -40,7 +41,12 @@ func (h IssueSession) Execute(c flowpilot.HookExecutionContext) error {
emailDTO = dto.JwtFromEmailModel(email)
}

signedSessionToken, rawToken, err := deps.SessionManager.GenerateJWT(userId, emailDTO)
var generateJWTOptions []session.JWTOptions
if userModel.Username != nil {
generateJWTOptions = append(generateJWTOptions, session.WithValue("username", userModel.Username.Username))
}

signedSessionToken, rawToken, err := deps.SessionManager.GenerateJWT(userId, emailDTO, generateJWTOptions...)
if err != nil {
return fmt.Errorf("failed to generate JWT: %w", err)
}
Expand Down

0 comments on commit 7010db9

Please sign in to comment.