Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev/portailV2' into 'develop' 

update user checker

See merge request easy-solutions/apps/easyportal!3
This commit is contained in:
Charles-Edouard MARGUERITE 2026-01-26 13:05:07 +00:00
parent 64ebaa4e05 940361ab4b
commit 0ad22cc465
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.test
View File

@ -1,6 +0,0 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots

1
.phpunit.cache/test-results Normal file
View File

File diff suppressed because one or more lines are too long

8
phpunit.xml.dist
View File

@ -9,9 +9,17 @@
<ini name="display_errors" value="1" /> <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" /> <ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" /> <server name="APP_ENV" value="test" force="true" />
<server name="APPLICATION" value="solutions" force="true" />
<server name="AWS_S3_PORTAL_URL" value="solutions" force="true" />
<env name="S3_PORTAL_BUCKET" value="test-bucket-placeholder" force="true" />
<server name="AWS_ENDPOINT" value="solutions" force="true" />
<server name="SHELL_VERBOSITY" value="-1" /> <server name="SHELL_VERBOSITY" value="-1" />
</php> </php>
<extensions>
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
</extensions>
<testsuites> <testsuites>
<testsuite name="Project Test Suite"> <testsuite name="Project Test Suite">
<directory>tests</directory> <directory>tests</directory>

33
src/Security/UserChecker.php
View File

@ -21,20 +21,25 @@ class UserChecker implements UserCheckerInterface
public function checkPostAuth(UserInterface $user): void public function checkPostAuth(UserInterface $user): void
{ {
// runs after credentials are validated //if not Super admin, perform checks
if (method_exists($user, 'isDeleted') && $user->isDeleted()) { // runs after credentials are validated
throw new CustomUserMessageAccountStatusException('Votre compte a été supprimé.'); if (method_exists($user, 'isDeleted') && $user->isDeleted()) {
throw new CustomUserMessageAccountStatusException('Votre compte a été supprimé.');
}
// check if the user account is active
if (method_exists($user, 'isActive') && !$user->isActive()) {
throw new CustomUserMessageAccountStatusException('Votre compte est désactivé.');
}
if (!in_array('ROLE_SUPER_ADMIN', $user->getRoles(), true))
{
//check if the user is in an organization
$uo = $this->entityManager->getRepository(UsersOrganizations::class)->findOneBy(['users' => $user, 'isActive' => true]);
if (!$uo) {
throw new CustomUserMessageAccountStatusException('Vous n\'êtes pas relié à une organisation. veuillez contacter un administrateur.');
}
} }
// check if the user account is active
if (method_exists($user, 'isActive') && !$user->isActive()) {
throw new CustomUserMessageAccountStatusException('Votre compte est désactivé.');
}
//check if the user is in an organization
$uo = $this->entityManager->getRepository(UsersOrganizations::class)->findOneBy(['users' => $user, 'isActive' => true]);
if (!$uo) {
throw new CustomUserMessageAccountStatusException('Vous n\'êtes pas relié à une organisation. veuillez contacter un administrateur.');
}
} }
} }