From de32e3fe929cff977b37d3b2295eaef54a366ad2 Mon Sep 17 00:00:00 2001 From: Jonathan Ruddell Date: Thu, 25 Aug 2016 10:40:14 -0700 Subject: [PATCH] dont link social users with null emails to users with null emails Fix #4024 --- .../src/main/java/package/service/_SocialService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/generators/server/templates/src/main/java/package/service/_SocialService.java b/generators/server/templates/src/main/java/package/service/_SocialService.java index fbb1dfc90776..9f4cb8cc35ca 100644 --- a/generators/server/templates/src/main/java/package/service/_SocialService.java +++ b/generators/server/templates/src/main/java/package/service/_SocialService.java @@ -76,10 +76,12 @@ private User createUserIfNotExist(UserProfile userProfile, String langKey, Strin log.error("Cannot create social user because email is null and login already exist, login -> {}", userName); throw new IllegalArgumentException("Email cannot be null with an existing login"); } - Optional user = userRepository.findOneByEmail(email); - if (user.isPresent()) { - log.info("User already exist associate the connection to this account"); - return user.get(); + if (!StringUtils.isBlank(email)) { + Optional user = userRepository.findOneByEmail(email); + if (user.isPresent()) { + log.info("User already exist associate the connection to this account"); + return user.get(); + } } String login = getLoginDependingOnProviderId(userProfile, providerId);