Release 1.1.9

Author: oharsta

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.9
+
+- Added debug logging for CRM endpoints
+
+## 1.1.8
+
+- Fix: in attribute aggregation for authorization roles ensure the role is a valid CRM role
+
 ## 1.1.7
 
 - Fix: Duplicate key exception for CRM invitations

client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-client</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>invite</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
     <packaging>pom</packaging>
     <name>invite</name>
     <description>SURFconext Invite</description>

provisioning-mock/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-server</artifactId>

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

@@ -269,8 +269,14 @@ public ResponseEntity<ProfileResponse> query(@RequestParam(value = "uid", requir
     @PreAuthorize("hasRole('CRM')")
     public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@RequestBody ConnectionStatus connectionStatus) {
         String crmOrganisationId = connectionStatus.organisationId();
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(String.format("/crm/api/v1/profiles for crmOrganisationId %s", crmOrganisationId));
+        }
         Optional<Organisation> optionalOrganisation = organisationRepository.findByCrmOrganisationId(crmOrganisationId);
         if (optionalOrganisation.isEmpty()) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(String.format("/crm/api/v1/profiles No organisation found for %s", crmOrganisationId));
+            }
             return ResponseEntity.ok(Map.of());
         }
         Organisation organisation = optionalOrganisation.get();
@@ -287,6 +293,9 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                                     CRMStatusCode.Paired.getStatus(), CRMStatusCode.Paired.getStatusCode()
                             )
                     ));
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(String.format("/crm/api/v1/profiles connectionStatus.connected is true. Returning %s", responseMap));
+            }
             return ResponseEntity.ok(responseMap);
         } else {
             Map<String, ConnectionStatusResponse> responseMap = invitationRepository
@@ -313,6 +322,9 @@ public ResponseEntity<Map<String, ConnectionStatusResponse>> connectionStatus(@R
                             },
                             (existing, replacement) -> replacement
                     ));
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(String.format("/crm/api/v1/profiles connectionStatus.connected is false. Returning %s", responseMap));
+            }
             return ResponseEntity.ok(responseMap);
         }
     }
@@ -336,6 +348,9 @@ private CRMStatusCode crmStatusCode(Invitation invitation) {
     @SecurityRequirement(name = API_HEADER_SCHEME_NAME)
     @PreAuthorize("hasRole('CRM')")
     public ResponseEntity<ResendInvitationResponse> resendInvitation(@RequestBody ResendInvitation resendInvitation) {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(String.format("/crm/api/v1/invite/resend for %s", resendInvitation));
+        }
         List<Invitation> invitations = invitationRepository.findByCrmContactIdAndCrmOrganisationId(resendInvitation.crmContatcId(),
                 resendInvitation.crmOrganisationId());
         invitations.forEach(invitation -> {
@@ -355,7 +370,11 @@ public ResponseEntity<ResendInvitationResponse> resendInvitation(@RequestBody Re
 
         });
         String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));
-        return ResponseEntity.ok(new ResendInvitationResponse(timestamp, 200, "ok", "Resend invitation"));
+        ResendInvitationResponse response = new ResendInvitationResponse(timestamp, 200, "ok", "Resend invitation");
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(String.format("/crm/api/v1/invite/resend returning %s", response));
+        }
+        return ResponseEntity.ok(response);
     }
 
     @PostMapping(value = "/crm/api/v1/invite/remove", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -391,6 +410,10 @@ public ResponseEntity<String> remove(@RequestBody RemoveRoles removeRoles) {
     @SecurityRequirement(name = API_HEADER_SCHEME_NAME)
     @PreAuthorize("hasRole('CRM')")
     public ResponseEntity<List<CRMOrganisation>> organisations() {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("/crm/api/v1/organisations called");
+        }
+
         List<Organisation> organisations = organisationRepository.findByCrmOrganisationIdIsNotNull();
         List<CRMOrganisation> crmOrganisations = organisations.stream()
                 .map(organisation -> new CRMOrganisation(
@@ -399,6 +422,9 @@ public ResponseEntity<List<CRMOrganisation>> organisations() {
                         organisation.getCrmOrganisationName()
                 ))
                 .toList();
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(String.format("/crm/api/v1/organisations returning %s", crmOrganisations));
+        }
         return ResponseEntity.ok(crmOrganisations);
     }
 

server/src/test/java/invite/AbstractTest.java

@@ -834,8 +834,9 @@ protected void seedUserRoleAudits(Instant createdAt) {
 
     @SafeVarargs
     protected final <M> void doSave(JpaRepository<M, Long> repository, M... entities) {
-        repository.saveAll(Arrays.asList(entities));
+        Arrays.asList(entities).forEach(entity -> {
+            repository.save(entity);
+        });
     }
 
-
 }

welcome/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.8</version>
+        <version>1.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-welcome</artifactId>