Merge branch 'dev' into hide_api_key

FalkWolsky · web-flow · commit 5bdedc96080b · 2025-04-19T15:10:54.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationService.java
@@ -2,4 +2,5 @@
 
 public interface EmailCommunicationService {
     boolean sendPasswordResetEmail(String to, String token, String message);
+    boolean sendInvitationEmails(String[] to, String inviteLink, String message);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java
@@ -49,4 +49,32 @@ public boolean sendPasswordResetEmail(String to, String token, String message) {
 
     }
 
+    @Override
+    public boolean sendInvitationEmails(String[] to, String inviteLink, String message) {
+        try {
+            String subject = "You've been invited!";
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+
+            MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
+
+            mimeMessageHelper.setFrom(config.getNotificationsEmailSender());
+            mimeMessageHelper.setTo(to);
+            mimeMessageHelper.setSubject(subject);
+
+            // Construct the message with the invite link
+            String formattedMessage = String.format(message, inviteLink);
+            mimeMessageHelper.setText(formattedMessage, true); // Set HTML to true to allow links
+
+            javaMailSender.send(mimeMessage);
+
+            return true;
+
+        } catch (Exception e) {
+            log.error("Failed to send mail to: {}, Exception: ", to, e);
+            return false;
+        }
+
+
+    }
+
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java
@@ -1,6 +1,7 @@
 package org.lowcoder.api.authentication;
 
-import lombok.RequiredArgsConstructor;
+import java.util.List;
+
 import org.lowcoder.api.authentication.dto.APIKeyRequest;
 import org.lowcoder.api.authentication.dto.AuthConfigRequest;
 import org.lowcoder.api.authentication.service.AuthenticationApiService;
@@ -20,9 +21,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
 
-import java.util.List;
+import lombok.RequiredArgsConstructor;
+import reactor.core.publisher.Mono;
 
 @RequiredArgsConstructor
 @RestController
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java
@@ -1,7 +1,7 @@
 package org.lowcoder.api.authentication;
 
-import com.fasterxml.jackson.annotation.JsonView;
-import io.swagger.v3.oas.annotations.Operation;
+import java.util.List;
+
 import org.lowcoder.api.authentication.dto.APIKeyRequest;
 import org.lowcoder.api.authentication.dto.AuthConfigRequest;
 import org.lowcoder.api.framework.view.ResponseView;
@@ -13,11 +13,20 @@
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
 import org.lowcoder.sdk.config.JsonViews;
 import org.lowcoder.sdk.constants.AuthSourceConstants;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonView;
+
+import io.swagger.v3.oas.annotations.Operation;
+import reactor.core.publisher.Mono;
 
 @RestController
 @RequestMapping(value = {NewUrl.CUSTOM_AUTH})
@@ -159,4 +168,5 @@ public Mono<ResponseView<Boolean>> linkAccountWithThirdParty(
      */
     public record FormLoginRequest(String loginId, String password, boolean register, String source, String authId) {
     }
-}
+}	
+
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationController.java
@@ -7,6 +7,8 @@
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.home.SessionUserService;
 import org.lowcoder.api.usermanagement.view.InvitationVO;
+import org.lowcoder.domain.user.service.EmailCommunicationService;
+import org.lowcoder.sdk.config.CommonConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -24,6 +26,12 @@ public class InvitationController implements InvitationEndpoints
     @Autowired
     private SessionUserService sessionUserService;
 
+    @Autowired
+    private EmailCommunicationService emailCommunicationService;
+
+    @Autowired
+    private CommonConfig config;
+
     @Override
     public Mono<ResponseView<InvitationVO>> create(@RequestParam String orgId) {
         return invitationApiService.create(orgId)
@@ -50,4 +58,13 @@ public Mono<ResponseView<?>> inviteUser(@PathVariable String invitationId) {
                 );
     }
 
+    @Override
+    public Mono<ResponseView<Boolean>> sendInvitationEmails(InviteEmailRequest req) {
+        return invitationApiService.create(req.orgId()).map(invitation -> 
+                emailCommunicationService.sendInvitationEmails(req.emails(), 
+                config.getLowcoderPublicUrl() + "/invite/" + invitation.getInviteCode(), 
+                    "You have been invited to join our platform. Click here to accept the invitation: %s"))
+            .map(ResponseView::success);
+    }
+
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationEndpoints.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,5 +47,20 @@ public interface InvitationEndpoints
 	)
     @GetMapping("/{invitationId}/invite")
     public Mono<ResponseView<?>> inviteUser(@PathVariable String invitationId);
+	
+	@Operation(
+			tags = TAG_INVITATION_MANAGEMENT,
+			operationId = "sendInvitationEmails",
+			summary = "Send invitation emails",
+			description = "Send invitation emails to the specified addresses"
+	)
+	@PostMapping("/email/invite")
+	public Mono<ResponseView<Boolean>> sendInvitationEmails(@RequestBody InviteEmailRequest req);
+	/**
+	 * @param emails email addresses to send the invitation to
+	 * @param inviteLink the link to be included in the email
+	 */
+	public record InviteEmailRequest(String[] emails, String orgId) {
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@`
`2`	`2`
`3`	`3`	`public interface EmailCommunicationService {`
`4`	`4`	`boolean sendPasswordResetEmail(String to, String token, String message);`
	`5`	`+ boolean sendInvitationEmails(String[] to, String inviteLink, String message);`
`5`	`6`	`}`