Merge pull request #56 from cakephp/event-change

Move authorization check to Controller.startup.
cakephp · Aug 3, 2018 · bad690c · bad690c
2 parents d2792c4 + 351ca72
commit bad690c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Controller/Component/AuthorizationComponent.php b/src/Controller/Component/AuthorizationComponent.php
@@ -41,7 +41,7 @@ class AuthorizationComponent extends Component
     protected $_defaultConfig = [
         'identityAttribute' => 'identity',
         'serviceAttribute' => 'authorization',
-        'authorizationEvent' => 'Controller.initialize',
+        'authorizationEvent' => 'Controller.startup',
         'skipAuthorization' => [],
         'authorizeModel' => [],
         'actionMap' => []

diff --git a/tests/TestCase/Controller/Component/AuthorizationComponentTest.php b/tests/TestCase/Controller/Component/AuthorizationComponentTest.php
@@ -324,16 +324,16 @@ public function testImplementedEvents()
     {
         $events = $this->Auth->implementedEvents();
         $this->assertEquals([
-            'Controller.initialize' => 'authorizeAction'
+            'Controller.startup' => 'authorizeAction'
         ], $events);
     }
 
     public function testImplementedCustom()
     {
-        $this->Auth->setConfig('authorizationEvent', 'Controller.startup');
+        $this->Auth->setConfig('authorizationEvent', 'Controller.initialize');
         $events = $this->Auth->implementedEvents();
         $this->assertEquals([
-            'Controller.startup' => 'authorizeAction'
+            'Controller.initialize' => 'authorizeAction'
         ], $events);
     }