From d1b7f1d70e7e1e44d97b3e5df6cc26ce5aaeb681 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Mon, 15 Apr 2024 09:04:21 +0300 Subject: [PATCH] Fixed SecurityContextSwitch method name (#1716) Signed-off-by: Marinov Avgustin --- .../repository/jpa/management/SystemManagementTest.java | 2 +- .../repository/test/util/SecurityContextSwitch.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java index 708e2f392..5501c345e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java @@ -133,7 +133,7 @@ public class SystemManagementTest extends AbstractJpaIntegrationTest { for (int i = 0; i < tenants; i++) { final String tenantname = "tenant" + i; - SecurityContextSwitch.runAs(SecurityContextSwitch.withUserAndTenantAllSpPermissions("bumlux", tenantname, true, true, false, + SecurityContextSwitch.runAs(SecurityContextSwitch.withUserAndTenant("bumlux", tenantname, true, true, false, SpringEvalExpressions.SYSTEM_ROLE), () -> { systemManagement.getTenantMetadata(); if (artifactSize > 0) { diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java index 2122bd15a..032e57ba9 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java @@ -64,18 +64,18 @@ public class SecurityContextSwitch { } public static WithUser withController(final String principal, final String... authorities) { - return withUserAndTenantAllSpPermissions(principal, DEFAULT_TENANT, true, false, true, authorities); + return withUserAndTenant(principal, DEFAULT_TENANT, true, false, true, authorities); } public static WithUser withUser(final String principal, final String... authorities) { - return withUserAndTenantAllSpPermissions(principal, DEFAULT_TENANT, true, false, false, authorities); + return withUserAndTenant(principal, DEFAULT_TENANT, true, false, false, authorities); } public static WithUser withUserAndTenantAllSpPermissions(final String principal, final String tenant) { - return withUserAndTenantAllSpPermissions(principal, tenant, true, true, false); + return withUserAndTenant(principal, tenant, true, true, false); } - public static WithUser withUserAndTenantAllSpPermissions(final String principal, final String tenant, + public static WithUser withUserAndTenant(final String principal, final String tenant, final boolean autoCreateTenant, final boolean allSpPermission, final boolean controller, final String... authorities) { return createWithUser(principal, tenant, autoCreateTenant, allSpPermission, controller, authorities);