feature: Added email template in OrganizationCommonSettings, Added public url env variable and some code optimizations.

Author: irfan-ikhwa

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java

@@ -86,7 +86,7 @@ public OrganizationCommonSettings getCommonSettings() {
     public static class OrganizationCommonSettings extends HashMap<String, Object> {
         public static final String USER_EXTRA_TRANSFORMER = "userExtraTransformer";
         public static final String USER_EXTRA_TRANSFORMER_UPDATE_TIME = "userExtraTransformer_updateTime";
-
+        public static final String PASSWORD_RESET_EMAIL_TEMPLATE = "passwordRestEmailTemplate";
         // custom branding configs
         public static final String CUSTOM_BRANDING_KEY = "branding";
     }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationService.java

@@ -20,7 +20,7 @@ public class EmailCommunicationService {
 
     public boolean sendMail(String to, String token, String message) {
         try {
-            String subject = "Lost Password Email";
+            String subject = "Reset Your Password";
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
 
             MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
@@ -30,7 +30,7 @@ public boolean sendMail(String to, String token, String message) {
             mimeMessageHelper.setSubject(subject);
 
             // Construct the message with the token link
-            String resetLink = "http://localhost:8080/api/users/lost-password/" + token;
+            String resetLink = lowcoderPublicUrl + "/api/users/lost-password/" + token;
             String messageWithLink = message + "\n\nReset your password here: " + resetLink;
             mimeMessageHelper.setText(messageWithLink, true); // Set HTML to true to allow links
 

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java

@@ -50,9 +50,9 @@ public interface UserService {
 
     Mono<String> resetPassword(String userId);
 
-    Mono<Void> lostPassword(String userEmail);
+    Mono<Boolean> lostPassword(String userEmail);
 
-    Mono<Void> resetLostPassword(String userEmail, String token, String newPassword);
+    Mono<Boolean> resetLostPassword(String userEmail, String token, String newPassword);
 
     Mono<Boolean> setPassword(String userId, String password);
 

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

@@ -16,6 +16,7 @@
 import org.lowcoder.domain.group.service.GroupService;
 import org.lowcoder.domain.organization.model.OrgMember;
 import org.lowcoder.domain.organization.service.OrgMemberService;
+import org.lowcoder.domain.organization.service.OrganizationService;
 import org.lowcoder.domain.user.model.*;
 import org.lowcoder.domain.user.model.User.TransformedUserInfo;
 import org.lowcoder.domain.user.repository.UserRepository;
@@ -74,6 +75,8 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private OrgMemberService orgMemberService;
     @Autowired
+    private OrganizationService organizationService;
+    @Autowired
     private GroupService groupService;
     @Autowired
     private CommonConfig commonConfig;
@@ -269,14 +272,20 @@ public Mono<String> resetPassword(String userId) {
     }
 
     @Override
-    public Mono<Void> lostPassword(String userEmail) {
+    public Mono<Boolean> lostPassword(String userEmail) {
         return findByName(userEmail)
-                .flatMap(user -> {
+                .zipWhen(user -> orgMemberService.getCurrentOrgMember(user.getId())
+                .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
+                .map(organization -> organization.getCommonSettings().get("PASSWORD_RESET_EMAIL_TEMPLATE")))
+                .flatMap(tuple -> {
+                    User user = tuple.getT1();
+                    String emailTemplate = (String)tuple.getT2();
+
                     String token = generateNewRandomPwd();
                     Instant tokenExpiry = Instant.now().plus(12, ChronoUnit.HOURS);
-                    // TODO - IRFAN this is just a dummy email.
-                    if (!emailCommunicationService.sendMail("notify@lowcoder.org", token, "Click Here")) {
-                        return ofError(BizError.USER_NOT_EXIST, "SENDING_EMAIL_FAILED");
+
+                    if (!emailCommunicationService.sendMail(userEmail, token, emailTemplate)) {
+                        return ofError(BizError.AUTH_ERROR, "SENDING_EMAIL_FAILED");
                     }
                     user.setPasswordResetToken(HashUtils.hash(token.getBytes()));
                     user.setPasswordResetTokenExpiry(tokenExpiry);
@@ -285,7 +294,7 @@ public Mono<Void> lostPassword(String userEmail) {
     }
 
     @Override
-    public Mono<Void> resetLostPassword(String userEmail, String token, String newPassword) {
+    public Mono<Boolean> resetLostPassword(String userEmail, String token, String newPassword) {
         return findByName(userEmail)
                 .flatMap(user -> {
                     if (Instant.now().until(user.getPasswordResetTokenExpiry(), ChronoUnit.MINUTES) <= 0) {
@@ -303,7 +312,8 @@ public Mono<Void> resetLostPassword(String userEmail, String token, String newPa
                     user.setPassword(encryptionService.encryptPassword(newPassword));
                     user.setPasswordResetToken(StringUtils.EMPTY);
                     user.setPasswordResetTokenExpiry(Instant.now());
-                    return repository.save(user).then(Mono.empty());
+                    return repository.save(user)
+                            .thenReturn(true);
                 });
     }
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserApiService.java

@@ -65,11 +65,11 @@ public Mono<String> resetPassword(String userId) {
                 .then(userService.resetPassword(userId));
     }
 
-    public Mono<Void> lostPassword(String userEmail) {
+    public Mono<Boolean> lostPassword(String userEmail) {
         return userService.lostPassword(userEmail);
     }
 
-    public Mono<Void> resetLostPassword(String userEmail, String token, String newPassword) {
+    public Mono<Boolean> resetLostPassword(String userEmail, String token, String newPassword) {
         return userService.resetLostPassword(userEmail, token, newPassword);
     }
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java

@@ -147,7 +147,7 @@ public Mono<ResponseView<String>> resetPassword(@RequestBody ResetPasswordReques
     }
 
     @Override
-    public Mono<ResponseView<Void>> lostPassword(@RequestBody LostPasswordRequest request) {
+    public Mono<ResponseView<Boolean>> lostPassword(@RequestBody LostPasswordRequest request) {
         if (StringUtils.isBlank(request.userEmail())) {
             return ofError(BizError.INVALID_PARAMETER, "INVALID_USER_EMAIL");
         }
@@ -156,7 +156,7 @@ public Mono<ResponseView<Void>> lostPassword(@RequestBody LostPasswordRequest re
     }
 
     @Override
-    public Mono<ResponseView<Void>> resetLostPassword(@PathVariable String token, @RequestBody ResetLostPasswordRequest request) {
+    public Mono<ResponseView<Boolean>> resetLostPassword(@PathVariable String token, @RequestBody ResetLostPasswordRequest request) {
         if (StringUtils.isBlank(request.userEmail()) || StringUtils.isBlank(token)
                 || StringUtils.isBlank(request.newPassword())) {
             return ofError(BizError.INVALID_PARAMETER, "INVALID_PARAMETER");

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java

@@ -122,10 +122,10 @@ public interface UserEndpoints
     public Mono<ResponseView<String>> resetPassword(@RequestBody ResetPasswordRequest request);
 
 	@PostMapping("/lost-password")
-	public Mono<ResponseView<Void>> lostPassword(@RequestBody LostPasswordRequest request);
+	public Mono<ResponseView<Boolean>> lostPassword(@RequestBody LostPasswordRequest request);
 
 	@PostMapping("/lost-password/{token}")
-	public Mono<ResponseView<Void>> resetLostPassword(@PathVariable String token, @RequestBody ResetLostPasswordRequest request);
+	public Mono<ResponseView<Boolean>> resetLostPassword(@PathVariable String token, @RequestBody ResetLostPasswordRequest request);
 
 	@Operation(
 			tags = TAG_USER_PASSWORD_MANAGEMENT,

server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml

@@ -56,6 +56,7 @@ common:
   block-hound-enable: false
   js-executor:
     host: http://127.0.0.1:6060
+  lowcoder_public_url: http://localhost:8080
 
 material:
   mongodb-grid-fs: