Commit b79fe203 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'connexion-individu'

parents 0edcb135 4ffffb91

.gitignore

+3 −1
Changes for .gitignore: 3 added lines, 1 removed line.
Original line number Diff line number Diff line 
auth.json

vendor/

.idea/

data/DoctrineModule/

data/DoctrineORMModule/

.DS_Store

ressources/Logos



vendor/

!vendor/unicaen

.gitmodules

+0 −1
Changes for .gitmodules: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
[submodule "vendor/unicaen/app"]

	path = vendor/unicaen/app

	url = git@git.unicaen.fr:lib/unicaen/app.git



[submodule "vendor/unicaen/auth"]

	path = vendor/unicaen/auth

	url = git@git.unicaen.fr:lib/unicaen/auth.git
 
 No newline at end of file

composer.lock

+12 −4
Changes for composer.lock: 12 added lines, 4 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#composer-lock-the-lock-file",

        "This file is @generated automatically"

    ],

    "content-hash": "4b0b46293affec3e3b53426489dcffa9",

    "content-hash": "50e363a9c1369a7bf51fd0a092dd9357",

    "packages": [

        {

            "name": "bjyoungblood/bjy-authorize",
@@ -1858,11 +1858,11 @@ 
        },

        {

            "name": "unicaen/auth",

            "version": "1.2.1",

            "version": "dev-master",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/auth.git",

                "reference": "7abd386db52021383bc6dc9a84793bb59d8c3b2e"

                "reference": "af3c6d6fd2878cac6ee5615c02c61c6691b7fc63"

            },

            "require": {

                "bjyoungblood/bjy-authorize": ">=1.4",
@@ -3776,9 +3776,17 @@ 
            "time": "2018-01-29T19:49:41+00:00"

        }

    ],

    "aliases": [],

    "aliases": [

        {

            "alias": "1.2.1",

            "alias_normalized": "1.2.1.0",

            "version": "9999999-dev",

            "package": "unicaen/auth"

        }

    ],

    "minimum-stability": "stable",

    "stability-flags": {

        "unicaen/auth": 20,

        "bjyoungblood/bjy-authorize": 20

    },

    "prefer-stable": false,

module/Application/config/others/utilisateur.config.php

+2 −2
Changes for module/Application/config/others/utilisateur.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


use Application\Controller\Factory\UtilisateurControllerFactory;

use Application\Provider\Privilege\UtilisateurPrivileges;

use Application\Service\Individu\IndividuService;

use Application\Service\Individu\IndividuServiceFactory;

use Application\Service\Utilisateur\UtilisateurService;

use UnicaenAuth\Guard\PrivilegeController;
@@ -113,9 +113,9 @@ return [ 
    'service_manager' => [

        'invokables' => array(

            'UtilisateurService' => UtilisateurService::class,

            'IndividuService' => IndividuService::class,

        ),

        'factories' => [

            'IndividuService' => IndividuServiceFactory::class,

        ],

    ],

    'controllers'     => [

module/Application/src/Application/Authentication/Storage/AppStorage.php

+3 −3
Changes for module/Application/src/Application/Authentication/Storage/AppStorage.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


namespace Application\Authentication\Storage;



use Application\Entity\AuthUserWrapper;

use Application\Entity\UserWrapper;

use Application\Entity\Db\Doctorant;

use Application\Entity\Db\Etablissement;

use Application\Entity\Db\Utilisateur;
@@ -39,7 +39,7 @@ class AppStorage implements ChainableStorage 
    private $contents;



    /**

     * @var AuthUserWrapper

     * @var UserWrapper

     */

    private $userWrapper;
@@ -60,7 +60,7 @@ class AppStorage implements ChainableStorage 
            return;

        }



        $this->userWrapper = AuthUserWrapper::inst($this->contents['ldap'] ?: $this->contents['shib']);

        $this->userWrapper = UserWrapper::inst($this->contents['ldap'] ?: $this->contents['shib']);



        /**

         * Recherche de l'utilisateur connecté dans la table Utilisateur.