Skip to content

feat: log sb-auth-user-id, sb-auth-session-id, ... on sign in not just refresh token #2342

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
cemalkilic merged 1 commit into from
Jan 22, 2026
Merged

feat: log sb-auth-user-id, sb-auth-session-id, ... on sign in not just refresh token #2342

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion internal/api/anonymous.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (a *API) SignupAnonymously(w http.ResponseWriter, r *http.Request) error {
if terr != nil {
return terr
}
token, terr = a.issueRefreshToken(r, tx, newUser, models.Anonymous, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, newUser, models.Anonymous, grantParams)
if terr != nil {
return terr
}
Expand Down
2 changes: 1 addition & 1 deletion internal/api/external.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (a *API) internalExternalProviderCallback(w http.ResponseWriter, r *http.Re
terr = tx.Update(flowState)
} else {
// Implicit flow: issue tokens directly
token, terr = a.issueRefreshToken(r, tx, user, models.OAuth, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.OAuth, grantParams)
if terr == nil && flowState != nil {
terr = tx.Destroy(flowState)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/api/samlacs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ func (a *API) handleSamlAcs(w http.ResponseWriter, r *http.Request) error {
}
}

token, terr = a.issueRefreshToken(r, tx, user, models.SSOSAML, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.SSOSAML, grantParams)

if terr != nil {
return apierrors.NewInternalServerError("Unable to issue refresh token from SAML Assertion").WithInternalError(terr)
Expand Down
2 changes: 1 addition & 1 deletion internal/api/signup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func (a *API) Signup(w http.ResponseWriter, r *http.Request) error {
}); terr != nil {
return terr
}
token, terr = a.issueRefreshToken(r, tx, user, models.PasswordGrant, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.PasswordGrant, grantParams)

if terr != nil {
return terr
Expand Down
4 changes: 2 additions & 2 deletions internal/api/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ func (a *API) generateAccessToken(r *http.Request, tx *storage.Connection, user
})
}

func (a *API) issueRefreshToken(r *http.Request, conn *storage.Connection, user *models.User, authenticationMethod models.AuthenticationMethod, grantParams models.GrantParams) (*tokens.AccessTokenResponse, error) {
return a.tokenService.IssueRefreshToken(r, make(http.Header), conn, user, authenticationMethod, grantParams)
func (a *API) issueRefreshToken(r *http.Request, headers http.Header, conn *storage.Connection, user *models.User, authenticationMethod models.AuthenticationMethod, grantParams models.GrantParams) (*tokens.AccessTokenResponse, error) {
return a.tokenService.IssueRefreshToken(r, headers, conn, user, authenticationMethod, grantParams)
}

func (a *API) updateMFASessionAndClaims(r *http.Request, tx *storage.Connection, user *models.User, authenticationMethod models.AuthenticationMethod, grantParams models.GrantParams) (*tokens.AccessTokenResponse, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/api/token_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func (a *API) IdTokenGrant(ctx context.Context, w http.ResponseWriter, r *http.R
return terr
}

token, terr = a.issueRefreshToken(r, tx, user, models.OAuth, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.OAuth, grantParams)
if terr != nil {
return terr
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func (a *API) verifyGet(w http.ResponseWriter, r *http.Request, params *VerifyPa
}

if isImplicitFlow(flowType) {
token, terr = a.issueRefreshToken(r, tx, user, models.OTP, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.OTP, grantParams)
if terr != nil {
return terr
}
Expand Down Expand Up @@ -282,7 +282,7 @@ func (a *API) verifyPost(w http.ResponseWriter, r *http.Request, params *VerifyP
if terr := tx.Reload(user); terr != nil {
return terr
}
token, terr = a.issueRefreshToken(r, tx, user, models.OTP, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.OTP, grantParams)
if terr != nil {
return terr
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/web3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (a *API) web3GrantSolana(ctx context.Context, w http.ResponseWriter, r *htt
return terr
}

token, terr = a.issueRefreshToken(r, tx, user, models.Web3, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.Web3, grantParams)
if terr != nil {
return terr
}
Expand Down Expand Up @@ -311,7 +311,7 @@ func (a *API) web3GrantEthereum(ctx context.Context, w http.ResponseWriter, r *h
return terr
}

token, terr = a.issueRefreshToken(r, tx, user, models.Web3, grantParams)
token, terr = a.issueRefreshToken(r, w.Header(), tx, user, models.Web3, grantParams)
if terr != nil {
return terr
}
Expand Down