This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit cd5b746c9b851ec4f6f069123bd9902d175542cb Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 14 11:31:04 2017 +0200 fixes #143 Github sends the "null" string as email --- .../org/chorem/pollen/services/service/SocialAuthService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java index bfa301af..d9afcc3f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java @@ -72,7 +72,7 @@ public class SocialAuthService extends PollenServiceSupport { pollenUser = new PollenUserImpl(); pollenUser.setName(name); - pollenUser.setEmail(p.getEmail()); + pollenUser.setEmail(credential.getEmail()); pollenUser.setLanguage(p.getLanguage()); pollenUser.setAdministrator(false); pollenUser.setBanned(false); @@ -122,12 +122,16 @@ public class SocialAuthService extends PollenServiceSupport { if (accountName == null) { accountName = p.getFullName(); } + String userEmail = null; + if (StringUtils.isNotBlank(p.getEmail()) && !"null".equalsIgnoreCase(p.getEmail())) { + userEmail = p.getEmail(); + } UserCredential credential = new UserCredentialImpl(); credential.setProvider(p.getProviderId()); credential.setUserId(p.getValidatedId()); credential.setUserName(accountName); - credential.setEmail(p.getEmail()); + credential.setEmail(userEmail); credential = getUserCredentialDao().create(credential); return credential; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.