remove invitationUrl field from request body

Author: Thomasr

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java

@@ -13,7 +13,6 @@
 import org.lowcoder.api.util.BusinessEventPublisher;
 import org.lowcoder.domain.authentication.FindAuthConfig;
 import org.lowcoder.domain.user.model.APIKey;
-import org.lowcoder.domain.user.service.EmailCommunicationService;
 import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
 import org.lowcoder.sdk.util.CookieHelper;
@@ -36,7 +35,6 @@ public class AuthenticationController implements AuthenticationEndpoints
     private final CookieHelper cookieHelper;
     private final BusinessEventPublisher businessEventPublisher;
     private final UserService userService;
-    private final EmailCommunicationService emailCommunicationService;
 
     /**
      * login by email or phone with password; or register by email for now.
@@ -137,13 +135,4 @@ public Mono<ResponseView<?>> bindEmail(@RequestParam String email) {
         return sessionUserService.getVisitor().flatMap(user -> userService.bindEmail(user, email))
                 .map(ResponseView::success);
     }
-
-    @Override
-    public Mono<ResponseView<Boolean>> sendInvitationEmails(InviteEmailRequest req) {
-        boolean isSuccess = emailCommunicationService.sendInvitationEmails(req.emails(), 
-        req.inviteLink(), 
-        "You have been invited to join our platform. Click here to accept the invitation: %s");
-        
-        return Mono.just(ResponseView.success(isSuccess));
-    }
 }

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})
@@ -151,15 +160,6 @@ public Mono<ResponseView<Boolean>> linkAccountWithThirdParty(
 	)
 	@PostMapping("/email/bind")
 	public Mono<ResponseView<?>> bindEmail(@RequestParam String email);
-	
-	@Operation(
-			tags = TAG_AUTHENTICATION,
-			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 loginId phone number or email for now.
@@ -168,11 +168,5 @@ public Mono<ResponseView<Boolean>> linkAccountWithThirdParty(
      */
     public record FormLoginRequest(String loginId, String password, boolean register, String source, String authId) {
     }
-	/**
-	 * @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 inviteLink) {
-	}
 }	
 

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() + "/" + invitation.getInviteCode(), 
+                    "You have been invited to join our platform. Click here to accept the invitation: %s"))
+            .map(ResponseView::success);
+    }
+
 }

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) {
+	}
 
 }