Merge pull request #22 from pmoraes/issue/21

refs #21 making the finder as custom

Author: skie

composer.json

@@ -29,7 +29,7 @@
     "require": {
         "php": ">=5.4.16",
         "cakephp/cakephp": "3.*",
-        "cakedc/users": "^4.0"
+        "cakedc/users": "^5.0"
     },
     "require-dev": {
         "cakedc/users": "*" ,

src/Service/Action/Auth/LoginAction.php

@@ -79,7 +79,7 @@ public function execute()
             $user = $this->_afterIdentifyUser($user, $socialLogin);
         }
         if (empty($user)) {
-            throw new UserNotFoundException(__d('CakeDC/Api', 'User not found'));
+            throw new UserNotFoundException(__d('CakeDC/Api', 'User not found'), 401);
         } else {
             return $user;
         }

src/Service/Auth/Authenticate/TokenAuthenticate.php

@@ -81,7 +81,7 @@ public function getUser(Request $request)
 
         $this->_config['fields']['username'] = $this->config('field');
         $this->_config['userModel'] = $this->config('table');
-        $this->_config['finder'] = 'all';
+        $this->_config['finder'] = $this->getConfig('finderAuth') ?: 'all';
         $result = $this->_query($apiKey)->first();
 
         if (empty($result)) {

tests/TestCase/Integration/Service/Action/Auth/LoginActionTest.php

@@ -76,7 +76,7 @@ public function testLoginFail()
     {
         $this->sendRequest('/auth/login', 'POST', ['username' => 'user-1', 'password' => '111']);
         $result = $this->responseJson();
-        $this->assertError($result, 404);
+        $this->assertError($result, 401);
         $this->assertErrorMessage($result, 'User not found');
     }
 }

tests/TestCase/Integration/Service/Action/Auth/ValidateAccountActionTest.php

@@ -56,7 +56,7 @@ public function testSuccessValidateAccount()
     {
         $this->sendRequest('/auth/login', 'POST', ['username' => 'user-6', 'password' => '12345']);
         $result = $this->responseJson();
-        $this->assertError($result, 404);
+        $this->assertError($result, 401);
         $this->assertErrorMessage($result, 'User not found');
 
         $this->sendRequest('/auth/validate_account', 'POST', ['token' => 'token-6']);