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

Merge branch 'dev/uoa-bugfix' into 'develop' 

fix role not recognized

See merge request easy-solutions/apps/easyportal!51
This commit is contained in:
Charles-Edouard MARGUERITE 2026-03-03 15:43:39 +00:00
parent 32b42beb37 5fea79cafa
commit 3200d05ed6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Service/LoggerService.php
View File

@ -181,12 +181,11 @@ readonly class LoggerService
])); ]));
} }
public function logUOALinkDeactivated(int $uoaId, int $appId, int $roleId): void public function logUOALinkDeactivated(int $uoaId, int $appId): void
{ {
$this->organizationManagementLogger->notice('UOA link deactivated', [ $this->organizationManagementLogger->notice('UOA link deactivated', [
'uoa_id' => $uoaId, 'uoa_id' => $uoaId,
'app_id' => $appId, 'app_id' => $appId,
'role_id' => $roleId,
'ip' => $this->requestStack->getCurrentRequest()?->getClientIp() ?? 'unknown', 'ip' => $this->requestStack->getCurrentRequest()?->getClientIp() ?? 'unknown',
'timestamp' => $this->now(), 'timestamp' => $this->now(),
]); ]);

5
src/Service/UserOrganizationAppService.php
View File

@ -94,14 +94,13 @@ class UserOrganizationAppService
try{ try{
$uoa->setIsActive(false); $uoa->setIsActive(false);
$this->actionService->createAction("Deactivate UOA link", $userOrganization->getUsers(), $this->actionService->createAction("Deactivate UOA link", $userOrganization->getUsers(),
$userOrganization->getOrganization(), "App: " . $uoa->getApplication()->getName() . ", Role: " . $uoa->getRole()->getName()); $userOrganization->getOrganization(), "App: " . $uoa->getApplication()->getName());
$this->entityManager->persist($uoa); $this->entityManager->persist($uoa);
$this->loggerService->logUOALinkDeactivated($uoa->getId(), $uoa->getApplication()->getId(), $uoa->getRole()->getId()); $this->loggerService->logUOALinkDeactivated($uoa->getId(), $uoa->getApplication()->getId());
}catch (\Exception $exception){ }catch (\Exception $exception){
$this->loggerService->logCritical("Error deactivating UOA link", [ $this->loggerService->logCritical("Error deactivating UOA link", [
'uoa_id' => $uoa->getId(), 'uoa_id' => $uoa->getId(),
'app_id' => $uoa->getApplication()->getId(), 'app_id' => $uoa->getApplication()->getId(),
'role_id' => $uoa->getRole()->getId(),
'exception_message' => $exception->getMessage(), 'exception_message' => $exception->getMessage(),
]); ]);
} }