Merge pull request #32 from MichaelJ2324/2.0

Updated Unit Tests + Tweaked Sudo
sugarcrm · Sep 26, 2017 · 78594e0 · 78594e0
2 parents 3fd4ed6 + 5790cdd
commit 78594e0
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,9 @@
 language: php
-
+matrix:
+  include:
+    - php: 5.3
+      dist: precise
 php:
-  - '5.3'
   - '5.4'
   - '5.5'
   - '5.6'

diff --git a/src/Auth/SugarOAuthController.php b/src/Auth/SugarOAuthController.php
@@ -118,16 +118,16 @@ public function refresh()
 
     /**
      * Refreshes the OAuth 2 Token
+     * @param $user string
      * @return bool
      * @throws InvalidToken
      */
-    public function sudo($user,$data = array())
+    public function sudo($user)
     {
         if (isset($this->token['access_token'])) {
             $Endpoint = $this->getActionEndpoint(self::ACTION_SUGAR_SUDO);
-
             if ($Endpoint !== null) {
-                $Endpoint = $this->configureSudoEndpoint($Endpoint, $user,$data);
+                $Endpoint = $this->configureSudoEndpoint($Endpoint, $user);
                 $response = $Endpoint->execute()->getResponse();
                 if ($response->getStatus() == '200') {
                     //@codeCoverageIgnoreStart
@@ -143,13 +143,21 @@ public function sudo($user,$data = array())
         return FALSE;
     }
 
-    protected function configureSudoEndpoint(EndpointInterface $Endpoint,$user,$data = array())
+    /**
+     * Configure the Sudo Endpoint
+     * @param EndpointInterface $Endpoint
+     * @param $user
+     * @return EndpointInterface
+     */
+    protected function configureSudoEndpoint(EndpointInterface $Endpoint,$user)
     {
         $Endpoint->setAuth($this);
         $Endpoint->setOptions(array($user));
-        if (!empty($data)){
-            $Endpoint->setData($data);
-        }
+        $data = array();
+        $creds = $this->getCredentials();
+        $data['platform'] = $creds['platform'];
+        $data['client_id'] = $creds['client_id'];
+        $Endpoint->setData($data);
         return $Endpoint;
     }
 }
diff --git a/src/Client/Sugar7API.php b/src/Client/Sugar7API.php
@@ -125,15 +125,12 @@ public function logout(){
 
     /**
      * Helper method to Sudo to new user
+     * @param $user string
+     * @return bool
      */
-    public function sudo($user,$data=array())
+    public function sudo($user)
     {
-        if (empty($data)){
-            $creds = $this->getAuth()->getCredentials();
-            $data['platform'] = $creds['platform'];
-            $data['client_id'] = $creds['client_id'];
-        }
-        return $this->getAuth()->sudo($user,$data);
+        return $this->getAuth()->sudo($user);
     }
 
     /**

diff --git a/src/Storage/SugarStaticStorage.php b/src/Storage/SugarStaticStorage.php
@@ -23,6 +23,7 @@ protected function formatKey($key){
             if (isset($key['sudo'])){
                 $return .= "sudo".$key['sudo'];
             }
+            $return = rtrim($return,"_");
         }else {
             $return = $key;
         }

diff --git a/tests/Auth/SugarOAuthControllerTest.php b/tests/Auth/SugarOAuthControllerTest.php
@@ -4,6 +4,7 @@
 
 use MRussell\Http\Request\JSON;
 use Sugarcrm\REST\Auth\SugarOAuthController;
+use Sugarcrm\REST\Endpoint\OAuth2Sudo;
 use Sugarcrm\REST\Storage\SugarStaticStorage;
 use Sugarcrm\REST\Tests\Stubs\Auth\SugarOAuthStub;
 
@@ -37,6 +38,15 @@ public function tearDown()
         parent::tearDown();
     }
 
+    /**
+     * @covers ::__construct
+     */
+    public function testConstructor()
+    {
+        $Auth = new SugarOAuthStub();
+        $this->assertEquals(true,in_array('sudo',$Auth->getActions()));
+    }
+
     /**
      * @covers ::setCredentials
      */
@@ -125,4 +135,31 @@ public function testAuthHeader()
         $headers = $Request->getHeaders();
         $this->assertEquals('bar',$headers['OAuth-Token']);
     }
+
+    /**
+     * @covers ::sudo
+     * @covers ::configureSudoEndpoint
+     * @covers Sugarcrm\REST\Client\Sugar7API::sudo
+     */
+    public function testSudo()
+    {
+        $Auth = new SugarOAuthStub();
+        $Auth->setCredentials(array(
+            'username' => 'system',
+            'password' => 'asdf',
+            'client_id' => 'sugar',
+            'client_secret' => '',
+            'platform' => 'api'
+        ));
+        $EP = new OAuth2Sudo();
+        $EP->setBaseUrl('http://localhost/rest/v10');
+        $Auth->setActionEndpoint($Auth::ACTION_SUGAR_SUDO,$EP);
+        $Auth->sudo('max');
+        $request = $EP->getRequest();
+        $this->assertEquals('http://localhost/rest/v10/oauth2/sudo/max',$request->getURL());
+        $this->assertEquals(array(
+            'client_id' => 'sugar',
+            'platform' => 'api'
+        ),$request->getBody());
+    }
 }
diff --git a/tests/Client/Sugar7APITest.php b/tests/Client/Sugar7APITest.php
@@ -150,4 +150,15 @@ public function testLogout(){
         $Client->setAuth($Auth);
         $this->assertEquals(true,$Client->logout());
     }
+
+    /**
+     * @covers ::sudo
+     */
+    public function testSudo()
+    {
+        $Client = new Sugar7API('localhost');
+        $Auth = new SugarOAuthStub();
+        $Client->setAuth($Auth);
+        $this->assertEquals(false,$Client->sudo('max'));
+    }
 }
