Merge remote-tracking branch 'origin/2624_sormas-to-sormas-rest-endpoints' into 2624_sormas-to-sormas-rest-endpoints

# Conflicts:
#	sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java

Author: lgal

sormas-backend/src/main/java/de/symeda/sormas/backend/common/StartupShutdownService.java

@@ -45,7 +45,9 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import de.symeda.sormas.backend.user.event.MockPasswordUpdateEvent;
 import de.symeda.sormas.backend.user.event.MockUserCreateEvent;
+import de.symeda.sormas.backend.user.event.PasswordResetEvent;
 import de.symeda.sormas.backend.user.event.UserCreateEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -124,18 +126,8 @@ public class StartupShutdownService {
 	@EJB
 	private UserService userService;
 	@EJB
-	private CaseService caseService;
-	@EJB
 	private ContactService contactService;
 	@EJB
-	private EventParticipantService eventParticipantService;
-	@EJB
-	private EpiDataService epiDataService;
-	@EJB
-	private SymptomsService symptomsService;
-	@EJB
-	private PersonService personService;
-	@EJB
 	private RegionService regionService;
 	@EJB
 	private DistrictService districtService;
@@ -150,8 +142,6 @@ public class StartupShutdownService {
 	@EJB
 	private ImportFacadeEjbLocal importFacade;
 	@EJB
-	private DiseaseConfigurationFacadeEjbLocal diseaseConfigurationFacade;
-	@EJB
 	private DiseaseConfigurationService diseaseConfigurationService;
 	@EJB
 	private FeatureConfigurationService featureConfigurationService;
@@ -161,6 +151,9 @@ public class StartupShutdownService {
 	@Inject
 	private Event<UserCreateEvent> userCreateEvent;
 
+	@Inject
+	private Event<PasswordResetEvent> passwordResetEvent;
+
 	@PostConstruct
 	public void startup() {
 
@@ -454,13 +447,15 @@ private void createOrUpdateSormasToSormasUser() {
 					newUser.setUserName(SORMAS_TO_SORMAS_USER_NAME);
 
 					userService.persist(newUser);
+					userCreateEvent.fire(new MockUserCreateEvent(newUser, sormasToSormasUserPassword));
 				}
 			} else if (!DataHelper
 				.equal(sormasToSormasUser.getPassword(), PasswordHelper.encodePassword(sormasToSormasUserPassword, sormasToSormasUser.getSeed()))) {
 				sormasToSormasUser.setSeed(PasswordHelper.createPass(16));
 				sormasToSormasUser.setPassword(PasswordHelper.encodePassword(sormasToSormasUserPassword, sormasToSormasUser.getSeed()));
 
 				userService.persist(sormasToSormasUser);
+				passwordResetEvent.fire(new MockPasswordUpdateEvent(sormasToSormasUser, sormasToSormasUserPassword));
 			}
 		}));
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java

@@ -19,14 +19,9 @@
 package de.symeda.sormas.backend.user;
 
 import com.nimbusds.jose.util.JSONObjectUtils;
-import de.symeda.sormas.api.AuthProvider;
 import de.symeda.sormas.api.Language;
 import de.symeda.sormas.api.user.UserRole;
-import de.symeda.sormas.backend.common.ConfigFacadeEjb.ConfigFacadeEjbLocal;
-import de.symeda.sormas.backend.user.event.MockUserCreateEvent;
-import de.symeda.sormas.backend.user.event.PasswordResetEvent;
-import de.symeda.sormas.backend.user.event.UserCreateEvent;
-import de.symeda.sormas.backend.user.event.UserUpdateEvent;
+import de.symeda.sormas.backend.user.event.*;
 import net.minidev.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +36,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.enterprise.event.Observes;
