Feature/new request handling logic inter 767

run_checks.php

@@ -44,26 +44,16 @@
 error_reporting(error_reporting() & ~E_DEPRECATED);
 
 try {
-    $result = $client->getVisits($visitor_id);
-    $rawResponseDecoded = json_decode($result->getRawResponse(), true);
-    if ($rawResponseDecoded['visitorId'] !== $visitor_id) {
-        fwrite(STDERR, sprintf("Raw response for getVisits not working"));
-        exit(1);
-    }
-    fwrite(STDOUT, sprintf("Got visits: %s \n", $result->getRawResponse()));
+    list($result, $body) = $client->getVisitsWithHttpInfo($visitor_id);
+    fwrite(STDOUT, sprintf("Got visits: %s \n", $body));
 } catch (Exception $e) {
     fwrite(STDERR, sprintf("Exception when calling FingerprintApi->getVisits: %s\n", $e->getMessage()));
     exit(1);
 }
 
 try {
-    $result = $client->getEvent($request_id);
-    $rawResponseDecoded = json_decode($result->getRawResponse(), true);
-    if ($rawResponseDecoded['products']['identification']['data']['requestId'] !== $request_id) {
-        fwrite(STDERR, sprintf("Raw response for getEvent not working"));
-        exit(1);
-    }
-    fwrite(STDOUT, sprintf("\n\nGot event: %s \n", $result->getRawResponse()));
+    list($result, $body) = $client->getEventWithHttpInfo($request_id);
+    fwrite(STDOUT, sprintf("\n\nGot event: %s \n", $body));
 } catch (Exception $e) {
     fwrite(STDERR, sprintf("\n\nException when calling FingerprintApi->getVisits: %s\n", $e->getMessage()));
     exit(1);

scripts/generate.sh

@@ -68,15 +68,3 @@ mv -f src/composer.json composer.json
 find ./docs -type f ! -name "DecryptionKey.md" ! -name "Sealed.md" -exec rm {} +
 mv -f src/docs/* ./docs
 
-declare -a modelsWithRawResponse=("./src/Model/EventResponse.php" "./src/Model/Response.php")
-
-for model in "${modelsWithRawResponse[@]}"; do
-  # enable WithRawResponse trait for the model
-  (
-    if [ "$platform" = "Darwin" ]; then
-      sed -i '' 's/\/\/ use \\/use \\/' $model
-    else
-      sed -i 's/\/\/ use \\/use \\/' $model
-    fi
-  )
-done

src/Api/FingerprintApi.php

@@ -85,6 +85,9 @@ public function getConfig()
     public function getEvent($request_id)
     {
         list($response) = $this->getEventWithHttpInfo($request_id);
+        if ($response === null) {
+            throw new \Exception("SerializationError, please get full response body with getEventWithHttpInfo");
+        }
         return $response;
     }
 
@@ -97,7 +100,7 @@ public function getEvent($request_id)
      *
      * @throws \Fingerprint\ServerAPI\ApiException on non-2xx response
      * @throws \InvalidArgumentException
-     * @return array of \Fingerprint\ServerAPI\Model\EventResponse, HTTP status code, HTTP response headers (array of strings)
+     * @return array of \Fingerprint\ServerAPI\Model\EventResponse, HTTP Response body contents, HTTP status code, HTTP response headers (array of strings)
      */
     public function getEventWithHttpInfo($request_id)
     {
@@ -134,11 +137,16 @@ public function getEventWithHttpInfo($request_id)
 
             $responseBody = $response->getBody()->getContents();
 
-            $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
-            $serialized->setRawResponse($responseBody);
+            $serialized = null;
+            try {
+                $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
+            } catch (\Exception $e) {
+                return [null, $responseBody, $response->getStatusCode(), $response->getHeaders()];
+            }
 
             return [
                 $serialized,
+                $responseBody,
                 $response->getStatusCode(),
                 $response->getHeaders()
             ];
@@ -152,7 +160,6 @@ public function getEventWithHttpInfo($request_id)
                         '\Fingerprint\ServerAPI\Model\EventResponse',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
                 case 403:
@@ -162,7 +169,6 @@ public function getEventWithHttpInfo($request_id)
                         '\Fingerprint\ServerAPI\Model\ErrorEvent403Response',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
                 case 404:
@@ -172,7 +178,6 @@ public function getEventWithHttpInfo($request_id)
                         '\Fingerprint\ServerAPI\Model\ErrorEvent404Response',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
             }
@@ -195,6 +200,10 @@ public function getEventAsync($request_id)
         return $this->getEventAsyncWithHttpInfo($request_id)
             ->then(
                 function ($response) {
+                    list($result) = $response;
+                    if ($result === null) {
+                        throw new \Exception("SerializationError, please get full response body with getEventWithHttpInfo");
+                    }
                     return $response[0];
                 }
             );
@@ -221,11 +230,16 @@ public function getEventAsyncWithHttpInfo($request_id)
                 function ($response) use ($returnType) {
                     $responseBody = $response->getBody()->getContents();
 
-                    $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
-                    $serialized->setRawResponse($responseBody);
+                    $serialized = null;
+                    try {
+                        $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
+                    } catch (\Exception $e) {
+                        return [null, $responseBody, $response->getStatusCode(), $response->getHeaders()];
+                    }
 
                     return [
                         $serialized,
+                        $responseBody,
                         $response->getStatusCode(),
                         $response->getHeaders()
                     ];
@@ -334,6 +348,9 @@ protected function getEventRequest($request_id)
     public function getVisits($visitor_id, $request_id = null, $linked_id = null, $limit = null, $pagination_key = null, $before = null)
     {
         list($response) = $this->getVisitsWithHttpInfo($visitor_id, $request_id, $linked_id, $limit, $pagination_key, $before);
+        if ($response === null) {
+            throw new \Exception("SerializationError, please get full response body with getVisitsWithHttpInfo");
+        }
         return $response;
     }
 
@@ -351,7 +368,7 @@ public function getVisits($visitor_id, $request_id = null, $linked_id = null, $l
      *
      * @throws \Fingerprint\ServerAPI\ApiException on non-2xx response
      * @throws \InvalidArgumentException
-     * @return array of \Fingerprint\ServerAPI\Model\Response, HTTP status code, HTTP response headers (array of strings)
+     * @return array of \Fingerprint\ServerAPI\Model\Response, HTTP Response body contents, HTTP status code, HTTP response headers (array of strings)
      */
     public function getVisitsWithHttpInfo($visitor_id, $request_id = null, $linked_id = null, $limit = null, $pagination_key = null, $before = null)
     {
@@ -388,11 +405,16 @@ public function getVisitsWithHttpInfo($visitor_id, $request_id = null, $linked_i
 
             $responseBody = $response->getBody()->getContents();
 
-            $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
-            $serialized->setRawResponse($responseBody);
+            $serialized = null;
+            try {
+                $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
+            } catch (\Exception $e) {
+                return [null, $responseBody, $response->getStatusCode(), $response->getHeaders()];
+            }
 
             return [
                 $serialized,
+                $responseBody,
                 $response->getStatusCode(),
                 $response->getHeaders()
             ];
@@ -406,7 +428,6 @@ public function getVisitsWithHttpInfo($visitor_id, $request_id = null, $linked_i
                         '\Fingerprint\ServerAPI\Model\Response',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
                 case 403:
@@ -416,7 +437,6 @@ public function getVisitsWithHttpInfo($visitor_id, $request_id = null, $linked_i
                         '\Fingerprint\ServerAPI\Model\ErrorVisits403',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
                 case 429:
@@ -426,7 +446,6 @@ public function getVisitsWithHttpInfo($visitor_id, $request_id = null, $linked_i
                         '\Fingerprint\ServerAPI\Model\ManyRequestsResponse',
                         $e->getResponseHeaders()
                     );
-                    $data->setRawResponse($responseBody);
                     $e->setResponseObject($data);
                     break;
             }
@@ -454,6 +473,10 @@ public function getVisitsAsync($visitor_id, $request_id = null, $linked_id = nul
         return $this->getVisitsAsyncWithHttpInfo($visitor_id, $request_id, $linked_id, $limit, $pagination_key, $before)
             ->then(
                 function ($response) {
+                    list($result) = $response;
+                    if ($result === null) {
+                        throw new \Exception("SerializationError, please get full response body with getVisitsWithHttpInfo");
+                    }
                     return $response[0];
                 }
             );
@@ -485,11 +508,16 @@ public function getVisitsAsyncWithHttpInfo($visitor_id, $request_id = null, $lin
                 function ($response) use ($returnType) {
                     $responseBody = $response->getBody()->getContents();
 
-                    $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
-                    $serialized->setRawResponse($responseBody);
+                    $serialized = null;
+                    try {
+                        $serialized = ObjectSerializer::deserialize($responseBody, $returnType, []);
+                    } catch (\Exception $e) {
+                        return [null, $responseBody, $response->getStatusCode(), $response->getHeaders()];
+                    }
 
                     return [
                         $serialized,
+                        $responseBody,
                         $response->getStatusCode(),
                         $response->getHeaders()
                     ];

src/ApiException.php

@@ -27,7 +27,7 @@
 
 namespace Fingerprint\ServerAPI;
 
-use Exception;
+use \Exception;
 
 /**
  * ApiException Class Doc Comment
@@ -39,6 +39,7 @@
  */
 class ApiException extends Exception
 {
+
     /**
      * The HTTP body of the server response either as Json or string.
      *

src/Configuration.php

@@ -461,4 +461,4 @@ public function getApiKeyWithPrefix($apiKeyIdentifier)
 
         return $keyWithPrefix;
     }
-}
+}

src/Model/ASN.php

@@ -28,8 +28,8 @@
 
 namespace Fingerprint\ServerAPI\Model;
 
-use ArrayAccess;
-use Fingerprint\ServerAPI\ObjectSerializer;
+use \ArrayAccess;
+use \Fingerprint\ServerAPI\ObjectSerializer;
 
 /**
  * ASN Class Doc Comment
@@ -41,8 +41,7 @@
  */
 class ASN implements ModelInterface, ArrayAccess
 {
-    // use \Fingerprint\ServerAPI\Traits\WithRawResponse;
-    public const DISCRIMINATOR = null;
+    const DISCRIMINATOR = null;
 
     /**
       * The original name of the model.
@@ -163,7 +162,7 @@ public function getModelName()
         return self::$swaggerModelName;
     }
 
-
+    
 
     /**
      * Associative array for storing property values

src/Model/BotdDetectionResult.php

@@ -28,8 +28,8 @@
 
 namespace Fingerprint\ServerAPI\Model;
 
-use ArrayAccess;
-use Fingerprint\ServerAPI\ObjectSerializer;
+use \ArrayAccess;
+use \Fingerprint\ServerAPI\ObjectSerializer;
 
 /**
  * BotdDetectionResult Class Doc Comment
@@ -42,8 +42,7 @@
  */
 class BotdDetectionResult implements ModelInterface, ArrayAccess
 {
-    // use \Fingerprint\ServerAPI\Traits\WithRawResponse;
-    public const DISCRIMINATOR = null;
+    const DISCRIMINATOR = null;
 
     /**
       * The original name of the model.
@@ -159,9 +158,9 @@ public function getModelName()
         return self::$swaggerModelName;
     }
 
-    public const RESULT_NOT_DETECTED = 'notDetected';
-    public const RESULT_GOOD = 'good';
-    public const RESULT_BAD = 'bad';
+    const RESULT_NOT_DETECTED = 'notDetected';
+const RESULT_GOOD = 'good';
+const RESULT_BAD = 'bad';
 
     /**
      * Gets allowable values of the enum

src/Model/BotdResult.php

@@ -28,8 +28,8 @@
 
 namespace Fingerprint\ServerAPI\Model;
 
-use ArrayAccess;
-use Fingerprint\ServerAPI\ObjectSerializer;
+use \ArrayAccess;
+use \Fingerprint\ServerAPI\ObjectSerializer;
 
 /**
  * BotdResult Class Doc Comment
@@ -42,8 +42,7 @@
  */
 class BotdResult implements ModelInterface, ArrayAccess
 {
-    // use \Fingerprint\ServerAPI\Traits\WithRawResponse;
-    public const DISCRIMINATOR = null;
+    const DISCRIMINATOR = null;
 
     /**
       * The original name of the model.
@@ -184,7 +183,7 @@ public function getModelName()
         return self::$swaggerModelName;
     }
 
-
+    
 
     /**
      * Associative array for storing property values

src/Model/BrowserDetails.php

@@ -28,8 +28,8 @@
 
 namespace Fingerprint\ServerAPI\Model;
 
-use ArrayAccess;
-use Fingerprint\ServerAPI\ObjectSerializer;
+use \ArrayAccess;
+use \Fingerprint\ServerAPI\ObjectSerializer;
 
 /**
  * BrowserDetails Class Doc Comment
@@ -41,8 +41,7 @@
  */
 class BrowserDetails implements ModelInterface, ArrayAccess
 {
-    // use \Fingerprint\ServerAPI\Traits\WithRawResponse;
-    public const DISCRIMINATOR = null;
+    const DISCRIMINATOR = null;
 
     /**
       * The original name of the model.
@@ -188,7 +187,7 @@ public function getModelName()
         return self::$swaggerModelName;
     }
 
-
+    
 
     /**
      * Associative array for storing property values