Fixes #239

.gitignore

@@ -43,3 +43,4 @@ NOTES.txt
 private_key_pkcs8.pem
 JSON.md
 spieldata
+teams-api-calls.md

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

@@ -124,24 +124,7 @@ public ResponseEntity<Void> deleteInvitation(@PathVariable("id") Long id,
     @PutMapping("/{id}")
     public ResponseEntity<Map<String, Integer>> resendInvitation(@PathVariable("id") Long id,
                                                                  @Parameter(hidden = true) User user) {
-        LOG.debug(String.format("/resendInvitation/%s by user %s", id, user.getEduPersonPrincipalName()));
-        //We need to assert validations on the roles soo we need to load them
-        Invitation invitation = invitationRepository.findById(id).orElseThrow(() -> new NotFoundException("Invitation not found"));
-        List<Role> requestedRoles = invitation.getRoles().stream()
-                .map(InvitationRole::getRole).toList();
-        Authority intendedAuthority = invitation.getIntendedAuthority();
-        UserPermissions.assertValidInvitation(user, intendedAuthority, requestedRoles);
-        List<GroupedProviders> groupedProviders = manage.getGroupedProviders(requestedRoles);
-
-        mailBox.sendInviteMail(user, invitation, groupedProviders, invitation.getLanguage());
-        if (invitation.getExpiryDate().isBefore(Instant.now())) {
-            invitation.setExpiryDate(Instant.now().plus(Period.ofDays(14)));
-            invitationRepository.save(invitation);
-        }
-
-        AccessLogger.invitation(LOG, Event.Resend, invitation);
-
-        return Results.createResult();
+        return this.invitationOperations.resendInvitation(id, user, null);
     }
 
     @GetMapping("public")

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

@@ -7,6 +7,7 @@
 import access.logging.Event;
 import access.mail.MailBox;
 import access.model.*;
+import access.repository.InvitationRepository;
 import access.security.RemoteUser;
 import access.security.RemoteUserPermissions;
 import access.security.UserPermissions;
@@ -18,9 +19,11 @@
 import org.springframework.util.CollectionUtils;
 
 import java.time.Instant;
+import java.time.Period;
 import java.time.temporal.ChronoUnit;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 import static java.util.stream.Collectors.toSet;
 
@@ -106,4 +109,38 @@ public ResponseEntity<InvitationResponse> sendInvitation(InvitationRequest invit
         return ResponseEntity.status(HttpStatus.CREATED).body(new InvitationResponse(HttpStatus.CREATED.value(), recipientInvitationURLs));
     }
 
+    public ResponseEntity<Map<String, Integer>> resendInvitation(Long id,
+                                                                 User user,
+                                                                 RemoteUser remoteUser) {
+        String name = user != null ? user.getEduPersonPrincipalName() : remoteUser.getDisplayName();
+
+        LOG.debug(String.format("/resendInvitation/%s by user %s", id, name));
+
+        //We need to assert validations on the roles soo we need to load them
+        InvitationRepository invitationRepository = this.invitationResource.getInvitationRepository();
+
+        Invitation invitation = invitationRepository.findById(id).orElseThrow(() -> new NotFoundException("Invitation not found"));
+        List<Role> requestedRoles = invitation.getRoles().stream()
+                .map(InvitationRole::getRole).toList();
+        Authority intendedAuthority = invitation.getIntendedAuthority();
+        if (user != null) {
+            UserPermissions.assertValidInvitation(user, intendedAuthority, requestedRoles);
+        } else {
+            RemoteUserPermissions.assertApplicationAccess(remoteUser, requestedRoles);
+        }
+
+        List<GroupedProviders> groupedProviders = this.invitationResource.getManage().getGroupedProviders(requestedRoles);
+        Provisionable provisionable = user != null ? user : remoteUser;
+
+        this.invitationResource.getMailBox().sendInviteMail(provisionable, invitation, groupedProviders, invitation.getLanguage());
+        if (invitation.getExpiryDate().isBefore(Instant.now())) {
+            invitation.setExpiryDate(Instant.now().plus(Period.ofDays(14)));
+            invitationRepository.save(invitation);
+        }
+
+        AccessLogger.invitation(LOG, Event.Resend, invitation);
+
+        return Results.createResult();
+    }
+
 }

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

@@ -78,7 +78,7 @@ public RoleController(Config config,
     public ResponseEntity<List<Role>> rolesByApplication(@Parameter(hidden = true) User user) {
         LOG.debug(String.format("/roles for user %s", user.getEduPersonPrincipalName()));
 
-        if (user.isSuperUser() && !config.isRoleSearchRequired()) {
+        if (user.isSuperUser()) {
             return ResponseEntity.ok(manage.addManageMetaData(roleRepository.findAll()));
         }
         UserPermissions.assertAuthority(user, Authority.INSTITUTION_ADMIN);