@@ -70,9 +64,6 @@ public class KeycloakService {
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
-	@EJB
-	private ConfigFacadeEjbLocal configFacade;
-
 	private static final String OIDC_REALM = "realm";
 	private static final String OIDC_SERVER_URL = "auth-server-url";
 	private static final String OIDC_CREDENTIALS = "credentials";
@@ -89,12 +80,6 @@ public class KeycloakService {
 
 	@PostConstruct
 	public void init() {
-
-		if(!AuthProvider.KEYCLOAK.equalsIgnoreCase(configFacade.getAuthenticationProvider())) {
-			logger.info("Keycloak Auth Provider not active");
-			return;
-		}
-
 		Optional<String> oidcJson = ConfigProvider.getConfig().getOptionalValue("sormas.backend.security.oidc.json", String.class);
 
 		if (!oidcJson.isPresent()) {
@@ -126,20 +111,17 @@ public void handleUserCreateEvent(@Observes UserCreateEvent userCreateEvent) {
 			return;
 		}
 
-		User user = userCreateEvent.getUser();
 		String password = null;
 		if (userCreateEvent instanceof MockUserCreateEvent) {
 			password = ((MockUserCreateEvent) userCreateEvent).getPassword();
-			Optional<UserRepresentation> mockUser = getUserByUsername(keycloak.get(), user.getUserName());
-			if (mockUser.isPresent()) {
-				logger.info("Mock user {} already exists. Will not create a new one", user.getUserName());
-				return;
-			}
 		}
 
+		User user = userCreateEvent.getUser();
 		String userId = createUser(keycloak.get(), user, password);
 		if (StringUtils.isNotBlank(user.getUserEmail())) {
 			sendActivationEmail(keycloak.get(), userId);
+		} else {
+			logger.warn("Cannot send activation email, because the user has no email");
 		}
 	}
 
@@ -176,7 +158,18 @@ public void handlePasswordResetEvent(@Observes PasswordResetEvent passwordResetE
 			logger.warn("Cannot find user to update for username {}", user.getUserName());
 			return;
 		}
-		userRepresentation.ifPresent(existing -> sendPasswordResetEmail(keycloak.get(), existing.getId()));
+
+		String userId = userRepresentation.get().getId();
+
+		if (passwordResetEvent instanceof MockPasswordUpdateEvent) {
+			UserRepresentation existingUser = userRepresentation.get();
+			setCredentials(existingUser, ((MockPasswordUpdateEvent) passwordResetEvent).getPassword());
+			keycloak.get().realms().realm(REALM_NAME).users().get(userId).update(existingUser);
+		} else if (StringUtils.isNotBlank(user.getUserEmail())) {
+			sendPasswordResetEmail(keycloak.get(), userId);
+		} else {
+			logger.warn("Cannot send password reset email, because the user has no email");
+		}
 	}
 
 	private UserRepresentation createUserRepresentation(User user, String password) {

sormas-backend/src/main/java/de/symeda/sormas/backend/user/event/MockPasswordUpdateEvent.java

@@ -0,0 +1,41 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.backend.user.event;
+
+import de.symeda.sormas.backend.user.User;
+
+/**
+ * Event used for hard coded user password changes.
+ *
+ * @author Alex Vidrean
+ * @since 05-Oct-20
+ */
+public class MockPasswordUpdateEvent extends PasswordResetEvent {
+
+    private final String password;
+
+    public MockPasswordUpdateEvent(User user, String password) {
+        super(user);
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+}

sormas-backend/src/main/java/de/symeda/sormas/backend/user/event/MockUserCreateEvent.java

@@ -28,7 +28,7 @@
  */
 public class MockUserCreateEvent extends UserCreateEvent {
 
-	private String password;
+	private final String password;
 
 	public MockUserCreateEvent(User user, String password) {
 		super(user);

sormas-backend/src/main/java/de/symeda/sormas/backend/user/event/PasswordResetEvent.java

@@ -28,7 +28,7 @@
  */
 public class PasswordResetEvent {
 
-	private User user;
+	private final User user;
 
 	public PasswordResetEvent(User user) {
 		this.user = user;

sormas-backend/src/main/java/de/symeda/sormas/backend/user/event/UserCreateEvent.java

@@ -28,7 +28,7 @@
  */
 public class UserCreateEvent {
 
-	private User user;
+	private final User user;
 
 	public UserCreateEvent(User user) {
 		this.user = user;

sormas-backend/src/main/java/de/symeda/sormas/backend/user/event/UserUpdateEvent.java

@@ -28,9 +28,9 @@
  */
 public class UserUpdateEvent {
 
-	private User oldUser;
+	private final User oldUser;
 
-	private User newUser;
+	private final User newUser;
 
 	public UserUpdateEvent(User oldUser, User newUser) {
 		this.oldUser = oldUser;
@@ -41,15 +41,7 @@ public User getOldUser() {
 		return oldUser;
 	}
 
-	public void setOldUser(User oldUser) {
-		this.oldUser = oldUser;
-	}
-
 	public User getNewUser() {
 		return newUser;
 	}
-
-	public void setNewUser(User newUser) {
-		this.newUser = newUser;
-	}
 }