From 402d8b940fbed3dce9c7e33aee99d32f8f9147e0 Mon Sep 17 00:00:00 2001 From: Trong Huu Nguyen Date: Fri, 17 Jun 2022 11:17:08 +0200 Subject: [PATCH] refactor: use expiry in token response instead of jwt claim --- pkg/router/session.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/router/session.go b/pkg/router/session.go index 4dafc55..e20fe2b 100644 --- a/pkg/router/session.go +++ b/pkg/router/session.go @@ -66,10 +66,10 @@ func (h *Handler) getSession(ctx context.Context, sessionID string) (*session.Da return sessionData, nil } -func (h *Handler) getSessionLifetime(accessToken *jwt.AccessToken) time.Duration { +func (h *Handler) getSessionLifetime(tokenExpiry time.Time) time.Duration { defaultSessionLifetime := h.Config.SessionMaxLifetime - tokenDuration := accessToken.GetExpiration().Sub(time.Now()) + tokenDuration := tokenExpiry.Sub(time.Now()) if tokenDuration <= defaultSessionLifetime { return tokenDuration @@ -84,7 +84,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request, tokens * return fmt.Errorf("generating session ID: %w", err) } - sessionLifetime := h.getSessionLifetime(tokens.AccessToken) + sessionLifetime := h.getSessionLifetime(rawTokens.Expiry) opts := h.CookieOptions.WithExpiresIn(sessionLifetime) sessionID := h.localSessionID(externalSessionID)