Commit 763d65d5 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'release_2.2.2' of git.unicaen.fr:open-source/sygal into release_2.2.2

parents b663df8c 6a6b098d
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
Journal des modifications
=========================

2.2.2
-----
- Ajout de l'utilisation du module auth-token pour la gestion des rapporteurs 
- Authentification simplifiée des rapporteurs à l'aide d'un token.

2.2.1
-----
+26 −0
Original line number Diff line number Diff line
<?php

namespace Application;

use Application\Entity\Db\UtilisateurToken;

return [
    'unicaen-auth' => [
        /**
         * Configuration de l'authentification à l'aide d'un token dans la BDD de l'application.
         */
        'token' => [
            /**
             * Description facultative de ce mode d'authentification qui apparaîtra sur la page de connexion.
             */
            'description' => "Description ????",
        ],
    ],

    'unicaen-auth-token' => [
        /**
         * Classe d'entité Doctrine mappant un jeton utilistauer en base de données.
         */
        'user_token_entity_class' => UtilisateurToken::class,
    ],
];
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
  <entity name="Application\Entity\Db\UtilisateurToken" table="USER_TOKEN">

    <id name="id" type="integer" column="ID">
      <generator strategy="SEQUENCE"/>
    </id>

    <field name="userId" type="integer" column="USER_ID"/>

    <field name="token" column="TOKEN"/>
    <field name="action" column="ACTION"/>
    <field name="actionsCount" type="integer" column="ACTIONS_COUNT"/>
    <field name="actionsMaxCount" type="integer" column="ACTIONS_MAX_COUNT"/>
    <field name="createdOn" type="datetime" column="CREATED_ON"/>
    <field name="expiredOn" type="datetime" column="EXPIRED_ON"/>
    <field name="lastUsedOn" type="datetime" column="LAST_USED_ON" nullable="true"/>

    <many-to-one field="user" target-entity="Application\Entity\Db\Utilisateur" fetch="LAZY">
      <join-columns>
        <join-column name="USER_ID" referenced-column-name="ID"/>
      </join-columns>
    </many-to-one>

  </entity>
</doctrine-mapping>
+21 −0
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

use UnicaenAuthToken\Entity\Db\AbstractUserToken;

/**
 * Class UtilisateurToken
 *
 * @method Utilisateur getUser()UnicaenAuthToken/Controller/TokenController.php 77
 * @method self setUser(Utilisateur $user)
 */
class UtilisateurToken extends AbstractUserToken
{
    const RESOURCE_ID = AbstractUserToken::RESOURCE_ID; // ne pas modifier !!

    /**
     * @var \Application\Entity\Db\Utilisateur
     */
    protected $user;
}
 No newline at end of file