Merge pull request #8704 from Phillaf/master

BaseAuth now pass the username to custom finder
cakephp · Apr 27, 2016 · 024985e · 024985e
2 parents ef60e7e + 3088cc1
commit 024985e
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/src/Auth/BaseAuthenticate.php b/src/Auth/BaseAuthenticate.php
@@ -153,6 +153,10 @@ protected function _query($username)
             $finder = key($finder);
         }
 
+        if (!isset($options['username'])) {
+            $options['username'] = $username;
+        }
+
         $query = $table->find($finder, $options);
 
         return $query;

diff --git a/tests/TestCase/Auth/FormAuthenticateTest.php b/tests/TestCase/Auth/FormAuthenticateTest.php
@@ -319,6 +319,43 @@ public function testFinder()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Test using custom finder
+     *
+     * @return void
+     */
+    public function testFinderOptions()
+    {
+        $request = new Request('posts/index');
+        $request->data = [
+            'username' => 'mariano',
+            'password' => 'password'
+        ];
+
+        $this->auth->config([
+            'userModel' => 'AuthUsers',
+            'finder' => 'username'
+        ]);
+
+        $result = $this->auth->authenticate($request, $this->response);
+        $expected = [
+            'id' => 1,
+            'username' => 'mariano',
+        ];
+        $this->assertEquals($expected, $result);
+
+        $this->auth->config([
+            'finder' => ['username' => ['username' => 'nate']]
+        ]);
+
+        $result = $this->auth->authenticate($request, $this->response);
+        $expected = [
+            'id' => 5,
+            'username' => 'nate',
+        ];
+        $this->assertEquals($expected, $result);
+    }
+
     /**
      * test password hasher settings
      *

diff --git a/tests/test_app/TestApp/Model/Table/AuthUsersTable.php b/tests/test_app/TestApp/Model/Table/AuthUsersTable.php
@@ -12,6 +12,7 @@
  */
 namespace TestApp\Model\Table;
 
+use Cake\Core\Exception\Exception;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 
@@ -38,4 +39,24 @@ public function findAuth(Query $query, array $options)
 
         return $query;
     }
+
+    /**
+     * Custom finder
+     *
+     * @param \Cake\ORM\Query $query The query to find with
+     * @param array $options The options to find with
+     * @return \Cake\ORM\Query The query builder
+     */
+    public function findUsername(Query $query, array $options)
+    {
+        if (empty($options['username'])) {
+            throw new Exception(__('Username not defined'));
+        }
+
+        $query = $this->find()
+            ->where(['username' => $options['username']])
+            ->select(['id', 'username', 'password']);
+
+        return $query;
+    }
 }