This is an automated email from the git hooks/post-receive script. New commit to branch feature/44_several_email_address in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit cd10e94e18679a99ef8354b63d369ad5e80c25dc Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 12 15:31:25 2017 +0200 refs #44 corrections --- .../src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java | 4 ++-- .../java/org/chorem/pollen/services/service/SocialAuthService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java index 27691c35..7abdf256 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java @@ -225,13 +225,13 @@ public class PollenUserApi { @Path("/user/email/default") @PUT public void setDefaultEmailAddress(@Context PollenUserService pollenUserService, - PollenEntityId<PollenUserEmailAddress> emailAddressId) + @QueryParam("emailAddressId") PollenEntityId<PollenUserEmailAddress> emailAddressId) throws PollenEmailNotValidatedException { pollenUserService.setDefaultEmailAddress(emailAddressId.getEntityId()); } @Path("/user/email/{emailAddressId}") - @POST + @DELETE public void removeEmailAddress(@Context PollenUserService pollenUserService, @PathParam("emailAddressId") PollenEntityId<PollenUserEmailAddress> emailAddressId) throws PollenDefaultEmailAddressException { 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 a3f896c3..e0b5afd6 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 @@ -141,7 +141,7 @@ public class SocialAuthService extends PollenServiceSupport { UserCredential credential = createUserCredential(p); connectedUser.addUserCredential(credential); - if (StringUtils.isNotBlank(credentialEmail)) { + if (StringUtils.isNotBlank(credential.getEmail())) { boolean addEmailAddress = connectedUser.getEmailAddresses().stream() .map(PollenUserEmailAddress::getEmailAddress) .noneMatch(email -> Objects.equals(credentialEmail, email)); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.