This is an automated email from the git hooks/post-receive script. New commit to branch feature/add_password_to_registration in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9002c6700f143b83ed0409f8e1cc5e4ab7dd601d Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 28 17:09:25 2017 +0100 refs #6 passage des urls du front au back pour l'email d'inscription --- .../java/org/chorem/pollen/rest/api/v1/PollenUserApi.java | 6 ++++-- .../pollen/services/service/NotificationService.java | 8 ++++---- .../pollen/services/service/PollenUIUrlRenderService.java | 6 +++--- .../chorem/pollen/services/service/PollenUserService.java | 10 +++++----- .../chorem/pollen/services/service/mail/EmailService.java | 14 +++++++------- pollen-ui-riot-js/src/main/web/conf.js | 3 ++- pollen-ui-riot-js/src/main/web/js/AuthService.js | 6 +++++- 7 files changed, 30 insertions(+), 23 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 237631d..418b0ac 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 @@ -65,9 +65,11 @@ public class PollenUserApi extends WebMotionController { } public PollenEntityRef<PollenUser> createUser(PollenUserService pollenUserService, - PollenUserBean user) throws InvalidFormException { + PollenUserBean user, + String pollenUrl, + String validateUrl) throws InvalidFormException { - return pollenUserService.createUser(user); + return pollenUserService.createUser(user, pollenUrl, validateUrl); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java index e53bc32..170eae1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java @@ -42,10 +42,10 @@ import org.chorem.pollen.services.service.mail.UserAccountCreatedEmail; */ public class NotificationService extends PollenServiceSupport { - public void onUserCreated(PollenUser user) { + public void onUserCreated(PollenUser user, String pollenUrl, String validateUrl) { EmailService emailService = getEmailService(); - UserAccountCreatedEmail email = emailService.newUserAccountCreatedEmail(getLocale(), user); + UserAccountCreatedEmail email = emailService.newUserAccountCreatedEmail(user, pollenUrl, validateUrl); email.addTo(user.getEmail()); @@ -53,10 +53,10 @@ public class NotificationService extends PollenServiceSupport { } - public void onResendValidation(PollenUser user) { + public void onResendValidation(PollenUser user, String pollenUrl, String validateUrl) { EmailService emailService = getEmailService(); - ResendValidationEmail email = emailService.newUserResendValidationEmail(user); + ResendValidationEmail email = emailService.newUserResendValidationEmail(user, pollenUrl, validateUrl); email.addTo(user.getEmail()); emailService.send(email); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java index 65271ca..a9aae35 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java @@ -81,13 +81,13 @@ public class PollenUIUrlRenderService extends PollenServiceSupport { return url; } - public String getUserValidateUrl(String userId, String token) { + public String getUserValidateUrl(String validateUrl, String userId, String token) { checkNotNull(userId); checkNotNull(token); - String url = serviceContext.getPollenServicesConfig().getUiUrlUserValidate().toString(); +// String url = serviceContext.getPollenServicesConfig().getUiUrlUserValidate().toString(); - url = url.replace("{userId}", userId); + String url = validateUrl.replace("{userId}", userId); url = url.replace("{token}", token); return url; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index f62d05f..9d8aa64 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -90,7 +90,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - public PollenEntityRef<PollenUser> createUser(PollenUserBean user) throws InvalidFormException { + public PollenEntityRef<PollenUser> createUser(PollenUserBean user, String pollenUrl, String validateUrl) throws InvalidFormException { checkNotNull(user); checkIsNotPersisted(user); @@ -102,7 +102,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer PollenUser result = savePollenUser(user); commit(); - getNotificationService().onUserCreated(result); + getNotificationService().onUserCreated(result, pollenUrl, validateUrl); return PollenEntityRef.of(result); @@ -247,7 +247,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - public void resendValidation(String email) { + public void resendValidation(String email, String pollenUrl, String validateUrl) { checkNotNull(email); PollenUser user = getPollenUserDao().forEmailEquals(email).findUniqueOrNull(); @@ -260,7 +260,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer commit(); } - getNotificationService().onResendValidation(user); + getNotificationService().onResendValidation(user, pollenUrl, validateUrl); } @@ -295,7 +295,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer for (PollenUserBean user : listUser) { // create user - PollenEntityRef<PollenUser> newUser = createUser(user); + PollenEntityRef<PollenUser> newUser = createUser(user, "", ""); // validate user PollenUser pollenUser = getPollenUserDao().forTopiaIdEquals(newUser.getEntityId()).findUnique(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index 5549b41..3c4d94a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -177,31 +177,31 @@ public class EmailService extends PollenServiceSupport { return email; } - public UserAccountCreatedEmail newUserAccountCreatedEmail(Locale locale, PollenUser user) { - UserAccountCreatedEmail email = new UserAccountCreatedEmail(locale); + public UserAccountCreatedEmail newUserAccountCreatedEmail(PollenUser user, String pollenUrl, String validateUrl) { + UserAccountCreatedEmail email = new UserAccountCreatedEmail(getLocale()); email.setUser(user); - email.setPollenUrl(getPollenUIUrlRenderService().getPollenUrl()); + email.setPollenUrl(pollenUrl); PollenEntityId<PollenUser> userId = PollenEntityId.newId(PollenUser.class); userId.setEntityId(user.getTopiaId()); userId.encode(serviceContext.getTopiaApplicationContext().getTopiaIdFactory()); - email.setValidateUrl(getPollenUIUrlRenderService().getUserValidateUrl(userId.getReducedId(), user.getEmailActivationToken().getToken())); + email.setValidateUrl(getPollenUIUrlRenderService().getUserValidateUrl(validateUrl, userId.getReducedId(), user.getEmailActivationToken().getToken())); return email; } - public ResendValidationEmail newUserResendValidationEmail(PollenUser user) { + public ResendValidationEmail newUserResendValidationEmail(PollenUser user, String pollenUrl, String validateUrl) { ResendValidationEmail email = new ResendValidationEmail(getLocale()); email.setUser(user); - email.setPollenUrl(getPollenUIUrlRenderService().getPollenUrl()); + email.setPollenUrl(pollenUrl); PollenEntityId<PollenUser> userId = PollenEntityId.newId(PollenUser.class); userId.setEntityId(user.getTopiaId()); userId.encode(serviceContext.getTopiaApplicationContext().getTopiaIdFactory()); - email.setValidateUrl(getPollenUIUrlRenderService().getUserValidateUrl(userId.getReducedId(), user.getEmailActivationToken().getToken())); + email.setValidateUrl(getPollenUIUrlRenderService().getUserValidateUrl(validateUrl, userId.getReducedId(), user.getEmailActivationToken().getToken())); return email; } diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 1a1424f..c14ef02 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -11,5 +11,6 @@ window.pollenConf = { defaultDateFormat: "shortDate", defaultTimeFormat: "shortTime", defaultDateTimeFormat: "short", - debugI18n: false + debugI18n: false, + pollenUiUrl: "http://localhost:8080" }; diff --git a/pollen-ui-riot-js/src/main/web/js/AuthService.js b/pollen-ui-riot-js/src/main/web/js/AuthService.js index bd6502b..e20bafb 100644 --- a/pollen-ui-riot-js/src/main/web/js/AuthService.js +++ b/pollen-ui-riot-js/src/main/web/js/AuthService.js @@ -40,7 +40,11 @@ class AuthService extends FetchService { } signUp(user) { - return this.form("/v1/users", {user: user}); + return this.form("/v1/users", { + user: user, + pollenUrl: this.session.configuration.pollenUiUrl, + validateUrl: this.session.configuration.pollenUiUrl + "/#signcheck/{userId}/{token}" + }); } signOut() { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.