Merge pull request #50 from CakeDC/feature/allow-named-routes

Feature/allow named routes
CakeDC · Aug 12, 2019 · d2a26fc · d2a26fc
2 parents db29836 + 7ab37d3
commit d2a26fc
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 13 deletions.
diff --git a/src/Authentication/AuthenticationService.php b/src/Authentication/AuthenticationService.php
@@ -31,6 +31,7 @@ class AuthenticationService extends BaseService
      * @var Failure[]
      */
     protected $failures = [];
+
     /**
      * Proceed to google verify action after a valid result result
      *

diff --git a/src/Authentication/DefaultTwoFactorAuthenticationChecker.php b/src/Authentication/DefaultTwoFactorAuthenticationChecker.php
@@ -32,6 +32,7 @@ public function __construct($enableKey = null)
             $this->enabledKey = $enableKey;
         }
     }
+
     /**
      * Check if two factor authentication is enabled
      *

diff --git a/src/Social/Mapper/AbstractMapper.php b/src/Social/Mapper/AbstractMapper.php
@@ -62,6 +62,7 @@ public function __construct($mapFields = null)
         }
         $this->_mapFields = array_merge($this->_defaultMapFields, $this->_mapFields);
     }
+
     /**
      * Invoke method
      *

diff --git a/src/Traits/ReCaptchaTrait.php b/src/Traits/ReCaptchaTrait.php
@@ -36,6 +36,7 @@ public function validateReCaptchaFromRequest($request)
             $request->clientIp()
         );
     }
+
     /**
      * Validates reCaptcha response
      *

diff --git a/tests/TestCase/Authenticator/CookieAuthenticatorTest.php b/tests/TestCase/Authenticator/CookieAuthenticatorTest.php
@@ -36,6 +36,7 @@ public function dataProviderPersistIdentity()
             [false, 'my_remember', [], ['remember_me' => 1]],
         ];
     }
+
     /**
      * testPersistIdentity
      *

diff --git a/tests/TestCase/Policy/RbacPolicyTest.php b/tests/TestCase/Policy/RbacPolicyTest.php
@@ -112,6 +112,7 @@ public function testGetRbacUseObject()
         $actual = $policy->getRbac($request);
         $this->assertSame($rbac, $actual);
     }
+
     /**
      * Test getRbac method
      */

diff --git a/tests/TestCase/Policy/SuperuserPolicyTest.php b/tests/TestCase/Policy/SuperuserPolicyTest.php
@@ -36,6 +36,7 @@ public function dataProviderCanAccess()
             [[], false, ['superuser_field' => 'is_master']],
         ];
     }
+
     /**
      * Test canAccess method
      *

diff --git a/tests/TestCase/Rbac/RbacTest.php b/tests/TestCase/Rbac/RbacTest.php
@@ -14,8 +14,8 @@
 use CakeDC\Auth\Rbac\Rbac;
 use CakeDC\Auth\Rbac\Rules\Owner;
 use Cake\Http\ServerRequest;
+use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Hash;
 use Psr\Log\LogLevel;
 use ReflectionClass;
 
@@ -1099,6 +1099,27 @@ function () {
                 //expected
                 false,
             ],
+            'named-route' => [
+                //permissions
+                [[
+                    'plugin' => 'CakeDC/Users',
+                    'controller' => 'Users',
+                    'action' => '*',
+                    'role' => 'admin',
+                ]],
+                //user
+                [
+                    'id' => 1,
+                    'username' => 'luke',
+                    'role' => 'admin',
+                ],
+                //request
+                [
+                    '_name' => 'testNamed',
+                ],
+                //expected
+                true,
+            ],
         ];
     }
 
@@ -1262,14 +1283,10 @@ public function badPermissionProvider()
      */
     protected function _requestFromArray($params)
     {
-        $request = new ServerRequest();
+        $request = new ServerRequest(Router::url($params));
+        $params = Router::parseRequest($request);
 
-        return $request
-            ->withParam('plugin', Hash::get($params, 'plugin'))
-            ->withParam('controller', Hash::get($params, 'controller'))
-            ->withParam('action', Hash::get($params, 'action'))
-            ->withParam('prefix', Hash::get($params, 'prefix'))
-            ->withParam('_ext', Hash::get($params, '_ext'));
+        return $request->withAttribute('params', $params);
     }
 
     public function testGetPermissions()

