Added reqest back to security validation callback

Author: hkarlstrom

README.md

@@ -95,11 +95,11 @@ $options = [
 ```
 
 #### validateSecurity
-If defined, the callback can return Psr\Http\Message\ResponseInterface if the operation is not allowed. `$type` can be none, http or apiKey.
+If defined, the callback can return Psr\Http\Message\ResponseInterface if the operation is not allowed. `$type` can be `none`, `http` or `apiKey`.
 
 ```php
 $options = [
-    'validateSecurity' => function (string $type, string $token = '', ?array $scopes) : ?\Psr\Http\Message\ResponseInterface {
+    'validateSecurity' => function (ServerRequestInterface $request, string $type, string $token = '', ?array $scopes) : ?\Psr\Http\Message\ResponseInterface {
         // if user is authorized
         return null;
 

src/OpenApiValidation.php

@@ -81,13 +81,12 @@ public function __construct($schema, array $options = [])
         }
 
         $this->validator = new Validator();
-        $this->validator->setMaxErrors(99); 
+        $this->validator->setMaxErrors(99);
 
         $this->formatResolver = $this->validator->parser()->getFormatResolver();
 
         // Password validator only checks that it's a string, as format=password only is a hint to the UI
-        $this->formatResolver->register("string", "password", new OpenApiValidation\Formats\PasswordValidator());
-
+        $this->formatResolver->register('string', 'password', new OpenApiValidation\Formats\PasswordValidator());
     }
 
     public function addFormat(string $type, string $name, \Opis\JsonSchema\Format $format)
@@ -160,7 +159,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     public function validateSecurity(string $path, string $method, ServerRequestInterface $request) : ?ResponseInterface
     {
         $securityRequirements = $this->openapi->getOperationSecurity($path, $method);
-        if (!count($securityRequirements)) return null;
+        if (!count($securityRequirements)) {
+            return null;
+        }
 
         $callback = $this->options['validateSecurity'];
 
@@ -174,7 +175,7 @@ public function validateSecurity(string $path, string $method, ServerRequestInte
                         if ($authorizationHeader) {
                             // Remove basic or bearer
                             $token = str_replace(ucwords($securitySceme->scheme).' ', '', $authorizationHeader);
-                            return $callback('http', $token, $scopes);
+                            return $callback($request, 'http', $token, $scopes);
                         }
                         break;
                     case 'apiKey':
@@ -192,7 +193,7 @@ public function validateSecurity(string $path, string $method, ServerRequestInte
                                 break;
                         }
                         if ($token) {
-                            return $callback('apiKey', $token, $scopes);
+                            return $callback($request, 'apiKey', $token, $scopes);
                         }
                         break;
                 }
@@ -431,7 +432,7 @@ private function validateProperties(array $properties) : ?array
             }
             if (isset($result) && $result->hasError()) {
                 $error = $this->parseErrors($result->error(), $property->name, $property->in, $property);
-            
+
                 foreach ($error as $parsedError) {
                     // As all query param values are strings type errors should be discarded
                     $discard = false;
@@ -451,7 +452,7 @@ private function validateProperties(array $properties) : ?array
                     }
                 }
             }
-            }
+        }
 
         return $errors;
     }
@@ -467,7 +468,7 @@ private function validateObject(array $schema, string $value) : array
         try {
             $value  = json_decode($value);
             $schema = json_decode(json_encode($schema, JSON_PRESERVE_ZERO_FRACTION));
-            $result = $this->validator->validate($value, $schema,);
+            $result = $this->validator->validate($value, $schema, );
         } catch (Exception $e) {
             return [[
                 'name'    => 'server',
@@ -591,7 +592,7 @@ private function error(int $code, string $message, array $errors = []) : Respons
         return $response->withBody((new StreamFactory())->createStream(json_encode($json, JSON_PRESERVE_ZERO_FRACTION)));
     }
 
-    private function parseErrors(ValidationError $error, $name = null, $in = null, ?Property $property = null ) : array
+    private function parseErrors(ValidationError $error, $name = null, $in = null, ?Property $property = null) : array
     {
         $errors = [];
         if ($error->subErrors()) {