SDK-603: Add the ability to retrieve different path in the sandbox client

Author: Moussa Sidibe

sandbox/src/Http/RequestBuilder.php

@@ -2,9 +2,9 @@
 namespace YotiSandbox\Http;
 
 use Yoti\Entity\Profile;
-use YotiSandbox\Entity\SandboxAgeVerification;
 use YotiSandbox\Entity\SandboxAnchor;
 use YotiSandbox\Entity\SandboxAttribute;
+use YotiSandbox\Entity\SandboxAgeVerification;
 
 class RequestBuilder
 {
@@ -59,11 +59,11 @@ public function setGivenNames($value, $optional = 'false', array $anchors = [])
         ));
     }
 
-    public function setDateOfBirth($value, $optional = 'false', array $anchors = [])
+    public function setDateOfBirth(\DateTime $dateTime, $optional = 'false', array $anchors = [])
     {
         $this->addAttribute($this->createAttribute(
             Profile::ATTR_DATE_OF_BIRTH,
-            $value,
+            $dateTime->format('d-m-Y'),
             '',
             $optional,
             $anchors
@@ -164,13 +164,9 @@ public function setDocumentDetails($value, $optional = 'true', array $anchors =
         ));
     }
 
-    public function setAgeVerification(\DateTime $dateObj, $derivation, array $anchors = [])
+    public function setAgeVerification(SandboxAgeVerification $ageVerification)
     {
-        $this->addAttribute(new SandboxAgeVerification(
-            $dateObj,
-            $derivation,
-            $anchors
-        ));
+        $this->addAttribute($ageVerification);
     }
 
     private function addAttribute(SandboxAttribute $attribute)
@@ -202,6 +198,17 @@ private function formatAnchors(array $anchors)
         return $anchorsList;
     }
 
