Use AccessContext.actor() in getApprovalUser in default rollout approval strategy (#3036)
Signed-off-by: strailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
committed by
GitHub
parent
160576baac
commit
b63ded1b2b
@@ -14,6 +14,7 @@ import java.util.Optional;
|
|||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.eclipse.hawkbit.auth.SpPermission;
|
import org.eclipse.hawkbit.auth.SpPermission;
|
||||||
|
import org.eclipse.hawkbit.context.AccessContext;
|
||||||
import org.eclipse.hawkbit.repository.RolloutApprovalStrategy;
|
import org.eclipse.hawkbit.repository.RolloutApprovalStrategy;
|
||||||
import org.eclipse.hawkbit.repository.helper.TenantConfigHelper;
|
import org.eclipse.hawkbit.repository.helper.TenantConfigHelper;
|
||||||
import org.eclipse.hawkbit.repository.model.Rollout;
|
import org.eclipse.hawkbit.repository.model.Rollout;
|
||||||
@@ -47,7 +48,7 @@ public class DefaultRolloutApprovalStrategy implements RolloutApprovalStrategy {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getApprovalUser(final Rollout rollout) {
|
public String getApprovalUser(final Rollout rollout) {
|
||||||
return getCurrentAuthentication().map(Authentication::getName).orElse(null);
|
return AccessContext.actor();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Optional<Authentication> getCurrentAuthentication() {
|
private static Optional<Authentication> getCurrentAuthentication() {
|
||||||
|
|||||||
Reference in New Issue
Block a user