Include authentication provider instance in Auth.afterIdentify event …

…data.
cakephp · Dec 2, 2015 · 8b746c5 · 8b746c5
1 parent 754f4a2
commit 8b746c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
@@ -697,7 +697,7 @@ protected function _getUser()
             $result = $auth->getUser($this->request);
             if (!empty($result) && is_array($result)) {
                 $this->_authenticationProvider = $auth;
-                $event = $this->dispatchEvent('Auth.afterIdentify', [$result]);
+                $event = $this->dispatchEvent('Auth.afterIdentify', [$result, $auth]);
                 if ($event->result !== null) {
                     $result = $event->result;
                 }
@@ -769,7 +769,7 @@ public function identify()
             $result = $auth->authenticate($this->request, $this->response);
             if (!empty($result) && is_array($result)) {
                 $this->_authenticationProvider = $auth;
-                $event = $this->dispatchEvent('Auth.afterIdentify', [$result]);
+                $event = $this->dispatchEvent('Auth.afterIdentify', [$result, $auth]);
                 if ($event->result !== null) {
                     return $event->result;
                 }

diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -1156,6 +1156,10 @@ public function testEventTriggering()
         $this->assertEquals($expected, $authObject->callStack);
         $expected = ['id' => 1, 'username' => 'admad'];
         $this->assertEquals($expected, $user);
+        $this->assertInstanceOf(
+            'TestApp\Auth\TestAuthenticate',
+            $authObject->authenticationProvider
+        );
 
         // Callback for Auth.afterIdentify returns a value
         $authObject->modifiedUser = true;

diff --git a/tests/test_app/TestApp/Auth/TestAuthenticate.php b/tests/test_app/TestApp/Auth/TestAuthenticate.php
@@ -27,6 +27,8 @@ class TestAuthenticate extends BaseAuthenticate
 
     public $callStack = [];
 
+    public $authenticationProvider;
+
     public function implementedEvents()
     {
         return [
@@ -43,6 +45,7 @@ public function authenticate(Request $request, Response $response)
     public function afterIdentify(Event $event, array $user)
     {
         $this->callStack[] = __FUNCTION__;
+        $this->authenticationProvider = $event->data[1];
 
         if (!empty($this->modifiedUser)) {
             return $user + ['extra' => 'foo'];