+    /**
+     * @param string $name
+     * @param string $value
+     * @param string $derivation
+     *  Empty value means there is no derivation for this attribute
+     * @param string $optional
+     *  'false' value means this attribute is required
+     * @param array $anchors
+     *
+     * @return SandboxAttribute
+     */
     private function createAttribute($name, $value, $derivation, $optional, array $anchors)
     {
         return new SandboxAttribute($name, $value, $derivation, $optional, $anchors);
@@ -210,7 +217,7 @@ private function createAttribute($name, $value, $derivation, $optional, array $a
     /**
      * @return TokenRequest
      */
-    public function getRequest()
+    public function createRequest()
     {
         return new TokenRequest($this->rememberMeId, $this->sandboxAttributes);
     }

sandbox/src/Http/SandboxPathManager.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace YotiSandbox\Http;
+
+class SandboxPathManager
+{
+    /**
+     * This path is for profile request
+     */
+    const DEFAULT_PROFILE_API_PATH = 'https://dev0.api.yoti.com/sandbox/v1';
+    /**
+     * This path is for creating a Sandbox Application and for a token request
+     */
+    const DEFAULT_TOKEN_API_PATH = 'https://dev0.api.yoti.com:11443/sandbox/v1';
+
+    private $tokenApiPath;
+    private $profileApiPath;
+
+    public function __construct(
+        $tokenApiPath = self::DEFAULT_TOKEN_API_PATH,
+        $profileApiPath = self::DEFAULT_PROFILE_API_PATH
+    )
+    {
+        $this->tokenApiPath = $tokenApiPath;
+        $this->profileApiPath = $profileApiPath;
+    }
+
+    public function getTokenApiPath()
+    {
+        return $this->tokenApiPath;
+    }
+
+    public function getProfileApiPath()
+    {
+        return $this->profileApiPath;
+    }
+}

sandbox/src/SandboxClient.php

@@ -5,11 +5,11 @@
 use YotiSandbox\Http\Response;
 use Yoti\Http\CurlRequestHandler;
 use YotiSandbox\Http\RequestBuilder;
+use YotiSandbox\Http\SandboxPathManager;
 
 class SandboxClient
 {
     const TOKEN_REQUEST_ENDPOINT_FORMAT = "/apps/%s/tokens";
-    const DEFAULT_SANDBOX_API_URL = "https://api.yoti.com/sandbox/v1";
 
     /**
      * @var string
@@ -31,23 +31,23 @@ class SandboxClient
      *
      * @param string $sdkId
      * @param string $pem
-     * @param string $sandboxApi
+     * @param SandboxPathManager $sandboxPathManager
      * @param string $sdkIdentifier
      *
      * @throws \Yoti\Exception\RequestException
      * @throws \Yoti\Exception\YotiClientException
      */
-    public function __construct($sdkId, $pem, $sandboxApi = self::DEFAULT_SANDBOX_API_URL, $sdkIdentifier = 'PHP')
+    public function __construct($sdkId, $pem, SandboxPathManager $sandboxPathManager, $sdkIdentifier = 'PHP')
     {
         $this->sdkId = $sdkId;
         $pem = $this->includePemWrapper($pem);
         $this->requestHandler = new CurlRequestHandler(
-            $sandboxApi,
+            $sandboxPathManager->getTokenApiPath(),
             $pem,
             $sdkId,
             $sdkIdentifier
         );
-        $this->yotiClient = new YotiClient($sdkId, $pem);
+        $this->yotiClient = new YotiClient($sdkId, $pem, $sandboxPathManager->getProfileApiPath());
     }
 
     /**
@@ -96,7 +96,7 @@ public function getToken(RequestBuilder $requestBuilder, $httpMethod)
      */
     protected function sendRequest(RequestBuilder $requestBuilder, $endpoint, $httpMethod)
     {
-        $payload = $requestBuilder->getRequest()->getPayload();
+        $payload = $requestBuilder->createRequest()->getPayload();
 
         $resultArr = $this->requestHandler->sendRequest(
             $endpoint,
@@ -118,5 +118,4 @@ private function includePemWrapper($pem)
         }
         return $pem;
     }
-
 }

sandbox/tests/Http/RequestBuilderTest.php

@@ -27,21 +27,20 @@ public function setUp()
 
     public function testGetRequest()
     {
-        $tokenRequest = $this->requestBuilder->getRequest();
+        $tokenRequest = $this->requestBuilder->createRequest();
         $this->assertInstanceOf(TokenRequest::class, $tokenRequest);
     }
 
     public function testGetRememberMeId()
     {
-        $tokenRequest = $this->requestBuilder->getRequest();
+        $tokenRequest = $this->requestBuilder->createRequest();
         $this->assertEquals('fake_remember_me_id', $tokenRequest->getRememberMeId());
     }
 
     public function testShouldReturnFamilyNameAttr()
     {
-        $tokenRequest = $this->requestBuilder->getRequest();
+        $tokenRequest = $this->requestBuilder->createRequest();
         $sandboxAttributes = $tokenRequest->getSandboxAttributes();
-        $attrs = $sandboxAttributes['profile_attributes'];
-        $this->assertEquals($attrs[0]['name'], 'family_name');
+        $this->assertEquals($sandboxAttributes[0]['name'], 'family_name');
     }
 }

sandbox/tests/Http/TokenRequestTest.php

@@ -34,7 +34,7 @@ public function setUp()
 
     public function testGetSandboxAttributes()
     {
-        $expectedAttrs['profile_attributes'] = $this->sandboxAttrs;
+        $expectedAttrs= $this->sandboxAttrs;
         $this->assertEquals(
             json_encode($expectedAttrs),
             json_encode($this->tokenRequest->getSandboxAttributes())

sandbox/tests/SandboxClientTest.php

@@ -3,6 +3,7 @@
 namespace SandboxTest;
 
 use YotiSandbox\Http\RequestBuilder;
+use YotiSandbox\Http\SandboxPathManager;
 use YotiTest\TestCase;
 
 class SandboxClientTest extends TestCase
@@ -16,19 +17,20 @@ class SandboxClientTest extends TestCase
     public function setUp()
     {
         $this->pem = file_get_contents(PEM_FILE);
+        $sandboxPathManager = new SandboxPathManager();
 
         $this->sandboxClient = $this->getMockBuilder('YotiSandbox\SandboxClient')
-            ->setConstructorArgs([SDK_ID, $this->pem])
+            ->setConstructorArgs([SDK_ID, $this->pem, $sandboxPathManager])
             ->setMethods(['sendRequest'])
             ->getMock();
     }
 
     public function testGetToken()
     {
         $expectedToken = 'fake_token_xxx';
-        $result['response'] = [
+        $result['response'] = json_encode([
             'token' => $expectedToken
-        ];
+        ]);
         $result['http_code'] = 201;
 
         // Stub the method sendRequest to return the result we want