Merge pull request #85 from checkout/dev

Readme update and configuration improvement

Author: david-fiaty-cko

Gateway/Config/Config.php

@@ -16,6 +16,7 @@
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Locale\Resolver as LocaleResolver;
+use Magento\Framework\Encryption\EncryptorInterface;
 use CheckoutCom\Magento2\Model\Adminhtml\Source\Environment;
 use CheckoutCom\Magento2\Model\Adminhtml\Source\Integration;
 
@@ -119,6 +120,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         CheckoutSession $checkoutSession,
         LocaleResolver $localeResolver,
+        EncryptorInterface $encryptor,
         $methodCode = null,
         $pathPattern = self::DEFAULT_PATH_PATTERN
     ) {
@@ -128,9 +130,9 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->checkoutSession = $checkoutSession;
         $this->localeResolver = $localeResolver;
+        $this->encryptor = $encryptor;
     }
 
-
     public static function getSupportedLanguages() {
         return [
             [
@@ -739,10 +741,10 @@ public function isDebugMode() {
      * @return string
      */
     public function getPublicKey() {
-        return (string) $this->getValue(
+        return (string) $this->encryptor->decrypt($this->getValue(
             self::KEY_PUBLIC_KEY,
             $this->storeManager->getStore()
-        );
+        ));
     }
 
     /**
@@ -751,10 +753,10 @@ public function getPublicKey() {
      * @return string
      */
     public function getSecretKey() {
-        return (string) $this->getValue(
+        return (string) $this->encryptor->decrypt($this->getValue(
             self::KEY_SECRET_KEY,
             $this->storeManager->getStore()
-        );
+        ));
     }
 
     /**
@@ -792,10 +794,10 @@ public function getMadaBinsPath() {
      * @return string
      */
     public function getPrivateSharedKey() {
-        return (string) $this->getValue(
+        return (string) $this->encryptor->decrypt($this->getValue(
             self::KEY_PRIVATE_SHARED_KEY,
             $this->storeManager->getStore()
-        );
+        ));
     }
 
     /**

README.md

@@ -48,6 +48,17 @@ bin/magento setup:upgrade
 rm -rf var/cache var/generation/ var/di
 bin/magento setup:di:compile && php bin/magento cache:clean
 ```
+
+## Update
+In order to update the Checkout.com Magento 2 extension please run the following commands in a terminal, from your Magento 2 root directory:
+
+```bash
+composer update checkoutcom/magento2:*
+bin/magento setup:upgrade
+rm -rf var/cache var/generation/ var/di
+bin/magento setup:di:compile && php bin/magento cache:clean
+```
+
 For more information on the Magento 2 module installation process, please have a look at the [Magento 2 official documentation](http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-subcommands-enable.html "Magento 2 official documentation")
 
 ## Configuration

composer.json

@@ -11,7 +11,7 @@
         "magento/module-vault": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.38",
+    "version": "1.0.39",
     "autoload": {
         "files": [
             "registration.php"

etc/config.xml

@@ -47,9 +47,9 @@
                 <auto_capture>0</auto_capture>
                 <auto_capture_time>0.02</auto_capture_time>
                 <language_fallback>EN-EN</language_fallback>
-                <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                <secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                <private_shared_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <public_key></public_key>
+                <secret_key></secret_key>
+                <private_shared_key></private_shared_key>
                 <sandbox_api_url><![CDATA[https://sandbox.checkout.com/api2/v2/]]></sandbox_api_url>
                 <live_api_url><![CDATA[https://api2.checkout.com/v2/]]></live_api_url>
                 <sandbox_embedded_url><![CDATA[https://cdn.checkout.com/js/frames.js]]></sandbox_embedded_url>