diff --git a/internal/api/authz/context.go b/internal/api/authz/context.go index 13eedcb08..ec6ff08c3 100644 --- a/internal/api/authz/context.go +++ b/internal/api/authz/context.go @@ -34,10 +34,13 @@ type Grant struct { } func VerifyTokenAndWriteCtxData(ctx context.Context, token, orgID string, t *TokenVerifier, method string) (_ context.Context, err error) { - err = t.ExistsOrg(ctx, orgID) - if err != nil { - return nil, errors.ThrowPermissionDenied(nil, "AUTH-Bs7Ds", "Organisation doesn't exist") + if orgID != "" { + err = t.ExistsOrg(ctx, orgID) + if err != nil { + return nil, errors.ThrowPermissionDenied(nil, "AUTH-Bs7Ds", "Organisation doesn't exist") + } } + userID, clientID, agentID, err := verifyAccessToken(ctx, token, t, method) if err != nil { return nil, err