Merge pull request #35 from pmclain/hotfix/logging

v1.1.1

Gateway/Config/Config.php

@@ -29,6 +29,7 @@ class Config extends \Magento\Payment\Gateway\Config\Config
   const KEY_USE_CCV = 'useccv';
   const KEY_ALLOW_SPECIFIC = 'allowspecific';
   const KEY_SPECIFIC_COUNTRY = 'specificcountry';
+  const KEY_DEBUG = 'debug';
 
   /**
    * @return array
@@ -105,4 +106,11 @@ public function getSecretKey() {
   public function isTestMode() {
     return (bool) $this->getValue(self::KEY_ENVIRONMENT);
   }
+
+  /**
+   * @return bool
+   */
+  public function isDebugOn() {
+    return (bool) $this->getValue(self::KEY_DEBUG);
+  }
 }

Gateway/Http/Client/AbstractTransaction.php

@@ -21,6 +21,8 @@
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Magento\Payment\Model\Method\Logger;
 use Psr\Log\LoggerInterface;
+use Pmclain\Stripe\Gateway\Config\Config;
+use Magento\Framework\App\ObjectManager;
 
 abstract class AbstractTransaction implements ClientInterface
 {
@@ -30,14 +32,18 @@ abstract class AbstractTransaction implements ClientInterface
 
   protected $adapter;
 
+  protected $config;
+
   public function __construct(
     LoggerInterface $logger,
     Logger $customLogger,
-    StripeAdapter $adapter
+    StripeAdapter $adapter,
+    Config $config = null
   ) {
     $this->logger = $logger;
     $this->customLogger = $customLogger;
     $this->adapter = $adapter;
+    $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
   }
 
   public function placeRequest(
@@ -54,10 +60,21 @@ public function placeRequest(
       $response['object'] = $this->process($data);
     }catch (\Exception $e) {
       $message = __($e->getMessage() ?: 'Sorry, but something went wrong.');
-      $this->logger->critical($message);
+      $this->logger->critical($e);
       throw new ClientException($message);
     }finally {
-      $log['response'] = (array) $response['object'];
+      if ($response['object'] instanceof \Stripe\Error\Base
+          || $response['object'] instanceof \Stripe\StripeObject
+      ) {
+        $log['response'] = $response['object']->__toString();
+      } else {
+        $log['response'] = $response['object'];
+      }
+
+      if ($this->config->isDebugOn()) {
+        $this->logger->warning(var_export($log, true));
+      }
+
       $this->customLogger->debug($log);
     }
 

Gateway/Request/PaymentDataBuilder.php

@@ -22,6 +22,8 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Stripe\Customer;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 class PaymentDataBuilder implements BuilderInterface
 {
@@ -47,24 +49,29 @@ class PaymentDataBuilder implements BuilderInterface
   /** @var CustomerRepositoryInterface  */
   protected $customerRepository;
 
+  /** @var LoggerInterface */
+  protected $logger;
 
   /**
    * PaymentDataBuilder constructor.
    * @param Config $config
    * @param SubjectReader $subjectReader
    * @param Session $customerSession
    * @param CustomerRepositoryInterface $customerRepository
+   * @param LoggerInterface $logger
    */
   public function __construct(
     Config $config,
     SubjectReader $subjectReader,
     Session $customerSession,
-    CustomerRepositoryInterface $customerRepository
+    CustomerRepositoryInterface $customerRepository,
+    LoggerInterface $logger = null
   ) {
     $this->config = $config;
     $this->subjectReader = $subjectReader;
     $this->customerSession = $customerSession;
     $this->customerRepository = $customerRepository;
+    $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
   }
 
   /**
@@ -126,6 +133,7 @@ protected function createNewStripeCustomer($email) {
         'description' => 'Customer for ' . $email,
       ]);
     }catch (\Exception $e) {
+      $this->logger->critical($e);
       throw new \Magento\Framework\Validator\Exception(__($e->getMessage()));
     }
 

README.md

@@ -27,7 +27,7 @@ In your Magento 2 root directory run
 | ------- | --------------- |
 | 1.x.x   | 2.2.x           | 
 | 1.x.x   | 2.1.x           |
-| 0.0.3   | 2.0.x           |
+| None    | 2.0.x           |
 
 ## Configuration
 The configuration can be found in the Magento 2 admin panel under  

Test/Unit/Gateway/Http/Client/TransactionSaleTest.php

@@ -92,7 +92,6 @@ public function testPlaceRequestSuccess() {
 
     $actualResult = $this->model->placeRequest($this->getTransferObjectMock());
 
-    $this->assertTrue(is_object($actualResult['object']));
     $this->assertEquals(['object' => $response], $actualResult);
   }
 
@@ -110,9 +109,6 @@ private function getTransferObjectMock() {
   }
 
   private function getResponseObject() {
-    $object = new \stdClass();
-    $object->success = true;
-
-    return $object;
+    return ['success' => true];
   }
 }

etc/adminhtml/system.xml

@@ -67,6 +67,10 @@
           <label>Credit Card Verification</label>
           <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
         </field>
+        <field id="debug" translate="label" type="select" sortOrder="115" showInDefault="1" showInWebsite="1" showInStore="0">
+          <label>Debug</label>
+          <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        </field>
         <field id="allowspecific" translate="label" type="allowspecific" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
           <label>Payment from Applicable Countries</label>
           <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>

etc/config.xml

@@ -41,6 +41,7 @@
         <useccv>1</useccv>
         <cctypes_stripe_mapper><![CDATA[{"american-express":"AE","discover":"DI","jcb":"JCB","mastercard":"MC","master-card":"MC","visa":"VI","maestro":"MI","diners-club":"DN","unionpay":"CUP"}]]></cctypes_stripe_mapper>
         <order_status>processing</order_status>
+        <debug>0</debug>
       </pmclain_stripe>
       <pmclain_stripe_vault>
         <model>StripeCreditCardVaultFacade</model>

etc/di.xml

@@ -309,5 +309,18 @@
     </arguments>
   </type>
 
-  <!-- Settlement Reqports?? -->
+  <type name="Magento\Config\Model\Config\TypePool">
+    <arguments>
+      <argument name="sensitive" xsi:type="array">
+        <item name="payment/pmclain_stripe/test_secret_key" xsi:type="string">1</item>
+        <item name="payment/pmclain_stripe/test_publishable_key" xsi:type="string">1</item>
+        <item name="payment/pmclain_stripe/live_secret_key" xsi:type="string">1</item>
+        <item name="payment/pmclain_stripe/live_publishable_key" xsi:type="string">1</item>
+      </argument>
+      <argument name="environment" xsi:type="array">
+        <item name="payment/pmclain_stripe/debug" xsi:type="string">1</item>
+        <item name="payment/pmclain_stripe/test_mode" xsi:type="string">1</item>
+      </argument>
+    </arguments>
+  </type>
 </config>

view/frontend/web/js/view/payment/method-renderer/pmclain_stripe.js

@@ -9,7 +9,7 @@ define(
     'Magento_Checkout/js/action/redirect-on-success',
     'Magento_Vault/js/view/payment/vault-enabler',
     'Magento_Checkout/js/model/quote',
-    'stripejs'
+    'https://js.stripe.com/v3/'
   ],
   function (
       $,