forked from wallabag/wallabag
Merge pull request #8559 from wallabag/use-default-firewall-name
Use default firewall name
This commit is contained in:
@ -190,7 +190,7 @@ nelmio_cors:
|
||||
|
||||
fos_user:
|
||||
db_driver: orm
|
||||
firewall_name: secured_area
|
||||
firewall_name: main
|
||||
user_class: Wallabag\Entity\User
|
||||
registration:
|
||||
confirmation:
|
||||
|
||||
@ -37,7 +37,7 @@ security:
|
||||
pattern: ^/login$
|
||||
anonymous: ~
|
||||
|
||||
secured_area:
|
||||
main:
|
||||
pattern: ^/
|
||||
form_login:
|
||||
provider: fos_userbundle
|
||||
|
||||
@ -46,14 +46,13 @@ abstract class WallabagApiTestCase extends WebTestCase
|
||||
|
||||
/** @var UserManager $userManager */
|
||||
$userManager = $container->get('fos_user.user_manager');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$adminUser = $userManager->findUserBy(['username' => 'admin']);
|
||||
\assert($adminUser instanceof User);
|
||||
|
||||
$this->user = $adminUser;
|
||||
|
||||
$client->loginUser($adminUser, $firewallName);
|
||||
$client->loginUser($adminUser);
|
||||
|
||||
return $client;
|
||||
}
|
||||
|
||||
@ -53,7 +53,6 @@ abstract class WallabagTestCase extends WebTestCase
|
||||
$container = static::getContainer();
|
||||
|
||||
$userManager = $container->get('fos_user.user_manager');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$user = $userManager->findUserBy(['username' => $username]);
|
||||
|
||||
@ -61,7 +60,7 @@ abstract class WallabagTestCase extends WebTestCase
|
||||
throw new \Exception('Unable to find user "' . $username . '". Does fixtures were loaded?');
|
||||
}
|
||||
|
||||
$this->client->loginUser($user, $firewallName);
|
||||
$this->client->loginUser($user);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user