Updatre WHMv1 create() add additional debug data to error results

upmind · Dec 4, 2024 · 53ef893 · 53ef893
1 parent 889a551
commit 53ef893
Showing 1 changed file with 39 additions and 23 deletions.
diff --git a/src/WHMv1/Provider.php b/src/WHMv1/Provider.php
@@ -206,6 +206,11 @@ public function create(CreateParams $params): AccountInfo
                     if ($createException instanceof ProvisionFunctionError) {
                         throw $createException->withData(array_merge($createException->getData(), [
                             'get_info_error_after_timeout' => $getInfoException->getMessage(),
+                            'params' => [
+                                'username' => $username,
+                                'domain' => $domain,
+                                'password' => $password,
+                            ],
                         ]));
                     }
                 }
@@ -224,38 +229,49 @@ public function create(CreateParams $params): AccountInfo
      */
     protected function finishCreate(CreateParams $params, string $domain, string $username, string $password): AccountInfo
     {
-        $info = $this->getAccountInfo($username)
-            ->setMessage('Account created');
+        try {
+            $info = $this->getAccountInfo($username)
+                ->setMessage('Account created');
 
-        if ($info->reseller && $params->reseller_options) {
-            try {
-                $this->changeResellerOptions($username, $params->reseller_options);
-            } catch (\Throwable $e) {
-                // clean-up
-                $this->deleteAccount($username);
+            if ($info->reseller && $params->reseller_options) {
+                try {
+                    $this->changeResellerOptions($username, $params->reseller_options);
+                } catch (\Throwable $e) {
+                    // clean-up
+                    $this->deleteAccount($username);
 
-                throw $e;
+                    throw $e;
+                }
             }
-        }
 
-        if ($this->configuration->softaculous_install) {
-            try {
-                $softaculous = $this->getSoftaculous($username, $password);
+            if ($this->configuration->softaculous_install) {
+                try {
+                    $softaculous = $this->getSoftaculous($username, $password);
 
-                if ($this->configuration->softaculous_install === 'wordpress') {
-                    $installation = $softaculous->installWordpress($domain, $params->email);
-                }
+                    if ($this->configuration->softaculous_install === 'wordpress') {
+                        $installation = $softaculous->installWordpress($domain, $params->email);
+                    }
 
-                $info->setSoftware($installation ?? null);
-            } catch (\Throwable $e) {
-                // clean-up
-                $this->deleteAccount($username);
+                    $info->setSoftware($installation ?? null);
+                } catch (\Throwable $e) {
+                    // clean-up
+                    $this->deleteAccount($username);
 
-                throw $e;
+                    throw $e;
+                }
             }
-        }
 
-        return $info;
+            return $info;
+        } catch (ProvisionFunctionError $e) {
+            $errorData = $e->getData();
+            $errorData['params'] = [
+                'username' => $username,
+                'domain' => $domain,
+                'password' => $password,
+            ];
+
+            throw $e->withData($errorData);
+        }
     }
 
     /**