Optimized signature extraction process.

Author: JanSlabon

src/SetaPDF/Signer/SwisscomAIS/Batch.php

@@ -33,6 +33,13 @@ class SetaPDF_Signer_SwisscomAIS_Batch extends SetaPDF_Signer_SwisscomAIS_Abstra
      */
     protected $_fieldName = 'Signature';
 
+    /**
+     * The last signature/timestamp result.
+     *
+     * @var array
+     */
+    protected $_signatures = array();
+
     /**
      * Set the signature content length that will be used to reserve space for the final signature.
      *
@@ -90,6 +97,7 @@ public function getSignatureFieldName()
      */
     public function sign(array $documents, $updateDss = false, $signatureProperties = array())
     {
+        $this->_signatures = array();
         $digestMethod = $this->_getDigestMethod();
 
         $data = array();
@@ -173,6 +181,8 @@ public function sign(array $documents, $updateDss = false, $signatureProperties
             $signature = $signatureData->Base64Signature->_;
             $no = $signatureData->WhichDocument;
 
+            $this->_signatures[$no] = $signature;
+
             $documentData = $data[$no];
             /**
              * @var $signer SetaPDF_Signer
@@ -290,6 +300,8 @@ public function timestamp(array $documents, $updateDss = false)
             $timestamp = $timestampData->Timestamp->RFC3161TimeStampToken;
             $no = $timestampData->WhichDocument;
 
+            $this->_signatures[$no] = $timestamp;
+
             $documentData = $data[$no];
             /**
              * @var $signer SetaPDF_Signer
@@ -312,4 +324,14 @@ public function timestamp(array $documents, $updateDss = false)
 
         return true;
     }
+
+    /**
+     * Get the last signatures/timestamps.
+     *
+     * @return array
+     */
+    public function getSignatures()
+    {
+        return $this->_signatures;
+    }
 }

src/SetaPDF/Signer/SwisscomAIS/Helper.php

@@ -30,37 +30,16 @@ static public function getSignatureData($signature)
     {
         if ($signature instanceof SetaPDF_Signer_SwisscomAIS_Batch) {
             $result = array();
+            $signatures = $signature->getSignatures();
 
-            $lastResult = $signature->getLastResult();
-            $signatures = $lastResult->SignResponse->SignatureObject->Other->SignatureObjects->ExtendedSignatureObject;
-            if (!is_array($signatures)) {
-                $signatures = array($signatures);
-            }
-
-            foreach ($signatures AS $signatureData) {
-                if (isset($signatureData->Timestamp->RFC3161TimeStampToken)) {
-                    $signature = $signatureData->Timestamp->RFC3161TimeStampToken;;
-                } else {
-                    $signature = $signatureData->Base64Signature->_;
-                }
-
-                $no = $signatureData->WhichDocument;
-
+            foreach ($signatures AS $no => $signature) {
                 $result[$no] = self::_getSignatureData($signature);
             }
 
             return $result;
 
         } elseif ($signature instanceof SetaPDF_Signer_SwisscomAIS_Module) {
-            $lastResult = $signature->getLastResult();
-            // signature
-            if (isset($lastResult->SignResponse->SignatureObject->Base64Signature)) {
-                $signature = $lastResult->SignResponse->SignatureObject->Base64Signature->_;
-            } elseif (isset($lastResult->SignResponse->SignatureObject->Timestamp->RFC3161TimeStampToken)) {
-                $signature = $lastResult->SignResponse->SignatureObject->Timestamp->RFC3161TimeStampToken;
-            } else {
-                throw new InvalidArgumentException('Unable to get signature from module.');
-            }
+            $signature = $signature->getSignature();
         }
 
         return self::_getSignatureData($signature);

src/SetaPDF/Signer/SwisscomAIS/Module.php

@@ -21,6 +21,13 @@ class SetaPDF_Signer_SwisscomAIS_Module extends SetaPDF_Signer_SwisscomAIS_Abstr
     SetaPDF_Signer_Signature_Module_ModuleInterface,
     SetaPDF_Signer_Timestamp_Module_ModuleInterface
 {
+    /**
+     * The last signature/timestamp result.
+     *
+     * @var string
+     */
+    protected $_signature;
+
     /**
      * Implementation of the createSignautre() method.
      *
@@ -82,7 +89,8 @@ public function createSignature($tmpPath)
             throw $exception;
         }
 
-        return $this->_lastResult->SignResponse->SignatureObject->Base64Signature->_;
+        $this->_signature = $this->_lastResult->SignResponse->SignatureObject->Base64Signature->_;
+        return $this->_signature;
     }
 
     /**
@@ -137,6 +145,17 @@ public function createTimestamp($data)
             throw $exception;
         }
 
-        return $this->_lastResult->SignResponse->SignatureObject->Timestamp->RFC3161TimeStampToken;
+        $this->_signature = $this->_lastResult->SignResponse->SignatureObject->Timestamp->RFC3161TimeStampToken;
+        return $this->_signature;
+    }
+
+    /**
+     * Get the last signature/timestamp.
+     *
+     * @return string
+     */
+    public function getSignature()
+    {
+        return $this->_signature;
     }
 }