Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit54dcd9a

Browse files
author
Thomasr
committed
remove invitationUrl field from request body
1 parenta811431 commit54dcd9a

File tree

4 files changed

+47
-31
lines changed

4 files changed

+47
-31
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
importorg.lowcoder.api.util.BusinessEventPublisher;
1414
importorg.lowcoder.domain.authentication.FindAuthConfig;
1515
importorg.lowcoder.domain.user.model.APIKey;
16-
importorg.lowcoder.domain.user.service.EmailCommunicationService;
1716
importorg.lowcoder.domain.user.service.UserService;
1817
importorg.lowcoder.sdk.auth.AbstractAuthConfig;
1918
importorg.lowcoder.sdk.util.CookieHelper;
@@ -36,7 +35,6 @@ public class AuthenticationController implements AuthenticationEndpoints
3635
privatefinalCookieHelpercookieHelper;
3736
privatefinalBusinessEventPublisherbusinessEventPublisher;
3837
privatefinalUserServiceuserService;
39-
privatefinalEmailCommunicationServiceemailCommunicationService;
4038

4139
/**
4240
* login by email or phone with password; or register by email for now.
@@ -137,13 +135,4 @@ public Mono<ResponseView<?>> bindEmail(@RequestParam String email) {
137135
returnsessionUserService.getVisitor().flatMap(user ->userService.bindEmail(user,email))
138136
.map(ResponseView::success);
139137
}
140-
141-
@Override
142-
publicMono<ResponseView<Boolean>>sendInvitationEmails(InviteEmailRequestreq) {
143-
booleanisSuccess =emailCommunicationService.sendInvitationEmails(req.emails(),
144-
req.inviteLink(),
145-
"You have been invited to join our platform. Click here to accept the invitation: %s");
146-
147-
returnMono.just(ResponseView.success(isSuccess));
148-
}
149138
}

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

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packageorg.lowcoder.api.authentication;
22

3-
importcom.fasterxml.jackson.annotation.JsonView;
4-
importio.swagger.v3.oas.annotations.Operation;
3+
importjava.util.List;
4+
55
importorg.lowcoder.api.authentication.dto.APIKeyRequest;
66
importorg.lowcoder.api.authentication.dto.AuthConfigRequest;
77
importorg.lowcoder.api.framework.view.ResponseView;
@@ -13,11 +13,20 @@
1313
importorg.lowcoder.sdk.auth.AbstractAuthConfig;
1414
importorg.lowcoder.sdk.config.JsonViews;
1515
importorg.lowcoder.sdk.constants.AuthSourceConstants;
16-
importorg.springframework.web.bind.annotation.*;
16+
importorg.springframework.web.bind.annotation.DeleteMapping;
17+
importorg.springframework.web.bind.annotation.GetMapping;
18+
importorg.springframework.web.bind.annotation.PathVariable;
19+
importorg.springframework.web.bind.annotation.PostMapping;
20+
importorg.springframework.web.bind.annotation.RequestBody;
21+
importorg.springframework.web.bind.annotation.RequestMapping;
22+
importorg.springframework.web.bind.annotation.RequestParam;
23+
importorg.springframework.web.bind.annotation.RestController;
1724
importorg.springframework.web.server.ServerWebExchange;
18-
importreactor.core.publisher.Mono;
1925

20-
importjava.util.List;
26+
importcom.fasterxml.jackson.annotation.JsonView;
27+
28+
importio.swagger.v3.oas.annotations.Operation;
29+
importreactor.core.publisher.Mono;
2130

2231
@RestController
2332
@RequestMapping(value = {NewUrl.CUSTOM_AUTH})
@@ -151,15 +160,6 @@ public Mono<ResponseView<Boolean>> linkAccountWithThirdParty(
151160
)
152161
@PostMapping("/email/bind")
153162
publicMono<ResponseView<?>>bindEmail(@RequestParamStringemail);
154-
155-
@Operation(
156-
tags =TAG_AUTHENTICATION,
157-
operationId ="sendInvitationEmails",
158-
summary ="Send invitation emails",
159-
description ="Send invitation emails to the specified addresses"
160-
)
161-
@PostMapping("/email/invite")
162-
publicMono<ResponseView<Boolean>>sendInvitationEmails(@RequestBodyInviteEmailRequestreq);
163163

164164
/**
165165
* @param loginId phone number or email for now.
@@ -168,11 +168,5 @@ public Mono<ResponseView<Boolean>> linkAccountWithThirdParty(
168168
*/
169169
publicrecordFormLoginRequest(StringloginId,Stringpassword,booleanregister,Stringsource,StringauthId) {
170170
}
171-
/**
172-
* @param emails email addresses to send the invitation to
173-
* @param inviteLink the link to be included in the email
174-
*/
175-
publicrecordInviteEmailRequest(String[]emails,StringinviteLink) {
176-
}
177171
}
178172

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
importorg.lowcoder.api.framework.view.ResponseView;
88
importorg.lowcoder.api.home.SessionUserService;
99
importorg.lowcoder.api.usermanagement.view.InvitationVO;
10+
importorg.lowcoder.domain.user.service.EmailCommunicationService;
11+
importorg.lowcoder.sdk.config.CommonConfig;
1012
importorg.springframework.beans.factory.annotation.Autowired;
1113
importorg.springframework.web.bind.annotation.PathVariable;
1214
importorg.springframework.web.bind.annotation.RequestParam;
@@ -24,6 +26,12 @@ public class InvitationController implements InvitationEndpoints
2426
@Autowired
2527
privateSessionUserServicesessionUserService;
2628

