Merge pull request #148 from paynl/feature/PLUG-2769

PLUG-2769 - Trim credential fields
paynl · Nov 2, 2023 · 7b38e90 · 7b38e90
2 parents f006547 + d14864d
commit 7b38e90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Block/Adminhtml/Render/Credentials.php b/Block/Adminhtml/Render/Credentials.php
@@ -88,10 +88,10 @@ public function checkCredentials()
             $scopeId = $websiteId;
         }
 
-        $tokencode = $this->scopeConfig->getValue('payment/paynl/tokencode', $scope, $scopeId);
-        $apiToken = $this->scopeConfig->getValue('payment/paynl/apitoken_encrypted', $scope, $scopeId);
-        $serviceId = $this->scopeConfig->getValue('payment/paynl/serviceid', $scope, $scopeId);
-        $gateway = $this->scopeConfig->getValue('payment/paynl/failover_gateway', $scope, $scopeId);
+        $tokencode = trim((string) $this->scopeConfig->getValue('payment/paynl/tokencode', $scope, $scopeId));
+        $apiToken = trim((string) $this->scopeConfig->getValue('payment/paynl/apitoken_encrypted', $scope, $scopeId));
+        $serviceId = trim((string) $this->scopeConfig->getValue('payment/paynl/serviceid', $scope, $scopeId));
+        $gateway = trim((string) $this->scopeConfig->getValue('payment/paynl/failover_gateway', $scope, $scopeId));
 
         $error = '';
         $status = 1;

diff --git a/Model/Config.php b/Model/Config.php
@@ -403,31 +403,31 @@ public function configureSDK($useGateway = false)
      */
     public function getApiToken()
     {
-        return $this->store->getConfig('payment/paynl/apitoken_encrypted');
+        return trim((string)$this->store->getConfig('payment/paynl/apitoken_encrypted'));
     }
 
     /**
      * @return string
      */
     public function getTokencode()
     {
-        return $this->store->getConfig('payment/paynl/tokencode');
+        return trim((string)$this->store->getConfig('payment/paynl/tokencode'));
     }
 
     /**
      * @return string
      */
     public function getServiceId()
     {
-        return $this->store->getConfig('payment/paynl/serviceid');
+        return trim((string)$this->store->getConfig('payment/paynl/serviceid'));
     }
 
     /**
      * @return string
      */
     public function getFailoverGateway()
     {
-        return $this->store->getConfig('payment/paynl/failover_gateway');
+        return trim((string)$this->store->getConfig('payment/paynl/failover_gateway'));
     }
 
     /**