fix: set token ttl correctly in redis

Author: Panaetius

internal/sessions/session_maker.go

@@ -32,9 +32,9 @@ func (sm *SessionMakerImpl) NewSession() (models.Session, error) {
 	if session.IdleTTL() == time.Duration(0) {
 		session.ExpiresAt = time.Time{}
 	} else if session.MaxTTL() == time.Duration(0) {
-		session.ExpiresAt = session.CreatedAt.Add(session.MaxTTL())
-	} else {
 		session.ExpiresAt = session.CreatedAt.Add(session.IdleTTL())
+	} else {
+		session.ExpiresAt = session.CreatedAt.Add(session.MaxTTL())
 	}
 	slog.Info("NEW SESSION", "session", session)
 	return session, nil

internal/sessions/token_handling.go

@@ -1,6 +1,7 @@
 package sessions
 
 import (
+	"log/slog"
 	"time"
 
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/gwerrors"
@@ -135,11 +136,12 @@ func (sessions *SessionStore) SaveTokens(c echo.Context, session *models.Session
 		session.TokenIDs = models.SerializableMap{}
 	}
 	session.TokenIDs[providerID] = tokens.AccessToken.ID
-	expiresAt := sessions.getTokenStorageExpiration(tokens, *session)
+	expiresAt := sessions.getTokenStorageExpiration(*session)
 	err = sessions.tokenStore.SetAccessToken(c.Request().Context(), tokens.AccessToken)
 	if err != nil {
 		return err
 	}
+	slog.Info("setting expiry for access token", "provider", providerID, "expiresAt", expiresAt, "maxTTL", session.MaxTTL(), "createdAt", session.CreatedAt, "maxTTLS", session.MaxTTLSeconds)
 	err = sessions.tokenStore.SetAccessTokenExpiry(c.Request().Context(), tokens.AccessToken, expiresAt)
 	if err != nil {
 		return err
@@ -148,6 +150,7 @@ func (sessions *SessionStore) SaveTokens(c echo.Context, session *models.Session
 	if err != nil {
 		return err
 	}
+	slog.Info("setting expiry for refresh token", "provider", providerID, "expiresAt", expiresAt, "maxTTL", session.MaxTTL(), "createdAt", session.CreatedAt)
 	err = sessions.tokenStore.SetRefreshTokenExpiry(c.Request().Context(), tokens.RefreshToken, expiresAt)
 	if err != nil {
 		return err
@@ -156,6 +159,7 @@ func (sessions *SessionStore) SaveTokens(c echo.Context, session *models.Session
 	if err != nil {
 		return err
 	}
+	slog.Info("setting expiry for id token", "provider", providerID, "expiresAt", expiresAt, "maxTTL", session.MaxTTL(), "createdAt", session.CreatedAt)
 	err = sessions.tokenStore.SetIDTokenExpiry(c.Request().Context(), tokens.IDToken, expiresAt)
 	if err != nil {
 		return err
@@ -175,11 +179,6 @@ func (*SessionStore) idTokenKey(tokenID string) string {
 	return IDTokenCtxKey + ":" + tokenID
 }
 
-// getTokenStorageExpiration returns the max session expiration unless the provider is Renku or GitLab, in which case there is no expiration
-func (*SessionStore) getTokenStorageExpiration(tokens models.AuthTokenSet, session models.Session) time.Time {
-	providerID := tokens.AccessToken.ProviderID
-	if providerID == "renku" || providerID == "gitlab" {
-		return time.Time{}
-	}
+func (*SessionStore) getTokenStorageExpiration(session models.Session) time.Time {
 	return session.CreatedAt.Add(session.MaxTTL())
 }