29+
@Autowired
30+
privateEmailCommunicationServiceemailCommunicationService;
31+
32+
@Autowired
33+
privateCommonConfigconfig;
34+
2735
@Override
2836
publicMono<ResponseView<InvitationVO>>create(@RequestParamStringorgId) {
2937
returninvitationApiService.create(orgId)
@@ -50,4 +58,13 @@ public Mono<ResponseView<?>> inviteUser(@PathVariable String invitationId) {
5058
);
5159
}
5260

61+
@Override
62+
publicMono<ResponseView<Boolean>>sendInvitationEmails(InviteEmailRequestreq) {
63+
returninvitationApiService.create(req.orgId()).map(invitation ->
64+
emailCommunicationService.sendInvitationEmails(req.emails(),
65+
config.getLowcoderPublicUrl() +"/" +invitation.getInviteCode(),
66+
"You have been invited to join our platform. Click here to accept the invitation: %s"))
67+
.map(ResponseView::success);
68+
}
69+
5370
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
importorg.springframework.web.bind.annotation.GetMapping;
88
importorg.springframework.web.bind.annotation.PathVariable;
99
importorg.springframework.web.bind.annotation.PostMapping;
10+
importorg.springframework.web.bind.annotation.RequestBody;
1011
importorg.springframework.web.bind.annotation.RequestMapping;
1112
importorg.springframework.web.bind.annotation.RequestParam;
1213
importorg.springframework.web.bind.annotation.RestController;
@@ -46,5 +47,20 @@ public interface InvitationEndpoints
4647
)
4748
@GetMapping("/{invitationId}/invite")
4849
publicMono<ResponseView<?>>inviteUser(@PathVariableStringinvitationId);
50+
51+
@Operation(
52+
tags =TAG_INVITATION_MANAGEMENT,
53+
operationId ="sendInvitationEmails",
54+
summary ="Send invitation emails",
55+
description ="Send invitation emails to the specified addresses"
56+
)
57+
@PostMapping("/email/invite")
58+
publicMono<ResponseView<Boolean>>sendInvitationEmails(@RequestBodyInviteEmailRequestreq);
59+
/**
60+
* @param emails email addresses to send the invitation to
61+
* @param inviteLink the link to be included in the email
62+
*/
63+
publicrecordInviteEmailRequest(String[]emails,StringorgId) {
64+
}
4965

5066
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp