pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #8559 from wallabag/use-default-firewall-name

Browse Source 
Use default firewall name
This commit is contained in:
Yassine Guedidi
2025-11-23 17:15:54 +01:00
committed by GitHub
parent da8254ab18 a2497d9ce8
commit b2989c5dfd
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/config.yml
View File

@ -190,7 +190,7 @@ nelmio_cors:
fos_user: fos_user:
db_driver: orm db_driver: orm
firewall_name: secured_area firewall_name: main
user_class: Wallabag\Entity\User user_class: Wallabag\Entity\User
registration: registration:
confirmation: confirmation:

2
app/config/security.yml
View File

@ -37,7 +37,7 @@ security:
pattern: ^/login$ pattern: ^/login$
anonymous: ~ anonymous: ~
secured_area: main:
pattern: ^/ pattern: ^/
form_login: form_login:
provider: fos_userbundle provider: fos_userbundle

3
tests/Controller/Api/WallabagApiTestCase.php
View File

@ -46,14 +46,13 @@ abstract class WallabagApiTestCase extends WebTestCase
/** @var UserManager $userManager */ /** @var UserManager $userManager */
$userManager = $container->get('fos_user.user_manager'); $userManager = $container->get('fos_user.user_manager');
$firewallName = $container->getParameter('fos_user.firewall_name');
$adminUser = $userManager->findUserBy(['username' => 'admin']); $adminUser = $userManager->findUserBy(['username' => 'admin']);
\assert($adminUser instanceof User); \assert($adminUser instanceof User);
$this->user = $adminUser; $this->user = $adminUser;
$client->loginUser($adminUser, $firewallName); $client->loginUser($adminUser);
return $client; return $client;
} }

3
tests/WallabagTestCase.php
View File

@ -53,7 +53,6 @@ abstract class WallabagTestCase extends WebTestCase
$container = static::getContainer(); $container = static::getContainer();
$userManager = $container->get('fos_user.user_manager'); $userManager = $container->get('fos_user.user_manager');
$firewallName = $container->getParameter('fos_user.firewall_name');
$user = $userManager->findUserBy(['username' => $username]); $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?'); throw new \Exception('Unable to find user "' . $username . '". Does fixtures were loaded?');
} }
$this->client->loginUser($user, $firewallName); $this->client->loginUser($user);
} }
/** /**