Use new clientName identification mechanism (#59)

tpay-com · Jul 8, 2024 · 6a98a08 · 6a98a08
1 parent 2a1ddaf
commit 6a98a08
Show file tree

Hide file tree

Showing 12 changed files with 860 additions and 1,058 deletions.
diff --git a/.dev-tools/composer.json b/.dev-tools/composer.json
@@ -3,8 +3,8 @@
         "ergebnis/composer-normalize": "^2.35",
         "kubawerlos/composer-smaller-lock": "^1.0.1",
         "magento/magento2ce": "^2.4",
-        "php-cs-fixer/shim": "^3.23",
-        "phpstan/phpstan": "^1.10.30",
+        "php-cs-fixer/shim": "3.23",
+        "phpstan/phpstan": "1.10.30",
         "tpay-com/coding-standards": "^1.0.1",
         "tpay-com/tpay-openapi-php": "^1.3",
         "tpay-com/tpay-php": "^2.3.4",

diff --git a/.dev-tools/composer.lock b/.dev-tools/composer.lock
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,7 +1,6 @@
 name: Continuous integration
 
 on:
-  pull_request:
   push:
 
 jobs:

diff --git a/.github/workflows/sca.yaml b/.github/workflows/sca.yaml
@@ -1,7 +1,6 @@
 name: Static code analysis
 
 on:
-  pull_request:
   push:
 
 jobs:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /.dev-tools/vendor/
 /.dev-tools/.php-cs-fixer.cache
 .idea/
+vendor
+composer.lock
diff --git a/Model/ApiFacade/CardTransaction/CardOpen.php b/Model/ApiFacade/CardTransaction/CardOpen.php
@@ -7,7 +7,7 @@
 use Tpay\Magento2\Api\TpayInterface;
 use Tpay\Magento2\Service\TpayService;
 use Tpay\Magento2\Service\TpayTokensService;
-use tpaySDK\Api\TpayApi;
+use Tpay\OpenApi\Api\TpayApi;
 
 class CardOpen
 {
@@ -34,8 +34,7 @@ public function __construct(TpayInterface $tpay, TpayConfigInterface $tpayConfig
         $this->tpayConfig = $tpayConfig;
         $this->tokensService = $tokensService;
         $this->tpayService = $tpayService;
-        $this->tpayApi = new TpayApi($tpayConfig->getOpenApiClientId(), $tpayConfig->getOpenApiPassword(), !$tpayConfig->useSandboxMode());
-        $this->tpayApi->transactions()->setClientName($tpayConfig->buildMagentoInfo());
+        $this->tpayApi = new TpayApi($tpayConfig->getOpenApiClientId(), $tpayConfig->getOpenApiPassword(), !$tpayConfig->useSandboxMode(), 'read', null, $tpayConfig->buildMagentoInfo());
     }
 
     public function makeFullCardTransactionProcess(string $orderId, ?array $customerToken = null): string

diff --git a/Model/ApiFacade/OpenApi.php b/Model/ApiFacade/OpenApi.php
@@ -6,7 +6,7 @@
 use Magento\Payment\Model\InfoInterface;
 use Tpay\Magento2\Api\TpayConfigInterface;
 use Tpay\Magento2\Model\ApiFacade\Transaction\Dto\Channel;
-use tpaySDK\Api\TpayApi;
+use Tpay\OpenApi\Api\TpayApi;
 
 class OpenApi
 {
@@ -20,12 +20,13 @@ class OpenApi
     public function __construct(TpayConfigInterface $tpay, CacheInterface $cache)
     {
         $this->cache = $cache;
-        $this->tpayApi = new TpayApi($tpay->getOpenApiClientId(), $tpay->getOpenApiPassword(), !$tpay->useSandboxMode());
+        $this->tpayApi = new TpayApi($tpay->getOpenApiClientId(), $tpay->getOpenApiPassword(), !$tpay->useSandboxMode(), 'read', null, $tpay->buildMagentoInfo());
         $token = $this->cache->load($this->getAuthTokenCacheKey($tpay));
+
         if ($token) {
             $this->tpayApi->setCustomToken(unserialize($token));
         }
-        $this->tpayApi->transactions()->setClientName($tpay->buildMagentoInfo());
+
         if (!$token) {
             $this->cache->save(serialize($this->tpayApi->getToken()), $this->getAuthTokenCacheKey($tpay), [\Magento\Framework\App\Config::CACHE_TAG], 7100);
         }

diff --git a/Model/ApiFacade/TpayConfig/ConfigOpen.php b/Model/ApiFacade/TpayConfig/ConfigOpen.php
@@ -68,13 +68,15 @@ public function showChannels(): ?string
 
     public function createScript(string $script): string
     {
-        return "
-            <script type=\"text/javascript\">
+        return <<<EOD
+
+            <script type="text/javascript">
                 require(['jquery'], function ($) {
                     $.getScript('{$this->generateURL($script)}');
 
                 });
-            </script>";
+            </script>
+EOD;
     }
 
     public function getTerms(): ?string

diff --git a/Model/ApiFacade/TpayConfig/ConfigOrigin.php b/Model/ApiFacade/TpayConfig/ConfigOrigin.php
@@ -69,13 +69,15 @@ public function showChannels(): ?string
 
     public function createScript(string $script): string
     {
-        return "
-            <script type=\"text/javascript\">
+        return <<<EOD
+
+            <script type="text/javascript">
                 require(['jquery'], function ($) {
                     $.getScript('{$this->generateURL($script)}');
 
                 });
-            </script>";
+            </script>
+EOD;
     }
 
     public function getTerms(): ?string

diff --git a/Model/ApiFacade/Transaction/TransactionOriginApi.php b/Model/ApiFacade/Transaction/TransactionOriginApi.php
@@ -13,6 +13,7 @@ class TransactionOriginApi extends PaymentBlik
      * @param string $apiKey
      * @param int    $merchantId
      * @param string $merchantSecret
+     * @param mixed  $isProd
      */
     public function __construct($apiPassword, $apiKey, $merchantId, $merchantSecret, $isProd = true)
     {

diff --git a/Provider/ConfigurationProvider.php b/Provider/ConfigurationProvider.php
@@ -4,6 +4,7 @@
 
 namespace Tpay\Magento2\Provider;
 
+use Composer\InstalledVersions;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Locale\Resolver;
@@ -221,17 +222,13 @@ public function getMagentoVersion(): string
 
     public function buildMagentoInfo(): string
     {
-        $versions = $this->getPackagesVersions();
-
-        return implode(
-            '|',
-            [
-                'magento2:'.$this->getMagentoVersion(),
-                'tpay-com/tpay-openapi-php:'.$versions[0],
-                'tpay-com/tpay-php:'.$versions[1],
-                'magento2basic:'.$this->getTpayPluginVersion(),
-                'PHP:'.phpversion(),
-            ]
+        return sprintf(
+            'magento2:%s|tpay-openapi-php:%s|tpay-php:%s|magento2basic:%s|PHP:%s',
+            $this->getMagentoVersion(),
+            InstalledVersions::getPrettyVersion('tpay-com/tpay-openapi-php'),
+            InstalledVersions::getPrettyVersion('tpay-com/tpay-php'),
+            $this->getTpayPluginVersion(),
+            phpversion()
         );
     }
 
@@ -249,21 +246,6 @@ public function isPlnPayment(): bool
         return 'PLN' == $this->storeManager->getStore()->getBaseCurrencyCode() && 'PLN' == $this->storeManager->getStore()->getCurrentCurrencyCode();
     }
 
-    private function getPackagesVersions(): array
-    {
-        $dir = __DIR__.'/../composer.json';
-        if (file_exists($dir)) {
-            $composerJson = json_decode(
-                file_get_contents(__DIR__.'/../composer.json'),
-                true
-            )['require'] ?? [];
-
-            return [$composerJson['tpay-com/tpay-openapi-php'], $composerJson['tpay-com/tpay-php']];
-        }
-
-        return ['n/a', 'n/a'];
-    }
-
     private function getTpayPluginVersion(): string
     {
         $dir = __DIR__.'/../.version';

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "php": ">=7.1",
         "ext-json": "*",
         "magento/framework": "^102.0 || ^103.0",
-        "tpay-com/tpay-openapi-php": "^1.7.1",
+        "tpay-com/tpay-openapi-php": "^1.8.0",
         "tpay-com/tpay-php": "^2.4.7"
     },
     "autoload": {