WIP for #672

Author: oharsta

server/src/main/java/invite/crm/CRMController.java

@@ -6,6 +6,8 @@
 import invite.config.HashGenerator;
 import invite.exception.InvalidInputException;
 import invite.exception.NotFoundException;
+import invite.logging.AccessLogger;
+import invite.logging.Event;
 import invite.mail.MailBox;
 import invite.manage.EntityType;
 import invite.manage.Manage;
@@ -50,6 +52,10 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -276,6 +282,34 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
         }
     }
 
+    @PostMapping(value = "/crm/api/v1/invite/resend", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "Resend an invitation",
+            description = "Resend an invitation based on the CRM OrganisationID and CRM ContactID")
+    @SecurityRequirement(name = API_HEADER_SCHEME_NAME)
+    @PreAuthorize("hasRole('CRM')")
+    public ResponseEntity<ResendInvitationResponse> resendInvitation(@RequestBody ResendInvitation resendInvitation) {
+        List<Invitation> invitations = invitationRepository.findByCrmContactIdAndCrmOrganisationId(resendInvitation.crmContatcId(),
+                resendInvitation.crmOrganisationId());
+        invitations.forEach(invitation -> {
+            List<Role> requestedRoles = invitation.getRoles().stream()
+                    .map(InvitationRole::getRole).toList();
+            List<GroupedProviders> groupedProviders = manage.getGroupedProviders(requestedRoles);
+
+            mailBox.sendInviteMail(provisionable,
+                    invitation,
+                    groupedProviders,
+                    invitation.getLanguage(),
+                    Optional.empty());
+            invitation.setExpiryDate(Instant.now().plus(Period.ofDays(14)));
+            invitationRepository.save(invitation);
+
+            AccessLogger.invitation(LOG, Event.Resend, invitation);
+
+        });
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));
+        return ResponseEntity.ok(new ResendInvitationResponse(timestamp, 200, "ok", "Resend invitation"));
+    }
+
     private ProfileResponse crmUserNotFoundOrNoRoles() {
         return new ProfileResponse("Could not find any profiles with the given search parameters", 50, List.of());
     }

server/src/main/java/invite/crm/ResendInvitation.java

@@ -0,0 +1,7 @@
+package invite.crm;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record ResendInvitation(@JsonProperty("org_id")  String crmOrganisationId,
+                               @JsonProperty("guid")  String crmContatcId) {
+}

server/src/main/java/invite/crm/ResendInvitationResponse.java

@@ -0,0 +1,4 @@
+package invite.crm;
+
+public record ResendInvitationResponse(String timestamp, int status, String key, String message) {
+}

server/src/main/resources/application.yml

@@ -234,7 +234,9 @@ manage:
 springdoc:
   pathsToMatch:
     - "/api/external/v1/**"
-    - "/api/internal/v1/crm"
+    - "/crm/profile"
+    - "/api/profile"
+    - "/crm/api/v1/**"
   api-docs:
     enabled: true
     path: "/ui/api-docs"

server/src/test/java/invite/crm/CRMControllerTest.java

@@ -20,6 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -428,6 +430,31 @@ void scopeInviteRoleToUniqueCRMRoleIdAndOrganizationId() throws JsonProcessingEx
         assertEquals(2, roles.size());
     }
 
+    @Test
+    void resendInviteMail() throws Exception {
+        Invitation invitation = invitationRepository.findByHash(Authority.GUEST.name()).get();
+        invitation.setExpiryDate(Instant.now().minus(5, ChronoUnit.DAYS));
+        invitation.setCrmContactId(CRM_CONTACT_ID);
+        invitation.setCrmOrganisationId(CRM_ORGANIZATION_ID);
+        invitationRepository.save(invitation);
+
+        super.stubForManageProviderById(EntityType.OIDC10_RP, "5");
+        ResendInvitationResponse resendInvitationResponse = given()
+                .when()
+                .accept(ContentType.JSON)
+                .header(API_KEY_HEADER, "secret")
+                .contentType(ContentType.JSON)
+                .body(new ResendInvitation(CRM_ORGANIZATION_ID, CRM_CONTACT_ID))
+                .post("/crm/api/v1/invite/resend")
+                .as(new TypeRef<>() {
+                });
+        Invitation savedInvitation = invitationRepository.findByHash(Authority.GUEST.name()).get();
+        assertTrue(savedInvitation.getExpiryDate().isAfter(Instant.now().plus(13, ChronoUnit.DAYS)));
+
+        MimeMessageParser mailMessage = mailMessage();
+        assertEquals("Invitation for Mail at SURFconext Invite", mailMessage.getSubject());
+    }
+
     @Test
     void profileWithUidIdp() {
         this.seedCRMData();