From 5cc1156e7972ff47d2fa7955ce2d8be5ecc30640 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Tue, 20 Jun 2023 08:39:44 +0200
Subject: [PATCH] Small fixes

---
 .../ec/edelivery/smp/ui/internal/DomainAdminController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
index b1c284e7d..7ee93a6f9 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
@@ -117,7 +117,7 @@ public class DomainAdminController {
         return domainRO;
     }
 
-    @PreAuthorize("@smpAuthorizationService.systemAdministrator || @smpAuthorizationService.isCurrentlyLoggedIn(#userId)")
+    @PreAuthorize("@smpAuthorizationService.isCurrentlyLoggedIn(#userId) and @smpAuthorizationService.systemAdministrator")
     @PutMapping(value = "/{user-id}/sml-register/{domain-code}")
     public SMLIntegrationResult registerDomainAndParticipants(@PathVariable("user-id") String userId,
                                                               @PathVariable("domain-code") String domainCode
@@ -136,7 +136,7 @@ public class DomainAdminController {
     }
 
 
-    @PreAuthorize("@smpAuthorizationService.systemAdministrator || @smpAuthorizationService.isCurrentlyLoggedIn(#userId)")
+    @PreAuthorize("@smpAuthorizationService.isCurrentlyLoggedIn(#userId) and @smpAuthorizationService.systemAdministrator")
     @PutMapping(value = "/{user-id}/sml-unregister/{domain-code}")
     public SMLIntegrationResult unregisterDomainAndParticipants(@PathVariable("user-id") String userId,
                                                                 @PathVariable("domain-code") String domainCode) {
-- 
GitLab