Added test for #378

Author: oharsta

server/src/test/java/access/api/InvitationControllerTest.java

@@ -26,6 +26,7 @@
 import static access.security.SecurityConfig.API_TOKEN_HEADER;
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static io.restassured.RestAssured.given;
+import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("unchecked")
@@ -86,6 +87,7 @@ void newInvitation() throws Exception {
                 false,
                 List.of("new@new.nl"),
                 roleIdentifiers,
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));
 
@@ -118,7 +120,8 @@ void newInvitationEmptyRoles() throws Exception {
                 false,
                 false,
                 List.of("new@new.nl"),
-                Collections.emptyList(),
+                emptyList(),
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));
 
@@ -152,6 +155,7 @@ void newInvitationWithInvitationUrls() throws Exception {
                 true,
                 List.of("new@new.nl"),
                 roleIdentifiers,
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));
 
@@ -613,6 +617,7 @@ void newInvitationInvalidEmail() throws Exception {
                 false,
                 List.of("nope"),
                 roleIdentifiers,
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));
 
@@ -807,5 +812,64 @@ void invitationsSearchInviterWithKeyword404() throws Exception {
                 .statusCode(404);
     }
 
+    @Test
+    void newInvitationInstitutionAdmin() throws Exception {
+        //Because the user is changed and provisionings are queried
+        stubForManageProvidersAllowedByIdP(ORGANISATION_GUID);
+        AccessCookieFilter accessCookieFilter = openIDConnectFlow("/api/v1/users/login", INSTITUTION_ADMIN_SUB);
+
+        stubForManageProviderById(EntityType.SAML20_SP, "1");
+
+        InvitationRequest invitationRequest = new InvitationRequest(
+                Authority.INSTITUTION_ADMIN,
+                "Message",
+                Language.en,
+                false,
+                false,
+                false,
+                false,
+                List.of("new@new.nl"),
+                emptyList(),
+                ORGANISATION_GUID,
+                Instant.now().plus(365, ChronoUnit.DAYS),
+                Instant.now().plus(12, ChronoUnit.DAYS));
+
+        Map<String, Object> results = given()
+                .when()
+                .filter(accessCookieFilter.cookieFilter())
+                .accept(ContentType.JSON)
+                .header(accessCookieFilter.csrfToken().getHeaderName(), accessCookieFilter.csrfToken().getToken())
+                .contentType(ContentType.JSON)
+                .body(invitationRequest)
+                .post("/api/v1/invitations")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(201, results.get("status"));
+        List recipientInvitationURLs = (List) results.get("recipientInvitationURLs");
+        assertEquals(1, recipientInvitationURLs.size());
+        //Now Accept the invitation with a new user
+        String invitationURL = ((Map<String, String>) recipientInvitationURLs.getFirst()).get("invitationURL");
+        MultiValueMap<String, String> queryParams = UriComponentsBuilder.fromUriString(invitationURL).build().getQueryParams();
+        String hash = queryParams.getFirst("hash");
+        Invitation invitation = invitationRepository.findByHash(hash).get();
+
+        AccessCookieFilter guestAccessCookieFilter = openIDConnectFlow("/api/v1/users/login", "user@dodo.com");
+        AcceptInvitation acceptInvitation = new AcceptInvitation(hash, invitation.getId());
+        given()
+                .when()
+                .filter(guestAccessCookieFilter.cookieFilter())
+                .accept(ContentType.JSON)
+                .header(guestAccessCookieFilter.csrfToken().getHeaderName(), guestAccessCookieFilter.csrfToken().getToken())
+                .contentType(ContentType.JSON)
+                .body(acceptInvitation)
+                .post("/api/v1/invitations/accept")
+                .then()
+                .statusCode(201);
+
+        User user = userRepository.findBySubIgnoreCase("user@dodo.com").get();
+        assertTrue(user.isInstitutionAdmin());
+        assertTrue(user.isInstitutionAdminByInvite());
+    }
+
 
 }

server/src/test/java/access/api/InvitationMailControllerTest.java

@@ -60,6 +60,7 @@ void newInvitationCustomDisplayName() throws Exception {
                 false,
                 List.of("new@new.nl"),
                 roleIdentifiers,
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));
 

server/src/test/java/access/internal/InternalInviteControllerTest.java

@@ -139,6 +139,7 @@ void newInvitation() {
                 false,
                 List.of("new@new.nl"),
                 roleIdentifiers,
+                null,
                 Instant.now().plus(365, ChronoUnit.DAYS),
                 Instant.now().plus(12, ChronoUnit.DAYS));