Commit 16ed4d88 authored by David Surville's avatar David Surville
Browse files

Merge branch 'master' into auth_migration

parents c3941bd7 e988eafd

src/UnicaenUtilisateur/Controller/RoleController.php

+13 −10
Changes for src/UnicaenUtilisateur/Controller/RoleController.php: 13 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace UnicaenUtilisateur\Controller; 


use BjyAuthorize\Provider\Identity\ProviderInterface;

use DateTime;

use Exception;

use UnicaenApp\View\Model\CsvModel;

use UnicaenUtilisateur\Entity\Db\RoleInterface;

use UnicaenUtilisateur\Entity\Db\UserInterface;
@@ -11,21 +12,21 @@ use UnicaenUtilisateur\Form\Role\RoleFormAwareTrait; 
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;

use Zend\Http\Request;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;

use Zend\View\Model\ViewModel;



/** @method FlashMessenger flashMessenger() */



class RoleController extends AbstractActionController {

    use RoleServiceAwareTrait;

    use RoleFormAwareTrait;



    /**

     * @var ProviderInterface

     */

    private $identityProvider;



    /** @var ProviderInterface */

    private $identityProviders;



    public function setIdentityProvider($provider)

    public function setIdentityProviders($provider)

    {

        $this->identityProvider = $provider;

        $this->identityProviders = $provider;

    }



    public function indexAction()
@@ -36,7 +37,7 @@ class RoleController extends AbstractActionController { 
        return new ViewModel([

            'title' => "Gestion des rôles",

            'roles' => $roles,

            'identityprovider' => $this->identityProvider,

            'identityproviders' => $this->identityProviders,

        ]);

    }
@@ -52,8 +53,10 @@ class RoleController extends AbstractActionController { 
                return $a->getDisplayName() > $b->getDisplayName();

            });

        } else {

            if ($this->identityProvider !== null) {

                $users = $this->identityProvider->computeUsersAutomatiques($role->getRoleId());

            if ($this->identityProviders !== null) {

                foreach ($this->identityProviders as $identityProvider) {

                    $users = array_merge($users, $identityProvider->computeUsersAutomatiques($role->getRoleId()));

                }

            }

        }

src/UnicaenUtilisateur/Controller/RoleControllerFactory.php

+4 −4
Changes for src/UnicaenUtilisateur/Controller/RoleControllerFactory.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -25,16 +25,16 @@ class RoleControllerFactory { 
        $config = $container->get('Config');

        $roleForm = $container->get('FormElementManager')->get(RoleForm::class);



        $identityProvider = null;

        $identityProviders = [];

        if ($config['unicaen-utilisateur']['identity-provider'] !== "") {

            if (isset($config['unicaen-utilisateur']['identity-provider'])) {

                $identityProviderPath = $config['unicaen-utilisateur']['identity-provider'];

                $identityProvider = $container->get($identityProviderPath);

                $identityProviderPaths = $config['unicaen-utilisateur']['identity-provider'];

                foreach ($identityProviderPaths as $identityProviderPath) $identityProviders[] = $container->get($identityProviderPath);

            }

        }



        $controller = new RoleController();

        $controller->setIdentityProvider($identityProvider);

        $controller->setIdentityProviders($identityProviders);

        $controller->setRoleService($roleService);

        $controller->setRoleForm($roleForm);

src/UnicaenUtilisateur/Controller/UtilisateurControllerFactory.php

+3 −2
Changes for src/UnicaenUtilisateur/Controller/UtilisateurControllerFactory.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ class UtilisateurControllerFactory 
            }

        }



        $identityProvider = null;

        $identityProvider = [];

        if (isset($moduleConfig['identity-provider']) && !empty($moduleConfig['identity-provider'])) {

            $identityProvider = $container->get($moduleConfig['identity-provider']);

            foreach ($moduleConfig['identity-provider'] as $value)

            $identityProvider[]= $container->get($value);

        }



        $controller = new UtilisateurController();

src/UnicaenUtilisateur/Entity/Db/Mapping/UnicaenUtilisateur.Entity.Db.Role.dcm.xml

+1 −0
Changes for src/UnicaenUtilisateur/Entity/Db/Mapping/UnicaenUtilisateur.Entity.Db.Role.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
            <sequence-generator sequence-name="UNICAEN_ROLE_ID_seq" allocation-size="1" initial-value="1"/>

        </id>



<!--        <field name="id" type="integer" column="ID" nullable="false"/>-->

        <field name="roleId" type="string" column="ROLE_ID" length="64" nullable="false"/>

        <field name="libelle" type="string" column="LIBELLE" length="64" nullable="false"/>

        <field name="default" type="boolean" column="IS_DEFAULT" nullable="false"/>

view/unicaen-utilisateur/role/index.phtml

+1 −1
Changes for view/unicaen-utilisateur/role/index.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use UnicaenUtilisateur\Provider\Privilege\RolePrivileges; 


/**

 * @var RoleInterface[] $roles

 * @var ProviderInterface $identityprovider

 * @var $identityproviders

 *

 * @see RoleController::indexAction()

 */