Pull request #9: Add some features

Merge in SDK/php_telesign from feature/91979 to developer

* commit '076b4d461b1d28d2c4616184e6b3175c5ebb464f':
  Support send JSON

Author: jmartinez-telesign

src/rest/RestClient.php

@@ -23,6 +23,7 @@ class RestClient {
   protected $api_key;
   protected $user_agent;
   protected $client;
+  protected $rest_endpoint;
 
   /**
    * TeleSign RestClient instantiation function
@@ -44,9 +45,9 @@ function __construct (
   ) {
     $this->customer_id = $customer_id;
     $this->api_key = $api_key;
+    $this->rest_endpoint = $rest_endpoint;
 
     $this->client = new Client([
-      "base_uri" => $rest_endpoint,
       "timeout" => $timeout,
       "proxy" => $proxy,
       "handler" => $handler
@@ -59,6 +60,10 @@ function __construct (
     $this->user_agent = "TeleSignSDK/php-$sdk_version PHP/$php_version Guzzle/$guzzle_version";
   }
 
+  function setRestEndpoint($rest_endpoint) {
+    $this->rest_endpoint = $rest_endpoint;
+  }
+
   /**
    * Generates the TeleSign REST API headers used to authenticate requests.
    *
@@ -76,6 +81,8 @@ function __construct (
    * @param string $date               The date and time of the request
    * @param string $nonce              A unique cryptographic nonce for the request
    * @param string $user_agent         User Agent associated with the request
+   * @param string $content_type       Content-Type to send in header
+   * @param string $auth_method        Authentication method
    *
    * @return array The TeleSign authentication headers
    */
@@ -88,7 +95,8 @@ static function generateTelesignHeaders (
     $date = null,
     $nonce = null,
     $user_agent = null,
-    $content_type = null
+    $content_type = null,
+    $auth_method = "HMAC-SHA256"
   ) {
     if (!$date) {
       $date = gmdate("D, d M Y H:i:s T");
@@ -101,30 +109,35 @@ static function generateTelesignHeaders (
     if (!$content_type) {
         $content_type = in_array($method_name, ["POST", "PUT"]) ? "application/x-www-form-urlencoded" : "";
     }
-    
-    $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", mb_convert_encoding($string_to_sign, "UTF-8", mb_detect_encoding($string_to_sign)), base64_decode($api_key), true)
-    );
-    $authorization = "TSA $customer_id:$signature";
+    if ($auth_method === "Basic") {
+      $credentials = base64_encode("$customer_id:$api_key");
 
+      $authorization = "Basic $credentials";
+    } else {
+      $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", mb_convert_encoding($string_to_sign, "UTF-8", mb_detect_encoding($string_to_sign)), base64_decode($api_key), true)
+      );
+      $authorization = "TSA $customer_id:$signature";
+    }
+    
     $headers = [
       "Authorization" => $authorization,
       "Date" => $date,
@@ -203,28 +216,40 @@ function delete (...$args) {
    * @param array  $fields   Body of query params to perform the HTTP request with
    * @param string $date     The date and time of the request
    * @param string $nonce    A unique cryptographic nonce for the request
+   * @param string $content_type   Content-Type to send in header
+   * @param string $auth_method    Authentication method
    *
    * @return \telesign\sdk\rest\Response The RestClient Response object
    */
-  protected function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null) {
-    $url_encoded_fields = http_build_query($fields, "", "&");
+  protected function execute ($method_name, $resource, $fields = [], $date = null, $nonce = null, $content_type = null, $auth_method = "HMAC-SHA256") {
+    $content_is_json = $content_type === "application/json";
+
+    if ($content_is_json) {
+      $form_body = json_encode($fields);
+    } else {
+      $url_encoded_fields = http_build_query($fields, "", "&");
+    }
+
     $headers = $this->generateTelesignHeaders(
       $this->customer_id,
       $this->api_key,
       $method_name,
       $resource,
-      $url_encoded_fields,
+      $content_is_json ? null : $url_encoded_fields,
       $date,
       $nonce,
-      $this->user_agent
+      $this->user_agent,
+      $content_type,
+      $auth_method
     );
 
     $option = in_array($method_name, [ "POST", "PUT" ]) ? "body" : "query";
 
     return new Response($this->client->request($method_name, $resource, [
       "headers" => $headers,
-      $option => $url_encoded_fields,
-      "http_errors" => false
+      $option => $content_is_json ? $form_body : $url_encoded_fields,
+      "http_errors" => false,
+      "base_uri" => $this->rest_endpoint,
     ]));
   }
 

test/Example.php

@@ -12,4 +12,17 @@ class Example {
   const REFERENCE_ID = "AEBC93B5898342F790E4E19FED41A7DA";
   const ACCOUNT_LIFECYCLE_EVENT = "create";
 
+  static function objExampleVerification() {
+    $obj = new \stdClass();
+
+    $info_number = new \stdClass();
+    $info_number->phone_number = self::PHONE_NUMBER;
+
+    $obj->recipient = $info_number;
+    $info_policy = new \stdClass();
+    $info_policy->method = "sms";
+    $obj->verification_policy[] = $info_policy;
+
+    return $obj;
+  }
 }