Skip to content

updating ttl to 14days #9446

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
NamanMahor wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −2
Open

updating ttl to 14days #9446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9619444
updating ttl to 14days
NamanMahor May 14, 2026
2bcc8fd
review comment
NamanMahor May 15, 2026
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: 5 additions & 2 deletions admin/server/auth/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const (
cookieFieldRedirect = "redirect"
cookieFieldCustomDomainFlow = "custom_domain_flow"
cookieFieldAccessToken = "access_token"
browserSessionTTL = 14 * 24 * time.Hour
)

// RegisterEndpoints adds HTTP endpoints for auth.
Expand Down Expand Up @@ -342,7 +343,8 @@ func (a *Authenticator) authLoginCallback(w http.ResponseWriter, r *http.Request
}

// Issue a new persistent auth token
authToken, err := a.admin.IssueUserAuthToken(r.Context(), user.ID, database.AuthClientIDRillWeb, "Browser session", nil, nil, false)
ttl := browserSessionTTL
authToken, err := a.admin.IssueUserAuthToken(r.Context(), user.ID, database.AuthClientIDRillWeb, "Browser session", nil, &ttl, false)
Comment on lines +346 to +347
Copy link
Copy Markdown
Contributor

@begelundmuller begelundmuller May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: redundant variable, can just do &browserSessionTTL directly

Comment on lines +346 to +347
Copy link
Copy Markdown
Contributor

@begelundmuller begelundmuller May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it also needs to integrate with CookieRefreshMiddleware to extend the token's TTL when the token is used. Or something like that – at least we don't want to log people out every 14 days if they are regular users.

(Also, since updating the TTL in the DB is more expensive than updating the cookie, it would need to not do this too often, e.g. only when close to expiration.).

Or do you have a better idea?

if err != nil {
http.Error(w, fmt.Sprintf("failed to issue API token: %s", err), http.StatusInternalServerError)
return
Expand Down Expand Up @@ -405,7 +407,8 @@ func (a *Authenticator) authLoginCustomDomainCallback(w http.ResponseWriter, r *
http.Error(w, err.Error(), http.StatusUnauthorized)
return
}
newAuthToken, err := a.admin.IssueUserAuthToken(r.Context(), validated.OwnerID(), database.AuthClientIDRillWeb, "Browser session", nil, nil, false)
ttl := browserSessionTTL
newAuthToken, err := a.admin.IssueUserAuthToken(r.Context(), validated.OwnerID(), database.AuthClientIDRillWeb, "Browser session", nil, &ttl, false)
if err != nil {
http.Error(w, fmt.Sprintf("failed to issue API token: %s", err), http.StatusInternalServerError)
return
Expand Down
Loading