Merge pull request #125 from fingerprintjs/bugfix/update-event

Fix body in `updateEvent` method always being sent as empty json
fingerprintjs · Oct 10, 2024 · d179072 · d179072
2 parents 839fa93 + acdc56e
commit d179072
Show file tree

Hide file tree

Showing 96 changed files with 1,139 additions and 642 deletions.
diff --git a/.changeset/nervous-sheep-attend.md b/.changeset/nervous-sheep-attend.md
@@ -0,0 +1,5 @@
+---
+"fingerprint-pro-server-api-php-sdk": minor
+---
+
+Introduce `toPrettyString` in models that returns json encoded model in a pretty format
diff --git a/.changeset/rude-llamas-judge.md b/.changeset/rude-llamas-judge.md
@@ -0,0 +1,5 @@
+---
+"fingerprint-pro-server-api-php-sdk": patch
+---
+
+Fix body in `updateEvent` method always being sent as empty json
diff --git a/src/Api/FingerprintApi.php b/src/Api/FingerprintApi.php
@@ -31,6 +31,7 @@
 use Fingerprint\ServerAPI\ApiException;
 use Fingerprint\ServerAPI\Configuration;
 use Fingerprint\ServerAPI\Model\EventUpdateRequest;
+use Fingerprint\ServerAPI\Model\ModelInterface;
 use Fingerprint\ServerAPI\ObjectSerializer;
 use Fingerprint\ServerAPI\SerializationException;
 use GuzzleHttp\Client;
@@ -1052,10 +1053,15 @@ protected function updateEventRequest(EventUpdateRequest $body, string $request_
         if (isset($body)) {
             $_tempBody = $body;
         }
+
         // for model (json/xml)
         if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            $httpBody = json_encode($_tempBody);
+            if ($_tempBody instanceof ModelInterface) {
+                $httpBody = (string) $_tempBody;
+            } else {
+                // $_tempBody is the method argument, if present
+                $httpBody = json_encode($_tempBody);
+            }
         }
 
         // this endpoint requires API key authentication

diff --git a/src/Model/ASN.php b/src/Model/ASN.php
@@ -123,13 +123,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -322,4 +315,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/BotdDetectionResult.php b/src/Model/BotdDetectionResult.php
@@ -123,13 +123,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -326,4 +319,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/BotdResult.php b/src/Model/BotdResult.php
@@ -149,13 +149,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -448,4 +441,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/BrowserDetails.php b/src/Model/BrowserDetails.php
@@ -153,13 +153,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -477,4 +470,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/ClonedAppResult.php b/src/Model/ClonedAppResult.php
@@ -111,13 +111,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -263,4 +256,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/Common403ErrorResponse.php b/src/Model/Common403ErrorResponse.php
@@ -123,13 +123,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -332,4 +325,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/Confidence.php b/src/Model/Confidence.php
@@ -117,13 +117,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -291,4 +284,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/DataCenter.php b/src/Model/DataCenter.php
@@ -117,13 +117,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -291,4 +284,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/DeprecatedIPLocation.php b/src/Model/DeprecatedIPLocation.php
@@ -161,13 +161,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -489,4 +482,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/DeprecatedIPLocationCity.php b/src/Model/DeprecatedIPLocationCity.php
@@ -111,13 +111,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -257,4 +250,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }
diff --git a/src/Model/DeveloperToolsResult.php b/src/Model/DeveloperToolsResult.php
@@ -111,13 +111,6 @@ public function __construct(?array $data = null)
      */
     public function __toString(): string
     {
-        if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
-            return json_encode(
-                ObjectSerializer::sanitizeForSerialization($this),
-                JSON_PRETTY_PRINT
-            );
-        }
-
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 
@@ -263,4 +256,16 @@ public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
+
+    /**
+     * Gets the string presentation of the object in a pretty JSON format.
+     *
+     */
+    public function toPrettyString(): string
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
 }