Added middleware - tested

Author: AmitBu

src/http-client.php

@@ -1,25 +1,21 @@
 <?php
 
-
-
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Uri;
-use Psr\Http\Message\RequestInterface;
- 
+
 class HttpClient extends Client
 {
     public function __construct($apiKey, SecureNativeOptions $options)
     {
-        $defaultOptions =   [
-          'handler'  => $this->getHandlerStack(),
-          'base_uri' => $options->getApiUrl(),
-          'timeout'  => $options->getTimeout() / 1000,
-          'headers'  => [
-              'User-Agent'   => 'SecureNative-PHP',
-              'SN-Version'=> '1.0.0',
-              'Authorization' => $apiKey,
-              'Content-Type' => 'application/json',
+        $defaultOptions = [
+            'handler' => $this->getHandlerStack(),
+            'base_uri' => $options->getApiUrl(),
+            'timeout' => $options->getTimeout() / 1000,
+            'headers' => [
+                'User-Agent' => 'SecureNative-PHP',
+                'SN-Version' => '1.0.0',
+                'Authorization' => $apiKey,
+                'Content-Type' => 'application/json',
             ]
         ];
 
@@ -35,7 +31,8 @@ protected function getHandlerStack()
         return $handlerStack;
     }
 
-    protected function getHandler() {
+    protected function getHandler()
+    {
         return null;
     }
-}
+}

src/middleware.php

@@ -4,17 +4,19 @@
 
 class Middleware
 {
-  private $apiKey;
+    private $apiKey;
 
-  public function __construct($apiKey)
-  {
-      $this->apiKey = $apiKey;
-  }
+    public function __construct($apiKey)
+    {
+        $this->apiKey = $apiKey;
+    }
 
-  public function verifySignature($headers, $body)
-  {
-     $signature = headers[SIGNATURE_KEY] ? headers[SIGNATURE_KEY] : "";
-     $comparison_signature = hash_hmac('sha512', Utils::serialize($body), $this->apiKey, true);
-     return hash_equals($signature, $comparison_signature);
-  }
+    public function verifySignature()
+    {
+        $headers = $_SERVER;
+        $body = file_get_contents("php://input");
+        $signature = isset($headers[SIGNATURE_KEY]) ? $headers[SIGNATURE_KEY] : "";
+        $comparison_signature = bin2hex(hash_hmac('sha512', $body, $this->apiKey, true));
+        return hash_equals($signature, $comparison_signature);
+    }
 }

src/securenative.php

@@ -12,54 +12,59 @@
 
 class SecureNative
 {
-  private static $apiKey;
-  private static $options;
-  private static $eventManager;
-  private static $middleware;
+    private static $apiKey;
+    private static $options;
+    private static $eventManager;
+    private static $middleware;
 
-  public static function init($apiKey, SecureNativeOptions $secureNativeOptions)
-  {
-      if ($apiKey == '') {
-        throw new Exception('You must pass your SecureNative api key');
-      }
+    public static function init($apiKey, SecureNativeOptions $secureNativeOptions)
+    {
+        if ($apiKey == '') {
+            throw new Exception('You must pass your SecureNative api key');
+        }
 
-      self::$apiKey = $apiKey;
-      self::$options = $secureNativeOptions;
-      self::$eventManager = new EventManager($apiKey, self::$options);
-      self::$middleware = new Middleware($apiKey);
-  }
+        self::$apiKey = $apiKey;
+        self::$options = $secureNativeOptions;
+        self::$eventManager = new EventManager($apiKey, self::$options);
+        self::$middleware = new Middleware($apiKey);
+    }
+
+    public static function track(Array $attributes)
+    {
+        $opts = new EventOptions(json_encode($attributes));
+        if (count($opts->params) > MAX_CUSTOM_PARAMS) {
+            throw new Exception(sprintf('You can only specify maximum of %d params', MAX_CUSTOM_PARAMS));
+        }
 
-  public static function track(Array $attributes)
-  {
-    $opts = new EventOptions(json_encode($attributes));
-    if (count($opts->params) > MAX_CUSTOM_PARAMS) {
-      throw new Exception(sprintf('You can only specify maximum of %d params', MAX_CUSTOM_PARAMS));
+        $requestUrl = sprintf('%s/track', self::$options->getApiUrl());
+        $event = self::$eventManager->buildEvent($opts);
+        self::$eventManager->sendAsync($event, $requestUrl);
     }
 
-    $requestUrl = sprintf('%s/track', self::$options->getApiUrl());
-    $event = self::$eventManager->buildEvent($opts);
-    self::$eventManager->sendAsync($event, $requestUrl);
-  }
+    public static function verify(Array $attributes)
+    {
+        $opts = new EventOptions(json_encode($attributes));
+        $requestUrl = sprintf('%s/verify', self::$options->getApiUrl());
+        $event = self::$eventManager->buildEvent($opts);
+        $result = self::$eventManager->sendSync($event, $requestUrl);
+
+        if ($result == null) {
+            return new VerifyResult();
+        }
 
-  public static function verify(Array $attributes)
-  {
-    $opts = new EventOptions(json_encode($attributes));
-    $requestUrl = sprintf('%s/verify', self::$options->getApiUrl());
-    $event = self::$eventManager->buildEvent($opts);
-    $result = self::$eventManager->sendSync($event, $requestUrl);
-    
-    if($result == null){
-      return new VerifyResult();
+        return $result;
     }
 
-    return $result;
-  }
+    public static function flow($flowId, Array $attributes)
+    {
+        $opts = new EventOptions(json_encode($attributes));
+        $requestUrl = sprintf('%s/flow/%s', self::$options->getApiUrl(), $flowId);
+        $event = self::$eventManager->buildEvent($opts);
+        return self::$eventManager->sendSync($event, $requestUrl);
+    }
 
-  public static function flow($flowId, Array $attributes)
-  {
-    $opts = new EventOptions(json_encode($attributes));
-    $requestUrl = sprintf('%s/flow/%s', self::$options->getApiUrl(), $flowId);
-    $event = self::$eventManager->buildEvent($opts);
-    return self::$eventManager->sendSync($event, $requestUrl);
-  }
+    public static function getMiddleware()
+    {
+        return self::$middleware;
+    }
 }