Merge pull request #10 from LSFLK/nizar-dev

NSID validation fixes

Author: mohamednizar

src/UniqueUid.php

@@ -108,7 +108,7 @@ public  static function format(string $token, int $split)
         for ($i = 0; $i < $length; $i++) {
             $newToken .= '-' . $partitions[$i];
         }
-        return substr($newToken, 1, strlen($newToken));
+        return ltrim(rtrim(substr($newToken, 1, strlen($newToken)), '-'));
     }
 
     /**
@@ -117,8 +117,15 @@ public  static function format(string $token, int $split)
      * @param string $token
      * @return boolean
      */
-    public static function isValidUniqueId(string $token,$validLength = 9)
+    public static function isValidUniqueId(string $token, $validLength = 9, $split = 3)
     {
+        $actualLength = strlen($token);
+
+        $equalSplit = ($validLength % $split) ==  0 ? true : false;
+
+        //calculate valid string length
+        $validActualLength =  $equalSplit ? (($validLength + ($split - 1))) : (($validLength + $split));
+
         //remove - form the token
         $token = str_replace("-", "", $token);
 
@@ -127,12 +134,20 @@ public static function isValidUniqueId(string $token,$validLength = 9)
 
         // validate the character set
         $valid = preg_match("/^[" . self::$charSet . "]+$/", $token);
-        if($validLength != $length){
+
+        //validate formatted length
+        if ($actualLength != $validActualLength) {
+            return false;
+        //validate un formatted length
+        } elseif ($validLength != $length) {
             return false;
-        }elseif (!$valid) {
+        //validate charset
+        } elseif (!$valid) {
             return false;
-        }elseif(is_numeric($token)){
+        //validate 100 % numeric NSID    
+        } elseif (is_numeric($token)) {
             return false;
+        //validate check digit    
         } else {
             //get the check character from the token
             $checkChar = str_split($token)[$length - 1];

tests/ExampleTest.php

@@ -19,6 +19,24 @@ public function testOne()
         $id = $this->userId::getUniqueAlphanumeric();
         $valid =$this->userId::isValidUniqueId($id);
         $this->assertEquals(true,$valid);
+        $valid =$this->userId::isValidUniqueId($id.'-');
+        $this->assertEquals(false,$valid);
+
+    }
+    
+
+    public function testFalseRight()
+    {
+        $id = $this->userId::getUniqueAlphanumeric();
+        $valid =$this->userId::isValidUniqueId($id.'-');
+        $this->assertEquals(false,$valid);
+    }
+
+    public function testFalseLeft()
+    {
+        $id = $this->userId::getUniqueAlphanumeric();
+        $valid =$this->userId::isValidUniqueId('-'.$id);
+        $this->assertEquals(false,$valid);
     }
 
     public function testTest()
@@ -27,6 +45,8 @@ public function testTest()
         while ($number >= 0) {
             $number--;
             $this->testOne();
+            $this->testFalseRight();
+            $this->testFalseLeft();
         }
     }
 
@@ -47,8 +67,10 @@ public function testInvalid(){
         $this->assertEquals(false,$valid6);
         $valid7 = $this->userId::isValidUniqueId('45464565');
         $this->assertEquals(false,$valid7);
-        $valid7 = $this->userId::isValidUniqueId('FCV-Y7P-YD2-M',9);
-        $this->assertEquals(false,$valid7);
+        $valid7 = $this->userId::isValidUniqueId('P3F-VHD-FHB',9);
+        $this->assertEquals(true,$valid7);
+        $valid8 = $this->userId::isValidUniqueId('P3F-VHD-FHB-',9);
+        $this->assertEquals(false,$valid8);
     }
 
     public function testArrayInput() {