SDK-603: Add YotiSandbox namespace to composer

Author: Moussa Sidibe

composer.json

@@ -43,7 +43,8 @@
       "Google\\Protobuf\\": "src/protobuflib/Google/Protobuf",
       "GPBMetadata\\": "src/protobuflib/GPBMetadata",
       "phpseclib\\": "src/phpseclib/",
-      "Yoti\\": "src/Yoti"
+      "Yoti\\": "src/Yoti",
+      "YotiSandbox\\": "sandbox/src"
     }
   },
   "require-dev": {
@@ -52,7 +53,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "YotiTest\\": "tests/"
+      "YotiTest\\": "tests/",
+      "SandboxTest\\": "sandbox/tests/"
     }
   }
 }

sandbox/composer.json

@@ -1,10 +1,5 @@
 {
   "description": "Sandbox for yoti-php-sdk",
-  "autoload": {
-    "psr-4": {
-      "YotiSandbox\\": "src"
-    }
-  },
   "repositories": [
     {
       "type": "git",
@@ -14,5 +9,10 @@
   "require": {
     "yoti/yoti-php-sdk": "dev-development",
     "symfony/dotenv": "3.3.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "YotiSandbox\\": "src"
+    }
   }
 }

sandbox/src/Http/Response.php

@@ -44,10 +44,12 @@ private function processData(array $result)
         $this->checkResponseStatus($result['http_code']);
 
         // Get decoded response data
-        $responseArr = $result['response'];
+        $responseJSON = $result['response'];
 
         $this->checkJsonError();
 
+        $responseArr = json_decode($responseJSON, true);
+
         if (!isset($responseArr['token'])) {
             throw new ResponseException('Token key is missing', 404);
         }

sandbox/src/Http/TokenRequest.php

@@ -19,7 +19,7 @@ class TokenRequest
     public function __construct($rememberMeId, array $sandboxAttrs)
     {
         $this->rememberMeId = $rememberMeId;
-        $this->sandboxAttributes['profile_attributes'] = $sandboxAttrs;
+        $this->sandboxAttributes = $sandboxAttrs;
     }
 
     public function getRememberMeId()
@@ -36,7 +36,7 @@ public function getPayload()
     {
         $payloadData = [
             'remember_me_id' => $this->rememberMeId,
-            $this->sandboxAttributes
+            'profile_attributes' => $this->sandboxAttributes,
         ];
         return new Payload($payloadData);
     }

sandbox/src/SandboxClient.php

@@ -8,7 +8,7 @@
 
 class SandboxClient
 {
-    const TOKEN_REQUEST_ENDPOINT_FORMAT = "/app/%s/tokens";
+    const TOKEN_REQUEST_ENDPOINT_FORMAT = "/apps/%s/tokens";
     const DEFAULT_SANDBOX_API_URL = "https://api.yoti.com/sandbox/v1";
 
     /**
@@ -40,13 +40,13 @@ class SandboxClient
     public function __construct($sdkId, $pem, $sandboxApi = self::DEFAULT_SANDBOX_API_URL, $sdkIdentifier = 'PHP')
     {
         $this->sdkId = $sdkId;
+        $pem = $this->includePemWrapper($pem);
         $this->requestHandler = new CurlRequestHandler(
             $sandboxApi,
             $pem,
             $sdkId,
             $sdkIdentifier
         );
-
         $this->yotiClient = new YotiClient($sdkId, $pem);
     }
 
@@ -96,12 +96,27 @@ public function getToken(RequestBuilder $requestBuilder, $httpMethod)
      */
     protected function sendRequest(RequestBuilder $requestBuilder, $endpoint, $httpMethod)
     {
+        $payload = $requestBuilder->getRequest()->getPayload();
+
         $resultArr = $this->requestHandler->sendRequest(
             $endpoint,
             $httpMethod,
-            $requestBuilder->getRequest()->getPayload()
+            $payload
         );
 
         return $resultArr;
     }
+
+    private function includePemWrapper($pem)
+    {
+        if (strpos($pem, 'PRIVATE') === false) {
+$pem = <<<EOF
+-----BEGIN RSA PRIVATE KEY-----
+{$pem}
+-----END RSA PRIVATE KEY-----
+EOF;
+        }
+        return $pem;
+    }
+
 }