From 349185c8ea495817553e8a7dc07d545f472ca749 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 17 Nov 2023 10:56:04 +0100
Subject: [PATCH] Update controllers
---
smp-server-library/pom.xml | 19 -------------------
.../smp/ui/internal/AlertController.java | 3 +++
.../smp/ui/internal/PropertyController.java | 3 ++-
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 27898b246..6f576d4bd 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -229,25 +229,6 @@
<filtering>true</filtering>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.jks</exclude>
- <exclude>**/*.crt</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- <!-- With filtering=true Maven was introducing changes in keystore binary files [sic!] -->
- <includes>
- <include>**/*.jks</include>
- <include>**/*.crt</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
index d69b03ba5..eb5835554 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
@@ -3,9 +3,11 @@ package eu.europa.ec.edelivery.smp.ui.internal;
import eu.europa.ec.edelivery.smp.data.ui.AlertRO;
import eu.europa.ec.edelivery.smp.data.ui.ServiceResult;
+import eu.europa.ec.edelivery.smp.data.ui.auth.SMPAuthority;
import eu.europa.ec.edelivery.smp.logging.SMPLogger;
import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
import eu.europa.ec.edelivery.smp.services.ui.UIAlertService;
+import org.springframework.security.access.annotation.Secured;
import org.springframework.util.MimeTypeUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +33,7 @@ public class AlertController {
}
@GetMapping(produces = {MimeTypeUtils.APPLICATION_JSON_VALUE})
+ @Secured({SMPAuthority.S_AUTHORITY_TOKEN_SYSTEM_ADMIN})
public ServiceResult<AlertRO> geDomainList(
@RequestParam(value = PARAM_PAGINATION_PAGE, defaultValue = "0") int page,
@RequestParam(value = PARAM_PAGINATION_PAGE_SIZE, defaultValue = "10") int pageSize,
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
index 657efc21d..3b616fbb0 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
@@ -36,7 +36,8 @@ public class PropertyController {
}
@GetMapping(produces = {MimeTypeUtils.APPLICATION_JSON_VALUE})
- public ServiceResult<PropertyRO> gePropertyList(
+ @Secured({SMPAuthority.S_AUTHORITY_TOKEN_SYSTEM_ADMIN})
+ public ServiceResult<PropertyRO> getPropertyList(
@RequestParam(value = PARAM_PAGINATION_PAGE, defaultValue = "0") int page,
@RequestParam(value = PARAM_PAGINATION_PAGE_SIZE, defaultValue = "10") int pageSize,
@RequestParam(value = PARAM_PAGINATION_ORDER_BY, required = false) String orderBy,
--
GitLab