diff --git a/dina-base-api/src/main/java/ca/gc/aafc/dina/config/DevSettings.java b/dina-base-api/src/main/java/ca/gc/aafc/dina/config/DevSettings.java index c132340e..2bc9518d 100644 --- a/dina-base-api/src/main/java/ca/gc/aafc/dina/config/DevSettings.java +++ b/dina-base-api/src/main/java/ca/gc/aafc/dina/config/DevSettings.java @@ -44,7 +44,7 @@ public Map> getRolesPerGroup() { return groupDinaRole; } - private Set getAdminRoles() { + public Set getAdminRoles() { if (adminRole == null || adminRole.isEmpty()) { return Set.of(); } diff --git a/dina-base-api/src/main/java/ca/gc/aafc/dina/security/DevUserConfig.java b/dina-base-api/src/main/java/ca/gc/aafc/dina/security/DevUserConfig.java index 5eea7431..fcb608e1 100644 --- a/dina-base-api/src/main/java/ca/gc/aafc/dina/security/DevUserConfig.java +++ b/dina-base-api/src/main/java/ca/gc/aafc/dina/security/DevUserConfig.java @@ -6,6 +6,7 @@ import java.util.Set; import lombok.Getter; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; @@ -64,6 +65,10 @@ public DinaAuthenticatedUser currentUser() { authenticatedUserBuilder.rolesPerGroup(Map.of("dev-group", Set.of(DinaRole.USER))); } + if (CollectionUtils.isNotEmpty(devSettings.getAdminRoles())) { + authenticatedUserBuilder.adminRoles(devSettings.getAdminRoles()); + } + return authenticatedUserBuilder.build(); }