intro custom index path

Author: samanthajayasinghe

lib/API/Client.php

@@ -49,6 +49,11 @@ class Client
     private $grantType = 'client_credentials';
 
 
+    /**
+     * @var string
+     */
+    private $indexPath = '/index.php';
+
     /**
      * @var null
      */
@@ -185,6 +190,23 @@ private function setPath($path)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getIndexPath()
+    {
+        return $this->indexPath;
+    }
+
+    /**
+     * @param string $indexPath
+     * @return $this;
+     */
+    public function setIndexPath($indexPath)
+    {
+        $this->indexPath = $indexPath;
+        return $this;
+    }
 
     /**
      * @param HTTPRequest $request

lib/API/HTTPRequest.php

@@ -21,7 +21,7 @@
 
 
 class HTTPRequest {
-    const INDEX_PATH = '/symfony/web/index.php';
+
     const GET_TOKEN_END_POINT = 'oauth/issueToken';
 
     /**
@@ -37,7 +37,7 @@ class HTTPRequest {
     /**
      * @var bool
      */
-    private $isShortUrl = false;
+    private $indexPath = '/index.php';
 
     /**
      * @var string
@@ -98,18 +98,18 @@ public function setParams($params)
     /**
      * @return boolean
      */
-    public function isShortUrl()
+    public function getIndexPath()
     {
-        return $this->isShortUrl;
+        return $this->indexPath;
     }
 
     /**
-     * @param boolean $isShortUrl
+     * @param boolean $indexPath
      * @return $this;
      */
-    public function setIsShortUrl($isShortUrl)
+    public function setIndexPath($indexPath)
     {
-        $this->isShortUrl = $isShortUrl;
+        $this->indexPath = $indexPath;
         return $this;
     }
 
@@ -135,22 +135,17 @@ public function setBasePath($basePath)
      * @return string
      */
     public function buildEndPoint(){
-        $indexPath = null ;
-        if(!$this->isShortUrl()){
-            $indexPath = self::INDEX_PATH;
-        }
-        return $this->getBasePath().$indexPath.'/api/'.$this->getApiVersion().'/'.$this->getEndPoint();
+
+        return $this->getBasePath().$this->getIndexPath().'/api/'.$this->getApiVersion().'/'.$this->getEndPoint();
 
     }
 
     /**
      * @return string
      */
     public function getTokenEndPoint() {
-        if($this->isShortUrl()){
-            return self::GET_TOKEN_END_POINT;
-        }
-        return $this->getBasePath().self::INDEX_PATH.'/'.self::GET_TOKEN_END_POINT;
+
+        return $this->getBasePath().$this->getIndexPath().'/'.self::GET_TOKEN_END_POINT;
     }
 
     /**

test/ClientTest.php

@@ -27,7 +27,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->client = new Client('http://orangehrm.os','testclient','testpass');
+        $this->client = new Client('https://api-sample-cs.orangehrm.com','testclient','testpass');
     }
 
     public function testGetToken(){
@@ -39,6 +39,7 @@ public function testGetToken(){
     public function testGetRequest() {
         $request = new HTTPRequest('employee/search');
         $result = $this->client->get($request);
+
         $this->assertArrayHasKey('data',$result->getResult());
     }
 }

test/HTTPRequestTest.php

@@ -30,14 +30,28 @@ protected function setUp() {
         $this->httpRequest = new HTTPRequest();
     }
 
-    public function testBuildEndPointWhenEmptyEndPoint() {
+    public function testBuildEndPointWhenEmployeeEndPoint() {
         $this->httpRequest->setEndPoint('employee/search');
         $result = $this->httpRequest->buildEndPoint();
-        $this->assertEquals('/symfony/web/index.php/api/v1/employee/search',$result);
+        $this->assertEquals('/index.php/api/v1/employee/search',$result);
     }
 
     public function testGetTokenEndPoint() {
 
+        $result = $this->httpRequest->getTokenEndPoint();
+        $this->assertEquals('/index.php/oauth/issueToken',$result);
+    }
+
+    public function testBuildEndPointWhenEmployeeEndPointWithCustomIndexPath() {
+        $this->httpRequest->setEndPoint('employee/search');
+        $this->httpRequest->setIndexPath('/symfony/web/index.php');
+        $result = $this->httpRequest->buildEndPoint();
+        $this->assertEquals('/symfony/web/index.php/api/v1/employee/search',$result);
+    }
+
+    public function testGetTokenEndPointWithCustomIndexPath() {
+
+        $this->httpRequest->setIndexPath('/symfony/web/index.php');
         $result = $this->httpRequest->getTokenEndPoint();
         $this->assertEquals('/symfony/web/index.php/oauth/issueToken',$result);
     }