Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.2] Fix missing middleware parameters when using authorizeResource() #14592

Merged
merged 2 commits into from
Aug 4, 2016
Merged

[5.2] Fix missing middleware parameters when using authorizeResource() #14592

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b55fbd
Fix missing middleware parameters when using authorizeResource()
misenhower Aug 2, 2016
2b92896
Simulate requests in AuthorizesResourcesTest to verify that the middl…
misenhower Aug 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Illuminate/Foundation/Auth/Access/AuthorizesResources.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,16 @@ public function authorizeResource($model, $parameter = null, array $options = []
{
$parameter = $parameter ?: strtolower(class_basename($model));

$middleware = [];

foreach ($this->resourceAbilityMap() as $method => $ability) {
$modelName = in_array($method, ['index', 'create', 'store']) ? $model : $parameter;

$this->middleware("can:{$ability},{$modelName}", $options)->only($method);
$middleware["can:{$ability},{$modelName}"][] = $method;
}

foreach ($middleware as $middlewareName => $methods) {
$this->middleware($middlewareName, $options)->only($methods);
}
}

Expand Down
19 changes: 10 additions & 9 deletions tests/Auth/AuthorizesResourcesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,49 @@ public function testIndexMethod()
{
$controller = new AuthorizesResourcesController($this->request('index'));

$this->assertHasMiddleware($controller, 'can:view,App\User');
$this->assertHasMiddleware($controller, 'index', 'can:view,App\User');
}

public function testCreateMethod()
{
$controller = new AuthorizesResourcesController($this->request('create'));

$this->assertHasMiddleware($controller, 'can:create,App\User');
$this->assertHasMiddleware($controller, 'create', 'can:create,App\User');
}

public function testStoreMethod()
{
$controller = new AuthorizesResourcesController($this->request('store'));

$this->assertHasMiddleware($controller, 'can:create,App\User');
$this->assertHasMiddleware($controller, 'store', 'can:create,App\User');
}

public function testShowMethod()
{
$controller = new AuthorizesResourcesController($this->request('show'));

$this->assertHasMiddleware($controller, 'can:view,user');
$this->assertHasMiddleware($controller, 'show', 'can:view,user');
}

public function testEditMethod()
{
$controller = new AuthorizesResourcesController($this->request('edit'));

$this->assertHasMiddleware($controller, 'can:update,user');
$this->assertHasMiddleware($controller, 'edit', 'can:update,user');
}

public function testUpdateMethod()
{
$controller = new AuthorizesResourcesController($this->request('update'));

$this->assertHasMiddleware($controller, 'can:update,user');
$this->assertHasMiddleware($controller, 'update', 'can:update,user');
}

public function testDestroyMethod()
{
$controller = new AuthorizesResourcesController($this->request('destroy'));

$this->assertHasMiddleware($controller, 'can:delete,user');
$this->assertHasMiddleware($controller, 'destroy', 'can:delete,user');
}

/**
Expand All @@ -63,10 +63,11 @@ public function testDestroyMethod()
* @param string $middleware
* @return void
*/
protected function assertHasMiddleware($controller, $middleware)
protected function assertHasMiddleware($controller, $method, $middleware)
{
$this->assertTrue(
in_array($middleware, array_keys($controller->getMiddleware())),
in_array($middleware, array_keys($controller->getMiddleware()))
&& in_array($method, $controller->getMiddleware()[$middleware]['only']),
"The [{$middleware}] middleware was not registered"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may also want to add the method to the error message.

);
}
Expand Down