diff --git a/tests/Endpoint/AbstractSugarBeanEndpointTest.php b/tests/Endpoint/AbstractSugarBeanEndpointTest.php
@@ -354,6 +354,15 @@ public function testUpdateModel(){
             'baz' => 'bar',
             'favorite' => 0
         ),$Bean->asArray());
+
+        $Bean->reset();
+        $body->setValue($Bean->getResponse(),json_encode(array('record' => array('id' => '12345'),'filename' => array('guid' => 'test.txt'))));
+        $Bean->setCurrentAction(Module::BEAN_ACTION_TEMP_FILE_UPLOAD);
+        $updateModel->invoke($Bean);
+        $this->assertEquals(array(
+            'filename_guid' => '12345',
+            'filename' => 'test.txt'
+        ),$Bean->asArray());
     }
 
     /**

diff --git a/tests/Storage/SugarStaticStorageTest.php b/tests/Storage/SugarStaticStorageTest.php
@@ -53,12 +53,12 @@ public function testStorage(){
         $this->assertEquals(true,$Storage->store(array(
             'server' => 'test.sugarondemand.com'
         ),$this->token));
-        $token = $Storage->get('test.sugarondemand.com_');
+        $token = $Storage->get('test.sugarondemand.com');
         $this->assertEquals($this->token,json_decode($token,TRUE));
         $this->assertEquals(true,$Storage->remove(array(
             'server' => 'test.sugarondemand.com'
         )));
-        $token = $Storage->get('test.sugarondemand.com_');
+        $token = $Storage->get('test.sugarondemand.com');
         $this->assertEquals(NULL,$token);
 
 
@@ -88,6 +88,15 @@ public function testStorage(){
             'platform' => 'base'
         ));
         $this->assertEquals(NULL,$token);
+
+        $this->assertEquals(true,$Storage->store(array(
+            'server' => 'test.sugarondemand.com',
+            'platform' => 'base',
+            'client_id' => 'foo',
+            'sudo' => 'max'
+        ),$this->token));
+        $token = $Storage->get('test.sugarondemand.com_foo_base_sudomax');
+        $this->assertEquals(json_encode($this->token),$token);
     }
 
 }