From 58ea075f0fdfa479102c46a35143b5ae89ddc3e8 Mon Sep 17 00:00:00 2001 From: Sacha Al Himdani Date: Tue, 5 Aug 2025 13:04:49 +0200 Subject: [PATCH] Check if token still exist for trust center access Signed-off-by: Sacha Al Himdani --- pkg/server/api/trust/v1/resolver.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkg/server/api/trust/v1/resolver.go b/pkg/server/api/trust/v1/resolver.go index bb27dc47c..12c06375c 100644 --- a/pkg/server/api/trust/v1/resolver.go +++ b/pkg/server/api/trust/v1/resolver.go @@ -205,7 +205,7 @@ func tryTokenAuth(ctx context.Context, w http.ResponseWriter, r *http.Request, t return nil } - payload, err := statelesstoken.ValidateToken[probo.TrustCenterAccessData]( + basicPayload, err := statelesstoken.ValidateToken[probo.TrustCenterAccessData]( trustAuthCfg.TokenSecret, trustAuthCfg.TokenType, cookie.Value, @@ -215,11 +215,18 @@ func tryTokenAuth(ctx context.Context, w http.ResponseWriter, r *http.Request, t return nil } - tenantID := payload.Data.TrustCenterID.TenantID() + tenantID := basicPayload.Data.TrustCenterID.TenantID() + + tenantSvc := trustSvc.WithTenant(tenantID) + payload, err := tenantSvc.TrustCenterAccesses.ValidateToken(ctx, cookie.Value) + if err != nil { + clearTokenCookie(w, trustAuthCfg) + return nil + } tokenAccess := &auth.TokenAccessData{ - TrustCenterID: payload.Data.TrustCenterID, - Email: payload.Data.Email, + TrustCenterID: payload.TrustCenterID, + Email: payload.Email, TenantID: tenantID, Scope: trustAuthCfg.Scope, }