From c798307a2e5b9c9d102fb57a467341926bb5ef6f Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Thu, 29 Jun 2023 11:50:19 +0200
Subject: [PATCH] fix gitlab failed plans
---
.../ec/edelivery/smp/conversion/DBUserToUserROConverter.java | 3 ---
.../smp/ui/external/UserResourceIntegrationTest.java | 4 ++--
.../ui/internal/TruststoreAdminResourceIntegrationTest.java | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
index 9109f5abb..6d978c745 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
@@ -48,9 +48,6 @@ public class DBUserToUserROConverter implements Converter<DBUser, UserRO> {
if (!credentials.isEmpty()) {
// expected only one username/password
DBCredential credential = credentials.get(0);
- target.setPasswordExpired(credential.getExpireOn() == null || OffsetDateTime.now().isAfter(credential.getExpireOn()));
-
-
target.setPasswordUpdatedOn(credential.getChangedOn());
target.setPasswordExpireOn(credential.getExpireOn());
target.setPasswordExpired(isCredentialExpired(credential));
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
index f88ad1bff..c51451d93 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
@@ -66,7 +66,7 @@ public class UserResourceIntegrationTest {
@Test
public void testUpdateCurrentUserOK() throws Exception {
// login
- MockHttpSession session = loginWithUserGroupAdmin(mvc);
+ MockHttpSession session = loginWithSystemAdmin(mvc);
// when update data
UserRO userRO = getLoggedUserData(mvc, session);
userRO.setActive(!userRO.isActive());
@@ -85,7 +85,7 @@ public class UserResourceIntegrationTest {
// given when - log as SMP admin
// then change values and list uses for changed value
- MockHttpSession session = loginWithUserGroupAdmin(mvc);
+ MockHttpSession session = loginWithSystemAdmin(mvc);
UserRO userRO = getLoggedUserData(mvc, session);
assertNotNull(userRO);
// when
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
index 91efdfe4e..005dda669 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
@@ -116,7 +116,7 @@ public class TruststoreAdminResourceIntegrationTest {
@Test
public void validateCertificateIdWithEmailSerialNumberInSubjectCertIdTest() throws Exception {
// login
- MockHttpSession session = loginWithUserGroupAdmin(mvc);
+ MockHttpSession session = loginWithSystemAdmin(mvc);
// when update data
UserRO userRO = getLoggedUserData(mvc, session);
--
GitLab