diff --git a/tests/TestCase/Social/Service/ServiceFactoryTest.php b/tests/TestCase/Social/Service/ServiceFactoryTest.php
@@ -26,6 +26,7 @@ class ServiceFactoryTest extends TestCase
      * @var ServiceFactory
      */
     public $Factory;
+
     /**
      * Setup the test case, backup the static object values so they can be restored.
      * Specifically backs up the contents of Configure and paths in App if they have

diff --git a/tests/config/routes.php b/tests/config/routes.php
@@ -1,6 +1,91 @@
 <?php
-\Cake\Routing\Router::connect('/my-test', [
-    'plugin' => 'CakeDC/Users',
-    'controller' => 'Users',
-    'action' => 'myTest'
-]);
+use \Cake\Routing\Router;
+
+Router::defaultRouteClass(\Cake\Routing\Route\DashedRoute::class);
+
+Router::scope('/', function (\Cake\Routing\RouteBuilder $routes) {
+    $routes->setExtensions(['other']);
+    $routes->connect('/my-test', [
+        'plugin' => 'CakeDC/Users',
+        'controller' => 'Users',
+        'action' => 'myTest'
+    ]);
+    $routes->connect('/test-named', [
+        'plugin' => 'CakeDC/Users',
+        'controller' => 'Users',
+        'action' => 'myTest'
+    ], [
+        '_name' => 'testNamed',
+    ]);
+    $routes->connect('/tests/tests/test', [
+        'plugin' => 'Tests',
+        'controller' => 'Tests',
+        'action' => 'test',
+    ]);
+    $routes->connect('/tests/tests/one', [
+        'plugin' => 'Tests',
+        'controller' => 'Tests',
+        'action' => 'one',
+    ]);
+    $routes->connect('/tests/tests/three', [
+        'plugin' => 'Tests',
+        'controller' => 'Tests',
+        'action' => 'three',
+    ]);
+    $routes->connect('/tests/tests/any', [
+        'plugin' => 'Tests',
+        'controller' => 'Tests',
+        'action' => 'any',
+    ]);
+    $routes->connect('/tests/test-tests/test-action', [
+        'plugin' => 'Tests',
+        'controller' => 'TestTests',
+        'action' => 'testAction',
+    ]);
+    $routes->connect('/tests2/test-tests/test-action', [
+        'plugin' => 'tests',
+        'controller' => 'test-tests',
+        'action' => 'test-action',
+    ]);
+    $routes->connect('/any/any/any', [
+        'plugin' => 'Any',
+        'controller' => 'Any',
+        'action' => 'any',
+    ]);
+    $routes->connect('/any/tests/test', [
+        'plugin' => 'Any',
+        'controller' => 'Tests',
+        'action' => 'test',
+    ]);
+    $routes->connect('/something/something/test', [
+        'plugin' => 'Something',
+        'controller' => 'Something',
+        'action' => 'test',
+    ]);
+    $routes->connect('/something/something/something', [
+        'plugin' => 'Something',
+        'controller' => 'Something',
+        'action' => 'something',
+    ]);
+    $routes->connect('/csv/tests/one', [
+        'prefix' => 'csv',
+        'controller' => 'Tests',
+        'action' => 'one',
+    ]);
+
+    $routes->fallbacks(\Cake\Routing\Route\DashedRoute::class);
+
+    $routes->setExtensions(['csv']);
+    $routes->connect('/tests/one', [
+        'controller' => 'Tests',
+        'action' => 'one',
+    ]);
+});
+
+Router::scope('/admin', ['prefix' => 'admin'], function (\Cake\Routing\RouteBuilder $routes) {
+    $routes->setExtensions(['other', 'csv']);
+    $routes->connect('/tests/one', [
+        'controller' => 'Tests',
+        'action' => 'one',
+    ]);
+});