MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Prevent user to send merge request email to itself

This commit is contained in:
George Kalampokis 2020-11-10 17:39:43 +02:00
parent 5d01519415
commit f5533e1b95
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java
View File

@ -69,14 +69,16 @@ public class MergeEmailConfirmationManager {
public void sendConfirmationEmail(String email, Principal principal, UUID userId, Integer provider) throws HasConfirmedEmailException { public void sendConfirmationEmail(String email, Principal principal, UUID userId, Integer provider) throws HasConfirmedEmailException {
UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
apiContext.getUtilitiesService().getConfirmationEmailService().createMergeConfirmationEmail( if (user.getEmail() != null && !user.getEmail().equals(email)) {
databaseRepository.getLoginConfirmationEmailDao(), apiContext.getUtilitiesService().getConfirmationEmailService().createMergeConfirmationEmail(
apiContext.getUtilitiesService().getMailService(), databaseRepository.getLoginConfirmationEmailDao(),
email, apiContext.getUtilitiesService().getMailService(),
userId, email,
principal, userId,
provider principal,
); provider
);
}
} }
@Transactional @Transactional