Adaptations suites aux améliorations dans unicaen/auth 3.2.0 (0a9258ac) · Commits · open-source / sygal

composer.json

+1 −1

Changes for composer.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		"guzzlehttp/guzzle": "^6.3",
		"ramsey/uuid": "^3.3",
		"unicaen/app": "^3.1",
		"unicaen/auth": "dev-release-3.2.0",
		"unicaen/auth": "^3.2",
		"unicaen/bjy-authorize": "^3.0",
		"unicaen/code": "^3.0",
		"unicaen/db-import": "^3.1",

composer.lock

+8 −10

Changes for composer.lock: 8 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
		"This file is @generated automatically"
		],
		"content-hash": "96f7e1a50a95226e8fcf609f1459d7cc",
		"content-hash": "62ee747aa515c385b23f2b0c28950bf7",
		"packages": [
		{
		"name": "beberlei/assert",
		@@ -3493,11 +3493,11 @@
		},
		{
		"name": "unicaen/auth",
		"version": "dev-release-3.2.0",
		"version": "3.2.0",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/auth.git",
		"reference": "ca7e11b1f3849ce7613a330b863563a9dd47d693"
		"reference": "7a79e405c3b76e86e90710ed3b8f7ca6f0aba4a7"
		},
		"require": {
		"jasig/phpcas": "^1.3",
		@@ -3519,7 +3519,7 @@
		]
		},
		"description": "Module d'authentification pour les applications Unicaen",
		"time": "2021-05-10T13:01:54+00:00"
		"time": "2021-06-03T14:51:21+00:00"
		},
		{
		"name": "unicaen/bjy-authorize",
		@@ -3676,11 +3676,11 @@
		},
		{
		"name": "unicaen/ldap",
		"version": "3.1.13",
		"version": "3.1.14",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/ldap.git",
		"reference": "8f8ee943e901a0424c13c74e6cd26ca7ccbf75ea"
		"reference": "865afebb5a6b2ce182d82eabcb08ba8c56c01a75"
		},
		"require": {
		"php": "7.3.*",
		@@ -3709,7 +3709,7 @@
		]
		},
		"description": "Module Ldap des applications Unicaen",
		"time": "2021-05-20T17:05:42+00:00"
		"time": "2021-06-02T14:16:19+00:00"
		},
		{
		"name": "unicaen/oracle",
		@@ -8055,9 +8055,7 @@
		],
		"aliases": [],
		"minimum-stability": "stable",
		"stability-flags": {
		"unicaen/auth": 20
		},
		"stability-flags": [],
		"prefer-stable": false,
		"prefer-lowest": false,
		"platform": {

module/Application/src/Application/Entity/Db/Utilisateur.php

+0 −24

Changes for module/Application/src/Application/Entity/Db/Utilisateur.php: 0 added lines, 24 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,11 +22,6 @@ class Utilisateur extends AbstractUser implements UserInterface, ProviderInterfa
		*/
		protected $individu;

		/**
		* @var Role
		*/
		protected $lastRole;

		/**
		* @return Individu
		*/
		@@ -46,25 +41,6 @@ class Utilisateur extends AbstractUser implements UserInterface, ProviderInterfa
		return $this;
		}

		/**
		* @return Role\|null
		*/
		public function getLastRole()
		{
		return $this->lastRole;
		}

		/**
		* @param Role\|null $lastRole
		* @return self
		*/
		public function setLastRole(Role $lastRole = null)
		{
		$this->lastRole = $lastRole;

		return $this;
		}

		/**
		* @param Role $role
		* @return $this

module/Application/src/Application/Event/UserAuthenticatedEventListener.php

+4 −19

Changes for module/Application/src/Application/Event/UserAuthenticatedEventListener.php: 4 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ use Application\Service\Individu\IndividuServiceAwareTrait;
		use Application\Service\Utilisateur\UtilisateurServiceAwareTrait;
		use UnicaenAuth\Event\Listener\AuthenticatedUserSavedAbstractListener;
		use UnicaenAuth\Event\UserAuthenticatedEvent;
		use UnicaenAuth\Service\UserContext as UserContextService;

		class UserAuthenticatedEventListener extends AuthenticatedUserSavedAbstractListener
		{
		@@ -19,19 +18,6 @@ class UserAuthenticatedEventListener extends AuthenticatedUserSavedAbstractListe
		use EtablissementServiceAwareTrait;
		use UtilisateurServiceAwareTrait;

		/**
		* @var UserContextService
		*/
		private $userContextService;

		/**
		* @param UserContextService $userContextService
		*/
		public function setAuthUserContextService(UserContextService $userContextService)
		{
		$this->userContextService = $userContextService;
		}

		/**
		* Méthode appelée juste avant que l'entité utilisateur soit persistée.
		*
		@@ -39,17 +25,14 @@ class UserAuthenticatedEventListener extends AuthenticatedUserSavedAbstractListe
		*/
		public function onUserAuthenticatedPrePersist(UserAuthenticatedEvent $e)
		{
		parent::onUserAuthenticatedPrePersist($e);

		$userWrapperFactory = new UserWrapperFactory();
		$userWrapper = $userWrapperFactory->createInstanceFromUserAuthenticatedEvent($e);

		/** @var Utilisateur $utilisateur */
		$utilisateur = $e->getDbUser();
		$utilisateur->setDisplayName($userWrapper->getDisplayName()); // màj NOM Prénom

		// Sélection du dernier rôle endossé.
		if ($role = $utilisateur->getLastRole()) {
		$this->userContextService->setNextSelectedIdentityRole($role);
		}
		}

		/**
		@@ -61,6 +44,8 @@ class UserAuthenticatedEventListener extends AuthenticatedUserSavedAbstractListe
		*/
		public function onUserAuthenticatedPostPersist(UserAuthenticatedEvent $e)
		{
		parent::onUserAuthenticatedPostPersist($e);

		$userWrapperFactory = new UserWrapperFactory();
		$userWrapper = $userWrapperFactory->createInstanceFromUserAuthenticatedEvent($e);

module/Application/src/Application/Event/UserAuthenticatedEventListenerFactory.php

+2 −2

Changes for module/Application/src/Application/Event/UserAuthenticatedEventListenerFactory.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ class UserAuthenticatedEventListenerFactory
		use EtablissementServiceLocateTrait;
		use UtilisateurServiceLocateTrait;

		public function __invoke(ContainerInterface $container)
		public function __invoke(ContainerInterface $container): UserAuthenticatedEventListener
		{
		/** @var UserContextService $userContextService */
		$userContextService = $container->get('AuthUserContext');
		@@ -22,7 +22,7 @@ class UserAuthenticatedEventListenerFactory
		$etablissementService = $this->locateEtablissementService($container);

		$listener = new UserAuthenticatedEventListener();
		$listener->setAuthUserContextService($userContextService);
		$listener->setServiceUserContext($userContextService);
		$listener->setIndividuService($individuService);
		$listener->setEtablissementService($etablissementService);
		$listener->setUtilisateurService($this->locateUtilisateurService($container));