Skip to content

Ensure 'except' routes are not in routes at all. Fixes #72 #102

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

Merged
lonnieezell merged 1 commit into from
May 3, 2022
Merged

Ensure 'except' routes are not in routes at all. Fixes #72 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function routes(RouteCollection &$routes, array $config = [])

$routes->group('/', ['namespace' => 'CodeIgniter\Shield\Controllers'], static function ($routes) use ($authRoutes, $config) {
foreach ($authRoutes as $name => $row) {
if (! isset($config['except']) || (isset($config['except']) && ! array_key_exists($name, $config['except']))) {
if (! isset($config['except']) || (isset($config['except']) && ! in_array($name, $config['except'], true))) {
foreach ($row as $params) {
$options = isset($params[3])
? ['as' => $params[3]]
Expand Down
43 changes: 43 additions & 0 deletions tests/Unit/AuthRoutesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

namespace Tests\Unit;

use Tests\Support\TestCase;

/**
* @internal
*/
final class AuthRoutesTest extends TestCase
{
public function testRoutes()
{
$collection = single_service('routes');
$auth = service('auth');

$auth->routes($collection);

$routes = $collection->getRoutes('get');

$this->assertArrayHasKey('register', $routes);
$this->assertArrayHasKey('login', $routes);
$this->assertArrayHasKey('login/magic-link', $routes);
$this->assertArrayHasKey('logout', $routes);
$this->assertArrayHasKey('auth/a/show', $routes);
}

public function testRoutesExcept()
{
$collection = single_service('routes');
$auth = service('auth');

$auth->routes($collection, ['except' => ['login']]);

$routes = $collection->getRoutes('get');

$this->assertArrayNotHasKey('login', $routes);
$this->assertArrayHasKey('register', $routes);
$this->assertArrayHasKey('login/magic-link', $routes);
$this->assertArrayHasKey('logout', $routes);
$this->assertArrayHasKey('auth/a/show', $routes);
}
}