Issue #112 Tests for Sage Pay Form - encrypting and decrypting

Author: judgej

src/Message/Form/AuthorizeRequest.php

@@ -64,6 +64,25 @@ class AuthorizeRequest extends DirectAuthorizeRequest
         'FIRecipientDoB' => false,
     ];
 
+    /**
+     * Add the Form-specific details to the base data.
+     * @reurn array
+     */
+    public function getData()
+    {
+        $this->validate('currency', 'description', 'encryptionKey');
+
+        // The test mode is included to determine the redirect URL.
+
+        return [
+            'VPSProtocol' => $this->VPSProtocol,
+            'TxType' => $this->getTxType(),
+            'Vendor' => $this->getVendor(),
+            'Crypt' => $this->generateCrypt($this->getCryptData()),
+            'TestMode' => $this->getTestMode(),
+        ];
+    }
+
     /**
      * @return array the data required to be encoded into the form crypt field.
      */
@@ -107,8 +126,8 @@ public function getCryptData()
         // Two conditional checks on the "state" fields.
         // We don't check if it is a valid two-character state code.
 
-        if ($data['BillingCountry'] === 'US' && empty ($data['BillingState'])
-            || $data['DeliveryCountry'] === 'US' && empty ($data['DeliveryState'])
+        if ($data['BillingCountry'] === 'US' && empty($data['BillingState'])
+            || $data['DeliveryCountry'] === 'US' && empty($data['DeliveryState'])
         ) {
             throw new InvalidRequestException(
                 'Missing state code for billing or shipping address'
@@ -118,25 +137,6 @@ public function getCryptData()
         return $data;
     }
 
-    /**
-     * Add the Form-specific details to the base data.
-     * @reurn array
-     */
-    public function getData()
-    {
-        $this->validate('currency', 'description');
-
-        // The test mode is included to determine the redirect URL.
-
-        return [
-            'VPSProtocol' => $this->VPSProtocol,
-            'TxType' => $this->getTxType(),
-            'Vendor' => $this->getVendor(),
-            'Crypt' => $this->generateCrypt($this->getCryptData()),
-            'TestMode' => $this->getTestMode(),
-        ];
-    }
-
     /**
      * Generate the crypt field from the source data.
      * @param array $data the name/value pairs to be encrypted

src/Message/Form/CompleteAuthorizeRequest.php

@@ -28,7 +28,7 @@ public function getTxType()
      */
     public function getData()
     {
-        $crypt = $this->httpRequest->query->get('crypt');
+        $crypt = $this->getCrypt() ?: $this->httpRequest->query->get('crypt');
 
         // Remove the leading '@' and decrypt.
 
@@ -46,10 +46,20 @@ public function getData()
     }
 
     /**
-     * Nothing to send - we have the result data in the server request.
+     * Nothing to send to gateway - we have the result data in the server request.
      */
     public function sendData($data)
     {
         return $this->response = new Response($this, $data);
     }
+
+    public function getCrypt()
+    {
+        return $this->getParameter('cryptx');
+    }
+
+    public function setCrypt($value)
+    {
+        return $this->setParameter('cryptx', $value);
+    }
 }