Merge pull request #146 from silinternational/develop

Release 4.3.4 - error handling improvements
silinternational · May 4, 2023 · faa0e78 · faa0e78
2 parents 9a429b8 + ab6c1a2
commit faa0e78
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/application/common/components/adapters/IdpIdBroker.php b/application/common/components/adapters/IdpIdBroker.php
@@ -5,6 +5,7 @@
 use Exception;
 use InvalidArgumentException;
 use Sil\Idp\IdBroker\Client\IdBrokerClient;
+use Sil\Idp\IdBroker\Client\ServiceException;
 use Sil\Idp\IdSync\common\components\exceptions\MissingEmailException;
 use Sil\Idp\IdSync\common\components\IdBrokerBase;
 use Sil\Idp\IdSync\common\models\User;
@@ -136,10 +137,20 @@ public function getSiteStatus(): string
      * @param array|null $fields (Optional:) The list of fields desired about
      *     each user in the result.
      * @return User[] A list of Users.
+     * @throws Exception
      */
-    public function listUsers($fields = null)
+    public function listUsers($fields = null): array
     {
-        return self::getAsUsers($this->getClient()->listUsers($fields));
+        try {
+            $result = $this->getClient()->listUsers($fields);
+        } catch (ServiceException $e) {
+            $message = 'ID Broker returned non-OK status ' . $e->httpStatusCode;
+            throw new Exception($message, $e->getCode(), $e);
+        } catch (Exception $e) {
+            throw new Exception('error getting users list from ID Broker: ' . $e->getMessage(), $e);
+        }
+
+        return self::getAsUsers($result);
     }
 
     /**

diff --git a/application/common/components/adapters/SagePeopleIdStore.php b/application/common/components/adapters/SagePeopleIdStore.php
@@ -245,7 +245,7 @@ protected function getFromIdStore($whereClause): array
                 $response->getStatusCode(),
                 $response->getReasonPhrase(),
                 $response->getBody()
-            ), 1558380644);
+            ), $response->getStatusCode());
         }
 
         if (! is_array($body)) {

diff --git a/application/common/components/adapters/SecureUserIdStore.php b/application/common/components/adapters/SecureUserIdStore.php
@@ -116,7 +116,7 @@ public function getAllActiveUsers()
                 $response->getStatusCode(),
                 $response->getReasonPhrase(),
                 $response->getBody()
-            ), 1642083102);
+            ), $response->getStatusCode());
         }
 
         if (! is_array($allUsersInfo)) {

diff --git a/application/common/components/adapters/WorkdayIdStore.php b/application/common/components/adapters/WorkdayIdStore.php
@@ -120,7 +120,7 @@ public function getAllActiveUsers()
                 $response->getStatusCode(),
                 $response->getReasonPhrase(),
                 $response->getBody()
-            ), 1533069498);
+            ), $response->getStatusCode());
         }
 
         if (! is_array($allActiveUsers)) {

diff --git a/application/common/sync/Synchronizer.php b/application/common/sync/Synchronizer.php
@@ -420,13 +420,17 @@ public function syncAll()
         try {
             $idStoreUsers = $this->idStore->getAllActiveUsers();
         } catch (Exception $e) {
-            throw new Exception('Failed to get active users from ID Store: ' . $e->getMessage(), 1669770777);
+            throw new Exception('Failed to get active users from ID Store: ' . $e->getMessage(), $e->getCode(), $e);
         }
 
-        $idBrokerUserInfoByEmployeeId = $this->getAllIdBrokerUsersByEmployeeId([
-            'employee_id',
-            'active',
-        ]);
+        try {
+            $idBrokerUserInfoByEmployeeId = $this->getAllIdBrokerUsersByEmployeeId([
+                'employee_id',
+                'active',
+            ]);
+        } catch (Exception $e) {
+            throw new Exception('Failed to list users in the ID Broker: ' . $e->getMessage(), $e->getCode(), $e);
+        }
 
         $numActiveUsersInBroker = $this->getNumActiveUsersInBroker(
             $idBrokerUserInfoByEmployeeId