Integration tests for connection requests

Author: oharsta

server/src/main/java/access/api/IdentityProviderController.java

@@ -16,6 +16,8 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,15 +62,15 @@ public IdentityProviderController(UserRepository userRepository,
     public ResponseEntity<Map<String, Object>> connect(User user, @RequestBody @Validated ConnectionRequest connectionRequest) {
         LOG.debug("/connect SP to IdP connection for " + user.getEmail());
 
+        String idpManageIdentifier = connectionRequest.getIdpManageIdentifier();
+        Organization organization = organizationRepository.findByManageIdentifier(idpManageIdentifier)
+                .orElseThrow(() -> new NotFoundException("Organization with manageIdentifier not found: " + idpManageIdentifier));
+
         Map<String, Object> serviceProvider = manage.providerById(connectionRequest.getEntityType(),
                 connectionRequest.getApplicationManageIdentifier(), Environment.PROD);
 
-        String idpManageIdentifier = connectionRequest.getIdpManageIdentifier();
         Map<String, Object> identityProvider = manage.providerById(EntityType.saml20_idp, idpManageIdentifier, Environment.PROD);
 
-        Organization organization = organizationRepository.findByManageIdentifier(idpManageIdentifier)
-                .orElseThrow(() -> new NotFoundException("Organization with manageIdentifier not found: " + idpManageIdentifier));
-
         User userFromDB = reinitializeUser(user, userRepository);
         //See https://github.com/OpenConext/OpenConext-access/wiki/Service-Connect-Flow
         boolean memberRequest = !userFromDB.isSuperUser();
@@ -105,14 +107,17 @@ public ResponseEntity<Map<String, Object>> connect(User user, @RequestBody @Vali
                 .equals(idpInstitutionGUID);
         boolean connectWithoutInteraction = idpAndSpShareInstitution || !connectOption.equals(DashBoardConnectionOption.connectWithInteraction);
         if (connectWithoutInteraction) {
-            manage.connectWithoutInteraction(identityProvider, serviceProvider, userFromDB);
+                manage.connectWithoutInteraction(identityProvider, serviceProvider, userFromDB);
             if (connectOption.equals(DashBoardConnectionOption.connectWithoutInteractionWithEmail)) {
-                mailBox.sendNewConnectionCreated(
-                        userFromDB,
-                        contactPersons(serviceProvider),
-                        getProviderName(identityProvider),
-                        getProviderName(serviceProvider),
-                        (String) getData(serviceProvider).get("entityid"));
+                List<String> recipients = contactPersons(serviceProvider);
+                if (!CollectionUtils.isEmpty(recipients)) {
+                    mailBox.sendNewConnectionCreated(
+                            userFromDB,
+                            recipients,
+                            getProviderName(identityProvider),
+                            getProviderName(serviceProvider),
+                            (String) getData(serviceProvider).get("entityid"));
+                }
             }
             return Results.createResult();
         }

server/src/main/java/access/mail/MailBox.java

@@ -93,7 +93,7 @@ public void sendConnectionRequest(User requester,
         variables.put("serviceProviderName", serviceProviderName);
         variables.put("organization", organization);
         variables.put("requester", requester);
-        variables.put("deepLink", String.format("%s/%s", clientUrl, deepLink));
+        variables.put("deepLink", String.format("%s%s", clientUrl, deepLink));
         if (!environment.equalsIgnoreCase("prod")) {
             variables.put("environment", environment);
         }

server/src/main/java/access/model/ConnectionRequest.java

@@ -1,12 +1,16 @@
 package access.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.io.Serializable;
 
 @Getter
 @Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class ConnectionRequest implements Serializable {
 
     private String applicationManageIdentifier;

server/src/main/resources/manage/oidc10_rp.json

@@ -12,7 +12,10 @@
         "OrganizationName:en": "SURF bv",
         "logo:0:url": "https://static.surfconext.nl/media/idp/surfconext.png",
         "coin:institution_guid": "ad93daef-0911-e511-80d0-005056956c1a",
-        "coin:application_url": "https://default-url-calendar.org"
+        "coin:application_url": "https://default-url-calendar.org",
+        "coin:dashboard_connect_option": "connect_without_interaction_with_email",
+        "contacts:0:contactType": "support",
+        "contacts:0:emailAddress": "support@cal.com"
       }
     }
   },
@@ -28,7 +31,8 @@
         "name:nl": "Cloud NL",
         "OrganizationName:en": "SURF bv",
         "logo:0:url": "https://static.surfconext.nl/media/idp/surfconext.png",
-        "coin:application_url": "https://default-url-cloud.org"
+        "coin:application_url": "https://default-url-cloud.org",
+        "coin:dashboard_connect_option": "connect_without_interaction_without_email"
       }
     }
   },

server/src/main/resources/templates/connection_request_en.html

@@ -18,7 +18,7 @@
         <p class="title" style="">Hello,</p>
 
         <p><strong>{{requester.name}}</strong>
-            has requested to connect service {{serviceProviderName} to your organization {{organization.name}}.</p>
+            has requested to connect service {{serviceProviderName}} to your organization {{organization.name}}.</p>
 
         {{#message}}
         <p style="margin: 20px 0 0 0;">Personal message from {{invitation.invitee.name}}</p>

server/src/test/java/access/AbstractMailTest.java

@@ -9,11 +9,14 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         properties = {
@@ -54,12 +57,9 @@ protected MimeMessageParser mailMessage() {
         return parser.parse();
     }
 
-    protected List<MimeMessageParser> allMailMessages(int expectedLength) {
-        await().until(() -> greenMail.getReceivedMessages().length == expectedLength);
-        MimeMessage[] receivedMessages = greenMail.getReceivedMessages();
-        return Stream.of(receivedMessages)
-                .map(this::mimeMessageParser)
-                .collect(Collectors.toList());
+    protected void confirmNoMailMessages() {
+        await().atLeast(Duration.ofSeconds(1L));
+        assertEquals(0, greenMail.getReceivedMessages().length);
     }
 
     @SneakyThrows

server/src/test/java/access/AbstractTest.java

@@ -47,6 +47,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import javax.sql.DataSource;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -152,6 +153,9 @@ public abstract class AbstractTest {
     @Autowired
     protected OrganizationMembershipRepository organizationMembershipRepository;
 
+    @Autowired
+    protected DataSource dataSource;
+
     protected LocalManage localManage;
 
     protected final Map<String, Long> seedIdentifiers = new HashMap<>();