Fix broken OrgIdentity Linking

app/Lib/CoHttpClient.php

@@ -30,7 +30,25 @@
 class CoHttpClient extends HttpSocket {
   protected $_baseUrl = null;
   protected $_requestOptions = array();
-
+
+
+  /**
+   * CoHttpClient constructor.
+   *
+   * @param array $config Configuration options for the HttpClient.
+   */
+  public function __construct($config = array())
+  {
+    if (!isset($config['timeout'])) {
+      // Initialize default values
+      // Set the default timeout to 5 seconds instead of 30.
+      $config['timeout'] = 5;
+    }
+    // Call the parent constructor
+    parent::__construct($config);
+
+  }
+
   /**
    * Build a URL using the configured base URL.
    *
@@ -189,11 +207,15 @@ public function setConfig($config) {
     }
 
     if(isset($config['ssl_verify_host'])) {
-      $this->config['ssl_verify_host'];
+      $this->config['ssl_verify_host'] = $config['ssl_verify_host'];
     }
 
     if(isset($config['ssl_verify_peer'])) {
-      $this->config['ssl_verify_peer'];
+      $this->config['ssl_verify_peer'] = $config['ssl_verify_peer'];
+    }
+
+    if(isset($config['timeout'])) {
+      $this->config['timeout'] = $config['timeout'];
     }
   }
 

app/Model/CoPipeline.php

@@ -309,25 +309,29 @@ public function execute($id, $orgIdentityId, $syncAction, $actorCoPersonId=null,
        ($syncAction == SyncActionEnum::Delete && !$pipeline['CoPipeline']['sync_on_delete'])) {
       return true;
     }
-
-    // We need to find a CO Person to operate on.
-    $targetIds = $this->findTargetCoPersonId($pipeline, $orgIdentityId, $actorCoPersonId);
-
-    if(!$targetIds['co_person_id']) {
-      // What we do here depends on the sync action. On add, we create a new CO Person.
-      // On update, we do not and abort. This will be a bit confusing if something goes wrong
-      // during an initial add, but short of a "force" (manual operation), there's
-      // not much else to do. On delete we also abort.
-
-      if($syncAction != SyncActionEnum::Add) {
-        // If we don't have a CO Person record on an update or delete, there's
-        // nothing to do. For relink, we expect the new target to already exist.
-        // (Relink to a "new" person should be submitted as an Add, since if
-        // "sync on add" is disabled we shouldn't create a new CO Person.)
-        return true;
+
+    // `findTargetCoPersonId` will try to save a new Link if the requirements are met. During
+    // an unlink action this will create a loop and it will eventually fail.
+    if ($syncAction !== SyncActionEnum::Unlink) {
+      // We need to find a CO Person to operate on.
+      $targetIds = $this->findTargetCoPersonId($pipeline, $orgIdentityId, $actorCoPersonId);
+      if(!$targetIds['co_person_id']) {
+        // What we do here depends on the sync action. On add, we create a new CO Person.
+        // On update, we do not and abort. This will be a bit confusing if something goes wrong
+        // during an initial add, but short of a "force" (manual operation), there's
+        // not much else to do. On delete we also abort.
+
+        if($syncAction != SyncActionEnum::Add) {
+          // If we don't have a CO Person record on an update or delete, there's
+          // nothing to do. For relink, we expect the new target to already exist.
+          // (Relink to a "new" person should be submitted as an Add, since if
+          // "sync on add" is disabled we shouldn't create a new CO Person.)
+          return true;
+        }
       }
+
     }
-    
+
     if(($syncAction == SyncActionEnum::Delete
         && !empty($pipeline['CoPipeline']['sync_status_on_delete']))
        || $syncAction == SyncActionEnum::Unlink) {