From 7d1c409e39ccf3e9058e31a83051a500489dd841 Mon Sep 17 00:00:00 2001
From: Andy Pieters <andy@pay.nl>
Date: Fri, 23 Mar 2018 13:47:02 +0100
Subject: [PATCH] The uuid should be in hex. Converted the reference to hex,
 reference can only be 8 chars now

---
 samples/DynamicUUID/decode.php |  2 +-
 samples/DynamicUUID/encode.php |  2 +-
 src/DynamicUUID.php            | 21 ++++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/samples/DynamicUUID/decode.php b/samples/DynamicUUID/decode.php
index 0116442c..4828f3aa 100644
--- a/samples/DynamicUUID/decode.php
+++ b/samples/DynamicUUID/decode.php
@@ -1,7 +1,7 @@
 <?php
 require_once "../../vendor/autoload.php";
 
-$uuid   = 'sl49b880-1234-1234-inv2-018000178532';
+$uuid   = 'b0898a33-1234-1234-0000-494e56303031';
 $secret = 'abcdef1234567890abcdef1234567890abcdef12';
 
 try {
diff --git a/samples/DynamicUUID/encode.php b/samples/DynamicUUID/encode.php
index e6926b42..a3828cac 100644
--- a/samples/DynamicUUID/encode.php
+++ b/samples/DynamicUUID/encode.php
@@ -4,7 +4,7 @@
 $UUID = \Paynl\DynamicUUID::encode(
     'SL-1234-1234',
     'abcdef1234567890abcdef1234567890abcdef12',
-    'INV2018000178532'
+    'INV001'
 );
 
 echo $UUID;
\ No newline at end of file
diff --git a/src/DynamicUUID.php b/src/DynamicUUID.php
index fe84f79c..c37bdd5a 100644
--- a/src/DynamicUUID.php
+++ b/src/DynamicUUID.php
@@ -8,6 +8,9 @@
 
 class DynamicUUID
 {
+    const REFERENCE_TYPE_STRING = 1;
+    const REFERENCE_TYPE_HEX = 0;
+
     /**
      * Generate a UUID
      *
@@ -15,11 +18,15 @@ class DynamicUUID
      * @param string $secret
      * @param string $reference Your reference to the transaction
      * @param string $padChar The reference will be padded with this character, default '0'
+     * @param int $referenceType Define if you are using a string (8 chars) of hex (16 chars)
      *
      * @return string The UUID
      */
-    public static function encode($serviceId, $secret, $reference, $padChar = '0')
+    public static function encode($serviceId, $secret, $reference, $padChar = '0', $referenceType=self::REFERENCE_TYPE_STRING)
     {
+        if($referenceType === self::REFERENCE_TYPE_STRING){
+            $reference = implode(unpack("H*", $reference));
+        }
         self::validateSecret($secret);
         self::validateServiceId($serviceId);
         self::validateReference($reference);
@@ -30,7 +37,7 @@ public static function encode($serviceId, $secret, $reference, $padChar = '0')
 
         $hash = hash_hmac('sha256', $UUIDData, $secret);
 
-        $UUID = "sl" . substr($hash, 0, 6) . $UUIDData;
+        $UUID = "b" . substr($hash, 0, 7) . $UUIDData;
 
         return sprintf('%08s-%04s-%04s-%04s-%12s',
             substr($UUID, 0, 8),
@@ -56,7 +63,7 @@ private static function validateServiceId($strServiceId)
 
     private static function validateReference($strReference)
     {
-        if ( ! preg_match('/^[a-z0-9]{0,16}$/i', $strReference)) {
+        if ( ! preg_match('/^[0-9a-f]{0,16}$/i', $strReference)) {
             throw new Error('Invalid reference: only alphanumeric chars are allowed, up to 16 chars long');
         }
     }
@@ -78,7 +85,7 @@ private static function validatePadChar($strPadChar)
      * @return array Array with serviceId and reference
      * @throws Error
      */
-    public static function decode($uuid, $secret = null, $padChar = '0')
+    public static function decode($uuid, $secret = null, $padChar = '0', $referenceType = self::REFERENCE_TYPE_STRING)
     {
         if ( isset($secret)) {
             self::validateSecret($secret);
@@ -95,6 +102,10 @@ public static function decode($uuid, $secret = null, $padChar = '0')
         $reference = substr($uuidData, 8);
 
         $reference = ltrim($reference, $padChar);
+
+        if($referenceType == self::REFERENCE_TYPE_STRING){
+            $reference = pack("H*", $reference);
+        }
         return array(
             'serviceId' => $serviceId,
             'reference' => $reference
@@ -115,7 +126,7 @@ public static function validate($uuid, $secret)
         $uuidData = substr($uuidData, 8);
 
         $hash     = hash_hmac('sha256', $uuidData, $secret);
-        $checksum = "sl" . substr($hash, 0, 6);
+        $checksum = "b" . substr($hash, 0, 7);
 
         return $checksum == substr($uuid, 0, 8);
     }