TeleSign
diff --git a/‎src/phoneid/PhoneIdClient.php‎
Lines changed: 4 additions & 60 deletions b/‎src/phoneid/PhoneIdClient.php‎
Lines changed: 4 additions & 60 deletions
diff --git a/‎src/rest/RestClient.php‎
Lines changed: 6 additions & 3 deletions b/‎src/rest/RestClient.php‎
Lines changed: 6 additions & 3 deletions
@@ -26,9 +26,10 @@ function phoneid ($phone_number, array $fields = []) {
   }
 
   protected function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null) {
-    print("\n********PHONEID*********\n");
     $json_fields = json_encode($fields);
 
+    $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/json" : "";
+    
     $headers = $this->generateTelesignHeaders(
       $this->customer_id,
       $this->api_key,
@@ -37,7 +38,8 @@ protected function execute ($method_name, $resource, $fields = [], $date = null,
       $json_fields,
       $date,
       $nonce,
-      $this->user_agent
+      $this->user_agent,
+      $content_type
     );
 
     $option = in_array($method_name, [ "POST", "PUT" ]) ? "body" : "query";
@@ -48,63 +50,5 @@ protected function execute ($method_name, $resource, $fields = [], $date = null,
       "http_errors" => false
     ]));
   }
-  
-  static function generateTelesignHeaders (
-    $customer_id,
-    $api_key,
-    $method_name,
-    $resource,
-    $url_encoded_fields,
-    $date = null,
-    $nonce = null,
-    $user_agent = null
-  ) {
-    if (!$date) {
-      $date = gmdate("D, d M Y H:i:s T");
-    }
-
-    if (!$nonce) {
-      $nonce = Uuid::uuid4()->toString();
-    }
-
-    $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/json" : "";
-    
-    $auth_method = "HMAC-SHA256";
-
-    $string_to_sign_builder = [
-      $method_name,
-      "\n$content_type",
-      "\n$date",
-      "\nx-ts-auth-method:$auth_method",
-      "\nx-ts-nonce:$nonce"
-    ];
-
-    if ($content_type && $url_encoded_fields) {
-      $string_to_sign_builder[] = "\n$url_encoded_fields";
-    }
-
-    $string_to_sign_builder[] = "\n$resource";
-
-    $string_to_sign = join("", $string_to_sign_builder);
-
-    $signature = base64_encode(
-      hash_hmac("sha256", utf8_encode($string_to_sign), base64_decode($api_key), true)
-    );
-    $authorization = "TSA $customer_id:$signature";
-
-    $headers = [
-      "Authorization" => $authorization,
-      "Date" => $date,
-      "Content-Type" => $content_type,
-      "x-ts-auth-method" => $auth_method,
-      "x-ts-nonce" => $nonce
-    ];
-
-    if ($user_agent) {
-      $headers["User-Agent"] = $user_agent;
-    }
-
-    return $headers;
-  }
 
 }
@@ -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,8 +97,10 @@ 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";