Issue thephpleague#22 and Issue thephpleague#16 implementation

judgej · judgej · commit 56e1cec7371c · 2015-07-07T16:11:51.000+01:00
diff --git a/src/Message/SIMAuthorizeRequest.php b/src/Message/SIMAuthorizeRequest.php
@@ -11,7 +11,13 @@ class SIMAuthorizeRequest extends AbstractRequest
 
     public function getData()
     {
-        $this->validate('amount', 'returnUrl');
+        $this->validate('amount');
+
+        // Either the nodifyUrl or the returnUrl can be provided.
+        // The returnUrl is deprecated, as strictly this is a notifyUrl.
+        if (!$this->getNotifyUrl()) {
+            $this->validate('returnUrl');
+        }
 
         $data = array();
         $data['x_login'] = $this->getApiLoginId();
@@ -30,7 +36,9 @@ public function getData()
 
         // The returnUrl MUST be whitelisted in Authorize.net admin panel under
         // "Response/Receipt URLs".
-        $data['x_relay_url'] = $this->getReturnUrl();
+        // Use the notifyUrl if available, as that is strictly what this is.
+        // Fall back to returnUrl for BC support.
+        $data['x_relay_url'] = $this->getNotifyUrl() ?: $this->getReturnUrl();
         $data['x_cancel_url'] = $this->getCancelUrl();
 
         if ($this->getCustomerId() !== null) {
diff --git a/src/Message/SIMCompleteAuthorizeResponse.php b/src/Message/SIMCompleteAuthorizeResponse.php
@@ -3,11 +3,13 @@
 namespace Omnipay\AuthorizeNet\Message;
 
 use Omnipay\Common\Message\AbstractResponse;
+use Omnipay\Common\Message\RedirectResponseInterface;
+use Symfony\Component\HttpFoundation\Response as HttpResponse;
 
 /**
  * Authorize.Net SIM Complete Authorize Response
  */
-class SIMCompleteAuthorizeResponse extends AbstractResponse
+class SIMCompleteAuthorizeResponse extends AbstractResponse implements RedirectResponseInterface
 {
     // Response codes returned by Authorize.Net
 
@@ -18,7 +20,7 @@ class SIMCompleteAuthorizeResponse extends AbstractResponse
 
     public function isSuccessful()
     {
-        return isset($this->data['x_response_code']) && static::RESPONSE_CODE_APPROVED === $this->data['x_response_code'];
+        return static::RESPONSE_CODE_APPROVED === $this->getCode();
     }
 
     public function getTransactionReference()
@@ -40,4 +42,66 @@ public function getCode()
     {
         return isset($this->data['x_response_code']) ? $this->data['x_response_code'] : null;
     }
+
+    /**
+     * This message is handled in a notify, where a HTML redirect must be performed.
+     */
+    public function isRedirect()
+    {
+        return true;
+    }
+
+    /**
+     * The merchant site notify handler needs to set the returnUrl in the complete request.
+     */
+    public function getRedirectUrl()
+    {
+        return $this->request->getReturnUrl();
+    }
+
+    public function getRedirectMethod()
+    {
+        return 'GET';
+    }
+
+    /**
+     * There is no redirect data to send; the aim is just to get the user to a URL
+     * by delivering a HTML page.
+     */
+    public function getRedirectData()
+    {
+        return array();
+    }
+
+    /**
+     * Authorize.Net requires a redirect in a HTML page.
+     * The OmniPay redirect helper will only provide a HTML page for the POST method
+     * and then implements that through a self-sbmitting form. This will generate
+     * browser warnings if returning to a non-SSL page.
+     */
+    public function getRedirectResponse()
+    {
+        $output = <<<ENDHTML
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Redirecting...</title>
+        <meta http-equiv="refresh" content="0;url=%1\$s" />
+    </head>
+    <body>
+        <p>Redirecting to <a href="%1\$s">payment complete page</a>...</p>
+        <script type="text/javascript" charset="utf-8">
+            window.location="%1\$s";
+        </script>
+    </body>
+</html>
+ENDHTML;
+
+        $output = sprintf(
+            $output,
+            htmlentities($this->getRedirectUrl(), ENT_QUOTES, 'UTF-8', false)
+        );
+
+        return HttpResponse::create($output);
+    }
 }
