Merge pull request #7 from Setasign/BetterErrorHandling

Better error handling
Setasign · Apr 18, 2023 · d2c81c5 · d2c81c5
2 parents 6af1635 + 6e50f85
commit d2c81c5
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 83 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/examples/appearance-demo.php b/examples/appearance-demo.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use setasign\SetaPDF\Signer\Module\CSC\Client;
+use setasign\SetaPDF\Signer\Module\CSC\ClientException;
 use setasign\SetaPDF\Signer\Module\CSC\Module;
 
 ini_set('display_errors', '1');
@@ -108,7 +109,19 @@
 $appearance = new SetaPDF_Signer_Signature_Appearance_Dynamic($module);
 $signer->setAppearance($appearance);
 
-$signer->sign($module);
+try {
+    $signer->sign($module);
+} catch (ClientException $e) {
+    echo 'An error occured:';
+    echo $e->getMessage() . ': ' . $e->getResponse()->getBody();
+    echo '<br/><a href="?">restart</a>';
+    die();
+} catch (\Exception $e) {
+    echo 'An error occured:';
+    echo $e->getMessage();
+    echo '<br/><a href="?">restart</a>';
+    die();
+}
 
 echo '<a href="data:application/pdf;base64,' . base64_encode(file_get_contents($resultPath)) . '" ' .
     'download="' . basename($resultPath) . '">download</a> | <a href="?">restart</a><br />';
diff --git a/examples/assets/SSL.com.dev-ca.cer b/examples/assets/SSL.com.dev-ca.cer
diff --git a/examples/async-demo.php b/examples/async-demo.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use League\OAuth2\Client\OptionProvider\OptionProviderInterface;
+use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\GenericProvider;
 use SetaPDF_Signer_Digest as Digest;
 use setasign\SetaPDF\Signer\Module\CSC\Client;
@@ -26,7 +28,7 @@
 $settings = require 'settings.php';
 $apiUri = $settings['apiUri'];
 
-$fileToSign = __DIR__ . '/Laboratory-Report.pdf';
+$fileToSign = __DIR__ . '/assets/Laboratory-Report.pdf';
 $resultPath = 'signed.pdf';
 
 
@@ -56,7 +58,23 @@
     'urlAuthorize' => $oauth2Urls['urlAuthorize'],
     'urlAccessToken' => $oauth2Urls['urlAccessToken'],
     'urlResourceOwnerDetails' => $oauth2Urls['urlResourceOwnerDetails'],
-]);
+] /*
+ // If your OAuth endpoint requires a JSON document instead of a form-encoded document pass following "optionProvider"
+ // to the GenericProvider constructor:
+ , [
+    'optionProvider' => new class implements OptionProviderInterface {
+        public function getAccessTokenOptions($method, array $params)
+        {
+            $options = ['headers' => ['content-type' => 'application/json']];
+
+            if ($method === AbstractProvider::METHOD_POST) {
+                $options['body'] = json_encode($params);
+            }
+
+            return $options;
+        }
+    }
+]*/);
 
 $action = $_GET['action'] ?? 'preview';
 // if the oauth request was unsuccessful, return to preSign

diff --git a/examples/demo.php b/examples/demo.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use setasign\SetaPDF\Signer\Module\CSC\Client;
+use setasign\SetaPDF\Signer\Module\CSC\ClientException;
 use setasign\SetaPDF\Signer\Module\CSC\Module;
 
 ini_set('display_errors', '1');
@@ -93,8 +94,19 @@
 
 // create the signer instance
 $signer = new SetaPDF_Signer($document);
-
-$signer->sign($module);
+try {
+    $signer->sign($module);
+} catch (ClientException $e) {
+    echo 'An error occured:';
+    echo $e->getMessage() . ': ' . $e->getResponse()->getBody();
+    echo '<br/><a href="?">restart</a>';
+    die();
+} catch (\Exception $e) {
+    echo 'An error occured:';
+    echo $e->getMessage();
+    echo '<br/><a href="?">restart</a>';
+    die();
+}
 
 echo '<a href="data:application/pdf;base64,' . base64_encode(file_get_contents($resultPath)) . '" ' .
     'download="' . basename($resultPath) . '">download</a> | <a href="?">restart</a><br />';