Merge pull request #103 from saeideng/named

AuthUser::hasAccess()

Author: dereuromark

src/View/Helper/AuthUserHelper.php

@@ -45,21 +45,19 @@ public function __construct(View $View, array $config = []) {
 	 */
 	public function hasAccess(array $url) {
 		if (isset($url['_name'])) {
+			//throw MissingRouteException if necessary
+			Router::url($url);
 			$routes = Router::getRouteCollection()->named();
-			if (isset($routes[$url['_name']])) {
-				$defaults = $routes[$url['_name']]->defaults;
-				if (!isset($defaults['action']) || !isset($defaults['controller'])) {
-					throw new Exception('Controller or action name could not be null.');
-				}
-				$url = [
-					'prefix' => !empty($defaults['prefix']) ? $defaults['prefix'] : null,
-					'plugin' => !empty($defaults['plugin']) ? $defaults['plugin'] : null,
-					'controller' => $defaults['controller'],
-					'action' => $defaults['action'],
-				];
-			} else {
-				throw new MissingRouteException(['url' => $url['_name']]);
+			$defaults = $routes[$url['_name']]->defaults;
+			if (!isset($defaults['action']) || !isset($defaults['controller'])) {
+				throw new Exception('Controller or action name could not be null.');
 			}
+			$url = [
+				'prefix' => !empty($defaults['prefix']) ? $defaults['prefix'] : null,
+				'plugin' => !empty($defaults['plugin']) ? $defaults['plugin'] : null,
+				'controller' => $defaults['controller'],
+				'action' => $defaults['action'],
+			];
 		} else {
 			$params = $this->_View->getRequest()->getAttribute('params');
 			$url += [

tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -162,7 +162,7 @@ public function testNamedRouteMissingControllerActionException() {
 		$request = ['_name' => 'Tags::edit'];
 		$this->expectException(Exception::class);
 		$this->expectExceptionMessage('Controller or action name could not be null.');
-		$result = $this->AuthUserHelper->hasAccess($request);
+		$this->AuthUserHelper->hasAccess($request);
 	}
 
 	/**
@@ -190,6 +190,34 @@ public function testInvalidNamedRouteException() {
 		$this->AuthUserHelper->hasAccess($request);
 	}
 
+	/**
+	 * Test that using incomplete names causes exceptions.
+	 *
+	 * @return void
+	 */
+	public function testIncompleteNamedRouteException() {
+		$user = [
+			'id' => 1,
+			'role_id' => 1
+		];
+		$this->View->set('_authUser', $user);
+
+		Router::connect(
+			'/view/{id}',
+			['controller' =>'Posts', 'action' => 'view'],
+			['_name' => 'Posts::view']
+		);
+
+		$request = ['_name' => 'Posts::view', 'id' => 1];
+		$result = $this->AuthUserHelper->hasAccess($request);
+		$this->assertTrue($result);
+
+		$this->expectException(MissingRouteException::class);
+		$request = ['_name' => 'Posts::view'];//missing id
+
+		$this->AuthUserHelper->hasAccess($request);
+	}
+
 	/**
 	 * @return void
 	 */