Skip to content
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

feat: add username to session JWT and public session API responses #2036

Merged
merged 2 commits into from
Jan 30, 2025
Merged

feat: add username to session JWT and public session API responses #2036

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
000502c
feat: add username to session JWT and public session API responses
lfleischmann Jan 22, 2025
b21dbe7
fix: make username field in claims struct nilable
lfleischmann Jan 30, 2025
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
7 changes: 7 additions & 0 deletions backend/dto/session.go
View file
Open in desktop
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
View file
Open in desktop
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
Loading