Merge branches 'develop' and 'master' of https://git.unicaen.fr/lib/unicaen/auth (d42aebe4) · Commits · Christophe Turbout / auth

Module.php

+0 −8

Original line number	Diff line number	Diff line
		@@ -69,14 +69,6 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
		/* @var $services \Zend\ServiceManager\ServiceManager */
		$services = $application->getServiceManager();

		if ($services->has('BjyAuthorize\Service\Authorize')) {
		// transmission des ACL aux aides de vue de navigation
		$authorizeService = $services->get('BjyAuthorize\Service\Authorize');
		/* @var $authorizeService \BjyAuthorize\Service\Authorize */
		Navigation::setDefaultAcl($authorizeService->getAcl());
		Navigation::setDefaultRole($authorizeService->getIdentity());
		}

		/* @var $options ModuleOptions */
		$this->options = $services->get('unicaen-auth_module_options');

+0 −44

Original line number	Diff line number	Diff line
		@@ -13,18 +13,8 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
		{
		use UserContextServiceAwareTrait;

		/**
		* Loading...
		*
		* @var boolean
		*/
		protected $loading;


		/**
		* @deprecated this method will be removed in BjyAuthorize 1.4.x+,
		* please retrieve the identity from the
		* `BjyAuthorize\Provider\Identity\ProviderInterface` service
		*
		* @return string
		*/
		@@ -47,38 +37,4 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
		return null;
		}



		/**
		* Retourne la liste des rôles fournis par l'ensemble des providers
		*/
		public function getRoles()
		{
		$roles = [];
		foreach ($this->roleProviders as $provider) {
		$r = $provider->getRoles();
		foreach ($r as $role) {
		$roles[$role->getRoleId()] = $role;
		}
		}

		return $roles;
		}



		/**
		* Initializes the service
		*
		* @internal
		*
		* @return void
		*/
		public function load()
		{
		$this->loading = true;
		parent::load();
		$this->loading = false;
		}

		}