Fixes #578

And quarantees no change requests for idempotent saves

Author: oharsta

client/src/pages/ApplicationDetail.jsx

@@ -2,7 +2,8 @@ import "./ApplicationDetail.scss";
 import "../styles/access_card.scss";
 import React, {useEffect, useState} from "react";
 import {
-    cancelServiceProviderConnectionRequest, cancelServiceProviderDisconnectionRequest,
+    cancelServiceProviderConnectionRequest,
+    cancelServiceProviderDisconnectionRequest,
     connectServiceProviderToIdentityProvider,
     disconnectServiceProviderToIdentityProvider,
     getPolicyByServiceProviderEntityId,
@@ -467,10 +468,10 @@ const ApplicationDetail = ({anonymous, refreshUser}) => {
                                     message={I18n.t("appAccess.requestedAccessNotification")}/>
                 }
                 {pendingDisconnect && <Alert alertType={AlertType.Warning}
-                                    asChild={true}
-                                    children={<a href="/" onClick={e => cancelDisconnectionRequest(true, e)}>
-                                        {I18n.t("appAccess.cancelRequest")}</a>}
-                                    message={I18n.t("appAccess.requestedDisconnectNotification")}/>
+                                             asChild={true}
+                                             children={<a href="/" onClick={e => cancelDisconnectionRequest(true, e)}>
+                                                 {I18n.t("appAccess.cancelRequest")}</a>}
+                                             message={I18n.t("appAccess.requestedDisconnectNotification")}/>
                 }
                 <div className={`app-access ${readOnly ? "read-only" : ""}`} onClick={e => readOnly && stopEvent(e)}>
                     {showPolicyDetails &&
@@ -495,7 +496,7 @@ const ApplicationDetail = ({anonymous, refreshUser}) => {
                             <InfoBlock className="no-gap">
                                 <div className="grouped">
                                     <div>
-                                        <h3>{I18n.t("appAccess.users", {name: providerOrganizationName(I18n.locale, serviceProvider)})}</h3>
+                                        <h3>{I18n.t("appAccess.users", {name: currentOrganization.name})}</h3>
                                         <p>{I18n.t("appAccess.config")}</p>
                                     </div>
                                     <Button type={ButtonType.Primary}
@@ -507,7 +508,7 @@ const ApplicationDetail = ({anonymous, refreshUser}) => {
                                 </div>
                                 <div className="access-card large">
                                     <h4>{I18n.t(`appAccess.${isEmpty(policies) ? "everyBody" : "notEveryBody"}`,
-                                        {name: providerOrganizationName(I18n.locale, serviceProvider)})}</h4>
+                                        {name: currentOrganization.name})}</h4>
                                     {!isEmpty(policies) &&
                                         <Chip type={ChipType.Status_info}
                                               label={I18n.t("appAccess.policies", {nbr: policies.length})}

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

@@ -50,8 +50,7 @@
 import static access.SwaggerOpenIdConfig.API_TOKENS_SCHEME_NAME;
 import static access.SwaggerOpenIdConfig.OPEN_ID_SCHEME_NAME;
 import static access.api.Results.deleteResult;
-import static access.manage.ManageData.getData;
-import static access.manage.ManageData.getMetaDataFields;
+import static access.manage.ManageData.*;
 
 @RestController
 @RequestMapping(value = {"/api/v1/connections"}, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -271,15 +270,25 @@ public ResponseEntity<List<Map<String, Object>>> identityProvidersByAllowedConne
         return ResponseEntity.ok(identityProviders);
     }
 
+    private List<ChangeRequest> filterExistingChangeRequestDuplicates(List<Map<String, Object>> existingChangeRequests, List<ChangeRequest> newChangeRequests) {
+        if (isEmpty(existingChangeRequests) && !isEmpty(newChangeRequests)) {
+            return newChangeRequests;
+        }
+        return newChangeRequests.stream()
+                .filter(changeRequest ->
+                        existingChangeRequests.stream().noneMatch(changeRequestMap -> changeRequest.matches(changeRequestMap))
+                ).toList();
+    }
 
     @SuppressWarnings("unchecked")
     private Connection productionReadyChangeRequests(Connection connection, User user) {
         Environment environment = connection.getEnvironment();
         String changeRequestURL = manage.changeRequestURL(environment, connection);
         Map<String, Object> provider = manage.providerByConnection(connection);
         connection.updateRemoteManageData(provider);
-
-        List<ChangeRequest> changeRequests = connectionProviderConverter.deduceChangeRequests(connection, provider);
+        List<Map<String, Object>> existingChangeRequests = manage.getChangeRequests(Environment.PROD, connection);
+        List<ChangeRequest> allChangeRequests = connectionProviderConverter.deduceChangeRequests(connection, provider);
+        List<ChangeRequest> changeRequests = filterExistingChangeRequestDuplicates(existingChangeRequests, allChangeRequests);
         if (!changeRequests.isEmpty()) {
             String entityId = (String) ((Map) provider.get("data")).get("entityid");
             String summary = String.format("Data change requested by %s for %s with entityID %s",

server/src/main/java/access/manage/ChangeRequest.java

@@ -2,13 +2,15 @@
 
 
 import access.model.EntityType;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 
 import java.io.Serializable;
 import java.util.Map;
+import java.util.Objects;
 
 @NoArgsConstructor
 @Getter
@@ -62,4 +64,14 @@ public void setAuditData(Map<String, Object> auditData) {
         this.auditData = auditData;
         this.note = auditData != null ? (String) auditData.get("notes") : null;
     }
+
+    @JsonIgnore
+    public boolean matches(Map<String, Object> changeRequestMap) {
+        String pathUpdateTypeString = this.pathUpdateType != null ? this.pathUpdateType.name() : null;
+        String requestTypeString = this.requestType != null ? this.requestType.name() : null;
+        return Objects.equals(changeRequestMap.get("pathUpdateType"), pathUpdateTypeString) &&
+                Objects.equals(changeRequestMap.get("requestType"), requestTypeString) &&
+                Objects.equals(changeRequestMap.get("pathUpdates"), pathUpdates) ;
+
+    }
 }

server/src/test/java/access/manage/ConnectionProviderConverterTest.java

@@ -42,7 +42,7 @@ void deduceChangeRequests() {
         List<ChangeRequest> changeRequests = connectionProviderConverter.deduceChangeRequests(connection, provider);
         assertEquals(1, changeRequests.size());
         ChangeRequest changeRequest = changeRequests.getFirst();
-        assertEquals(19, changeRequest.getPathUpdates().size());
+        assertEquals(18, changeRequest.getPathUpdates().size());
     }
 
     @SneakyThrows