Commit b0e0b51e authored by David Surville's avatar David Surville
Browse files

Fusion brnache 5.x dans release/1.3.0 : intégration des périmètres

parent a8387f63
Loading
Loading
Loading
Loading
+2 −0
Changes for config/unicaen-authentification.local.php.dist: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ return [
             */
            'ldap' => [
                'enabled' => true,

                'username' => "supannAliasLogin",
            ],
        ],

+1 −0
Changes for data/sql/schema_oracle.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CREATE TABLE UNICAEN_ROLE (
  ID                      NUMBER(*,0)     NOT NULL,
  ROLE_ID                 VARCHAR2(64)    NOT NULL,
  LIBELLE                 VARCHAR2(255)   NOT NULL,
  DESCRIPTION             CLOB            NOT NULL,
  IS_DEFAULT              NUMBER(1)       DEFAULT 0 NOT NULL,
  IS_AUTO                 NUMBER(1)       DEFAULT 0 NOT NULL,
  PARENT_ID               NUMBER(*,0),
+1 −0
Changes for data/sql/schema_postgresql.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CREATE TABLE UNICAEN_ROLE (
  ID                    SERIAL        PRIMARY KEY,
  ROLE_ID               VARCHAR(64)   NOT NULL,
  LIBELLE               VARCHAR(255)  NOT NULL,
  DESCRIPTION           TEXT          NOT NULL,
  IS_DEFAULT            BOOLEAN       DEFAULT false NOT NULL,
  IS_AUTO               BOOLEAN       DEFAULT false NOT NULL,
  PARENT_ID             INTEGER,
+18 −3
Changes for src/UnicaenAuthentification/Entity/Ldap/People.php: 18 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,23 @@ use ZfcUser\Entity\UserInterface;
 */
class People extends BasePeople implements UserInterface, ProviderInterface
{
    /**
     * @var string
     */
    protected string $usernameAttributeName = 'supannAliasLogin';

    /**
     * @param string $usernameAttributeName
     * @return People
     */
    public function setUsernameAttributeName(string $usernameAttributeName): People
    {
        $this->usernameAttributeName = $usernameAttributeName;

        return $this;
    }


    /**
     * Constructeur.
     * 
@@ -65,9 +82,7 @@ class People extends BasePeople implements UserInterface, ProviderInterface
     */
    public function getUsername(?string $attribut = "supannAliasLogin")
    {
        if ($attribut === 'supannAliasLogin') return $this->supannaliaslogin;
        if ($attribut === 'uid') return $this->uid;
        return $this->supannaliaslogin;
        return $this->{$this->usernameAttributeName};
    }

    /**