From b305d5b3379ccd73c5e6e035bb8536796dd903ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Mon, 9 Feb 2026 19:21:30 +0400 Subject: [PATCH] Do not error on expired existing child session when assuming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/iam/session_service.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/iam/session_service.go b/pkg/iam/session_service.go index 59e8a5db2..b720c1f2f 100644 --- a/pkg/iam/session_service.go +++ b/pkg/iam/session_service.go @@ -536,11 +536,9 @@ func (s SessionService) AssumeOrganizationSession( // If child session already exists use it if err := childSession.LoadByRootSessionIDAndMembershipID(ctx, tx, rootSession.IdentityID, membership.ID); err == nil { - if childSession.ExpireReason != nil || now.After(childSession.ExpiredAt) { - return NewSessionExpiredError(childSession.ID) + if childSession.ExpireReason == nil && now.Before(childSession.ExpiredAt) { + return nil } - - return nil } else { if err != coredata.ErrResourceNotFound { return fmt.Errorf("cannot load child session: %w", err)