Merge pull request #1 from iSerter/master

parameter validations & mutations
Teknasyon-Teknoloji · Nov 28, 2017 · bb375a9 · bb375a9
2 parents 9d524f1 + 1765cb5
commit bb375a9
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,7 @@
 * guzzlehttp/guzzle: ^6.3
 
 ### Todo 
-* Auto currency code conversion. (TL to 949, USD to 840, etc.)
 * Test Cases
-* Validations: card number (Pan), urls, expireDate, etc.. 
 
 #### Merchant Ayarları (opsiyonel)
 `merchantId` ve `merchantPassword` parametreleri global config objesinde birkez yada her servis başına ayrı ayrı set edilebilir. 
@@ -33,7 +31,7 @@ $service->params()
     ->setRequestId('unique-request-id'); // verifyEnrollmentRequestId 
 
 $response = $service->makeRequest()->getResponse();
-echo $response->Status . PHP_EOL; // Y/N/E 
+echo $response->Status; // Y/N/E 
 
 ```
 
@@ -55,6 +53,5 @@ $service->params()
     ->setTransactionId($data['VerifyEnrollmentRequestId']); 
 
 $response = $service->makeRequest()->getResponse();
-
 var_dump($response->isSuccessfull()); // true/false 
 ```
diff --git a/src/Services/MpiEnrollment/MpiEnrollmentParameters.php b/src/Services/MpiEnrollment/MpiEnrollmentParameters.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace Teknasyon\Isbank\Services\MpiEnrollment;
+
+use function GuzzleHttp\Psr7\str;
 use Teknasyon\Isbank\Helpers\CurrencyCode;
 use Teknasyon\Isbank\IsbankConfig;
 
@@ -29,7 +31,7 @@ class MpiEnrollmentParameters
     public function __construct()
     {
         $this->setMerchantId(IsbankConfig::get('merchantId'))
-             ->setMerchantPassword(IsbankConfig::get('merchantPassword'));
+            ->setMerchantPassword(IsbankConfig::get('merchantPassword'));
     }
 
     /*
@@ -85,6 +87,9 @@ public function getPan()
      */
     public function setPan($pan)
     {
+        if (strlen($pan) != 16 || !is_numeric($pan)) {
+            throw new \InvalidArgumentException("Invalid Pan (card number)");
+        }
         $this->pan = $pan;
         return $this;
     }
@@ -103,6 +108,17 @@ public function getExpiryDate()
      */
     public function setExpiryDate($expiryDate)
     {
+        if(strlen($expiryDate) === 6) {
+            $expiryDate = substr($expiryDate,-4);
+        }
+
+        if(strlen($expiryDate) != 4
+            || substr($expiryDate,0,2) < date('y')
+            || substr($expiryDate,2,2) > 31
+            || substr($expiryDate,2,2) < 1) {
+            throw new \InvalidArgumentException("Expiry date must be in YYMM format, and cannot be a past date.");
+        }
+
         $this->expiryDate = $expiryDate;
         return $this;
     }
@@ -222,6 +238,9 @@ public function getSuccessUrl()
      */
     public function setSuccessUrl($successUrl)
     {
+        if(filter_var($successUrl, FILTER_VALIDATE_URL) === false) {
+            throw new \InvalidArgumentException("Invalid Success URL provided for Isbank MPI Enrollment service.");
+        }
         $this->successUrl = $successUrl;
         return $this;
     }
@@ -240,6 +259,9 @@ public function getFailureUrl()
      */
     public function setFailureUrl($failureUrl)
     {
+        if(filter_var($failureUrl, FILTER_VALIDATE_URL) === false) {
+            throw new \InvalidArgumentException("Invalid Failure URL provided for Isbank MPI Enrollment service.");
+        }
         $this->failureUrl = $failureUrl;
         return $this;
     }

diff --git a/src/Services/VirtualPos/VirtualPosParameters.php b/src/Services/VirtualPos/VirtualPosParameters.php
@@ -34,7 +34,6 @@ public function __construct()
             ->setMerchantPassword(IsbankConfig::get('merchantPassword'));
     }
 
-
     /*
     |--------------------------------------------------------------------------
     | Helpers
@@ -281,6 +280,18 @@ public function getExpiry()
      */
     public function setExpiry($expiry)
     {
+        // Convert YYMM to YYYYMM
+        if(strlen($expiry) === 4) {
+            $expiry = '20'.$expiry;
+        }
+
+        if(strlen($expiry) != 6
+            || substr($expiry,0,4) < date('Y')
+            || substr($expiry,4,2) > 31
+            || substr($expiry,4,2) < 1) {
+            throw new \InvalidArgumentException("Invalid expiry date provided as Isbank Virtual POS parameter.");
+        }
+
         $this->expiry = $expiry;
         return $this;
     }

diff --git a/tests/MpiEnrollmentTest.php b/tests/MpiEnrollmentTest.php
@@ -32,7 +32,7 @@ public function testGlobalTestEnvironmentConfigAppliesToTheService()
     {
         $this->assertTrue($this->service->isTestEnvironment());
     }
-    
+
     public function testEndpointIsOfTheTestEnvironment()
     {
         $this->assertEquals(
@@ -43,21 +43,32 @@ public function testEndpointIsOfTheTestEnvironment()
 
     public function testParametersCanBeSet()
     {
-        $pan = 123456789; // @todo rest of the params
+        $pan = 1234567891234567; // @todo rest of the params
+        $expiryDate = '2012';
         $this->service->params()
-                      ->setPan($pan);
+            ->setPan($pan)
+            ->setExpiryDate($expiryDate);
 
         $this->assertEquals($pan, $this->service->params()->getPan());
+        $this->assertEquals($expiryDate, $this->service->params()->getExpiryDate());
+    }
+
+    public function testExpireDateAcceptsYYYYMMFormat()
+    {
+        $this->service->params()
+            ->setExpiryDate('201905');
+
+        $this->assertEquals('1905', $this->service->params()->getExpiryDate());
     }
 
     public function testParametersCanBeSetViaClosure()
     {
 
         $this->service->setParams(function (MpiEnrollmentParameters $params) {
-            $params->setPan(123456789);
+            $params->setPan(1234567891234567);
         });
 
-        $this->assertEquals('123456789', $this->service->params()->getPan());
+        $this->assertEquals('1234567891234567', $this->service->params()->getPan());
     }
 
     public function testAlphaCurrencyCodeGetsConvertedToNumericCode()