fix: use default email reset template if not configured in org common settings

Author: ludomikula

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

@@ -14,6 +14,12 @@
 
 public interface OrganizationService {
 
+    public static final String PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT = "<p>Hi, %s<br/>" +
+            "Here is the link to reset your password: %s<br/>" +
+            "Please note that the link will expire after 12 hours.<br/><br/>" +
+            "Regards,<br/>" +
+            "The Lowcoder Team</p>";
+
     @PossibleEmptyMono
     Mono<Organization> getOrganizationInEnterpriseMode();
 

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

@@ -51,13 +51,6 @@
 public class OrganizationServiceImpl implements OrganizationService {
 
     private Conf<Integer> logoMaxSizeInKb;
-
-    private static final String PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT = "<p>Hi, %s<br/>" +
-            "Here is the link to reset your password: %s<br/>" +
-            "Please note that the link will expire after 12 hours.<br/><br/>" +
-            "Regards,<br/>" +
-            "The Lowcoder Team</p>";
-
     private final AssetRepository assetRepository;
     private final AssetService assetService;
     private final OrgMemberService orgMemberService;

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

@@ -17,7 +17,6 @@
 import org.lowcoder.domain.group.service.GroupMemberService;
 import org.lowcoder.domain.group.service.GroupService;
 import org.lowcoder.domain.organization.model.OrgMember;
-import org.lowcoder.domain.organization.model.Organization;
 import org.lowcoder.domain.organization.service.OrgMemberService;
 import org.lowcoder.domain.organization.service.OrganizationService;
 import org.lowcoder.domain.user.model.*;
@@ -50,6 +49,7 @@
 import java.util.stream.Collectors;
 
 import static com.google.common.collect.Sets.newHashSet;
+import static org.lowcoder.domain.organization.service.OrganizationServiceImpl.PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT;
 import static org.lowcoder.domain.user.model.UserDetail.ANONYMOUS_CURRENT_USER;
 import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP;
 import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
@@ -268,7 +268,7 @@ public Mono<Boolean> lostPassword(String userEmail) {
         return findByName(userEmail)
                 .zipWhen(user -> orgMemberService.getCurrentOrgMember(user.getId())
                 .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                .map(organization -> organization.getCommonSettings().get(Organization.OrganizationCommonSettings.PASSWORD_RESET_EMAIL_TEMPLATE)))
+                .map(organization -> organization.getCommonSettings().getOrDefault(PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT, PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT)))
                 .flatMap(tuple -> {
                     User user = tuple.getT1();
                     String emailTemplate = (String)tuple.getT2();