From b63ded1b2bdd61a2f2f0a7ae92e732d61d25b812 Mon Sep 17 00:00:00 2001
From: Stanislav Trailov <stanislav.trailov@bosch.io>
Date: Fri, 24 Apr 2026 16:20:53 +0300
Subject: [PATCH] Use AccessContext.actor() in getApprovalUser in default
 rollout approval strategy (#3036)

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>
---
 .../hawkbit/repository/jpa/DefaultRolloutApprovalStrategy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/DefaultRolloutApprovalStrategy.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/DefaultRolloutApprovalStrategy.java
index 6a91f10bd..334984fb5 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/DefaultRolloutApprovalStrategy.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/DefaultRolloutApprovalStrategy.java
@@ -14,6 +14,7 @@ import java.util.Optional;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.eclipse.hawkbit.auth.SpPermission;
+import org.eclipse.hawkbit.context.AccessContext;
 import org.eclipse.hawkbit.repository.RolloutApprovalStrategy;
 import org.eclipse.hawkbit.repository.helper.TenantConfigHelper;
 import org.eclipse.hawkbit.repository.model.Rollout;
@@ -47,7 +48,7 @@ public class DefaultRolloutApprovalStrategy implements RolloutApprovalStrategy {
 
     @Override
     public String getApprovalUser(final Rollout rollout) {
-        return getCurrentAuthentication().map(Authentication::getName).orElse(null);
+        return AccessContext.actor();
     }
 
     private static Optional<Authentication> getCurrentAuthentication() {