Merge branch 'feature/TSMD-8502_PHP_PhoneID_SDK_change'

Author: vdamjanic

src/phoneid/PhoneIdClient.php

@@ -3,6 +3,9 @@
 namespace telesign\sdk\phoneid;
 
 use telesign\sdk\rest\RestClient;
+use telesign\sdk\rest\Response;
+
+use Ramsey\Uuid\Uuid;
 
 /**
  * A set of APIs that deliver deep phone number data attributes that help optimize the end user
@@ -21,5 +24,31 @@ class PhoneIdClient extends RestClient {
   function phoneid ($phone_number, array $fields = []) {
     return $this->post(sprintf(self::PHONEID_RESOURCE, $phone_number), $fields);
   }
+  
+  protected function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null) {
+    $json_fields = json_encode($fields);
+    
+    $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/json" : "";
+    
+    $headers = $this->generateTelesignHeaders(
+      $this->customer_id,
+      $this->api_key,
+      $method_name,
+      $resource,
+      $json_fields,
+      $date,
+      $nonce,
+      $this->user_agent,
+      $content_type
+    );
+
+    $option = in_array($method_name, [ "POST", "PUT" ]) ? "body" : "query";
+
+    return new Response($this->client->request($method_name, $resource, [
+      "headers" => $headers,
+      $option => $json_fields,
+      "http_errors" => false
+    ]));
+  }
 
 }

src/rest/RestClient.php

@@ -19,10 +19,10 @@
  */
 class RestClient {
 
-  private $customer_id;
-  private $api_key;
-  private $user_agent;
-  private $client;
+  protected $customer_id;
+  protected $api_key;
+  protected $user_agent;
+  protected $client;
 
   /**
    * TeleSign RestClient instantiation function
@@ -87,7 +87,8 @@ static function generateTelesignHeaders (
     $url_encoded_fields,
     $date = null,
     $nonce = null,
-    $user_agent = null
+    $user_agent = null,
+    $content_type = null
   ) {
     if (!$date) {
       $date = gmdate("D, d M Y H:i:s T");
@@ -96,9 +97,11 @@ static function generateTelesignHeaders (
     if (!$nonce) {
       $nonce = Uuid::uuid4()->toString();
     }
-
-    $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/x-www-form-urlencoded" : "";
-
+    
+    if (!$content_type) {
+        $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/x-www-form-urlencoded" : "";
+    }
+    
     $auth_method = "HMAC-SHA256";
 
     $string_to_sign_builder = [
@@ -203,7 +206,7 @@ function delete (...$args) {
    *
    * @return \telesign\sdk\rest\Response The RestClient Response object
    */
-  private function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null) {
+  protected function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null) {
     $url_encoded_fields = http_build_query($fields, null, "&");
 
     $headers = $this->generateTelesignHeaders(

test/phoneid/PhoneIdClientTest.php

@@ -9,7 +9,7 @@ final class PhoneIdClientTest extends ClientTest {
 
   const EXAMPLE_REFERENCE_ID = Example::REFERENCE_ID;
   const EXAMPLE_PHONE_NUMBER = Example::PHONE_NUMBER;
-
+  
   function getRequestExamples () {
     return [
       [
@@ -21,7 +21,7 @@ function getRequestExamples () {
         ],
         "uri" => self::EXAMPLE_REST_ENDPOINT . "/v1/phoneid/" . self::EXAMPLE_PHONE_NUMBER,
         [
-          "optional_param" => "123"
+          '{"optional_param":"123"}' => ""
         ]
       ]
     ];