Merge pull request #4 from InternationalCodeCouncil/exception-handling

exception-handling
InternationalCodeCouncil · May 15, 2023 · e7670b3 · e7670b3
2 parents 95b4802 + 6513d87
commit e7670b3
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Exception/CognitoResponseException.php b/src/Exception/CognitoResponseException.php
@@ -20,14 +20,19 @@ public function __construct(Throwable $previous = null)
      * @param CognitoIdentityProviderException $e
      * @return Exception
      */
-    public static function createFromCognitoException(CognitoIdentityProviderException $e)
+    public static function createFromCognitoException(Exception $e)
     {
-        $errorClass = "pmill\\AwsCognito\\Exception\\" . $e->getAwsErrorCode();
+        //If the class is CognitoIdentityProviderException, perform this custom logic
+        //to get the actual AWS error
+        if (method_exists($e, 'getAwsErrorCode')) {
+            $errorClass = "pmill\\AwsCognito\\Exception\\" . $e->getAwsErrorCode();
 
-        if (class_exists($errorClass)) {
-            return new $errorClass($e);
+            if (class_exists($errorClass)) {
+                return new $errorClass($e);
+            }
         }
 
+        //Otherwise just return the Exception as is
         return $e;
     }
 }