Merge branch 'release_2.2.2' into develop (540b1e2a) · Commits · open-source / sygal

CHANGELOG.md

+3 −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.
		- Le rapporteur peut annuler son avis de soutenance.

		2.2.1
		-----

composer.lock

+30 −28

Original line number	Diff line number	Diff line
		@@ -489,31 +489,32 @@
		},
		{
		"name": "doctrine/dbal",
		"version": "2.13.1",
		"version": "2.13.2",
		"source": {
		"type": "git",
		"url": "https://github.com/doctrine/dbal.git",
		"reference": "c800380457948e65bbd30ba92cc17cda108bf8c9"
		"reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9",
		"reference": "c800380457948e65bbd30ba92cc17cda108bf8c9",
		"url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4",
		"reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4",
		"shasum": ""
		},
		"require": {
		"doctrine/cache": "^1.0",
		"doctrine/cache": "^1.0\|^2.0",
		"doctrine/deprecations": "^0.5.3",
		"doctrine/event-manager": "^1.0",
		"ext-pdo": "*",
		"php": "^7.1 \|\| ^8"
		},
		"require-dev": {
		"doctrine/coding-standard": "8.2.0",
		"doctrine/coding-standard": "9.0.0",
		"jetbrains/phpstorm-stubs": "2020.2",
		"phpstan/phpstan": "0.12.81",
		"phpunit/phpunit": "^7.5.20\|^8.5\|9.5.0",
		"phpunit/phpunit": "^7.5.20\|^8.5\|9.5.5",
		"squizlabs/php_codesniffer": "3.6.0",
		"symfony/cache": "^4.4",
		"symfony/console": "^2.0.5\|^3.0\|^4.0\|^5.0",
		"vimeo/psalm": "4.6.4"
		},
		@@ -588,7 +589,7 @@
		"type": "tidelift"
		}
		],
		"time": "2021-04-17T17:30:19+00:00"
		"time": "2021-06-18T21:48:39+00:00"
		},
		{
		"name": "doctrine/deprecations",
		@@ -2358,16 +2359,16 @@
		},
		{
		"name": "symfony/console",
		"version": "v5.3.0",
		"version": "v5.3.2",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/console.git",
		"reference": "058553870f7809087fa80fa734704a21b9bcaeb2"
		"reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2",
		"reference": "058553870f7809087fa80fa734704a21b9bcaeb2",
		"url": "https://api.github.com/repos/symfony/console/zipball/649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
		"reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
		"shasum": ""
		},
		"require": {
		@@ -2449,7 +2450,7 @@
		"type": "tidelift"
		}
		],
		"time": "2021-05-26T17:43:10+00:00"
		"time": "2021-06-12T09:42:48+00:00"
		},
		{
		"name": "symfony/deprecation-contracts",
		@@ -3218,16 +3219,16 @@
		},
		{
		"name": "symfony/string",
		"version": "v5.3.0",
		"version": "v5.3.2",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/string.git",
		"reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b"
		"reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
		"reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
		"url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
		"reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
		"shasum": ""
		},
		"require": {
		@@ -3294,20 +3295,20 @@
		"type": "tidelift"
		}
		],
		"time": "2021-05-26T17:43:10+00:00"
		"time": "2021-06-06T09:51:56+00:00"
		},
		{
		"name": "symfony/var-dumper",
		"version": "v5.3.0",
		"version": "v5.3.2",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/var-dumper.git",
		"reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3"
		"reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/var-dumper/zipball/1d3953e627fe4b5f6df503f356b6545ada6351f3",
		"reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3",
		"url": "https://api.github.com/repos/symfony/var-dumper/zipball/905a22c68b292ffb6f20d7636c36b220d1fba5ae",
		"reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae",
		"shasum": ""
		},
		"require": {
		@@ -3379,7 +3380,7 @@
		"type": "tidelift"
		}
		],
		"time": "2021-05-27T12:28:50+00:00"
		"time": "2021-06-06T09:51:56+00:00"
		},
		{
		"name": "true/punycode",
		@@ -3493,11 +3494,11 @@
		},
		{
		"name": "unicaen/auth",
		"version": "3.2.2",
		"version": "3.2.3",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/auth.git",
		"reference": "6c09abb771b3d630c13f72c807e19bd07d2aac20"
		"reference": "4fa0c9dc8a76829ea7f95efbcf55aa5495bf0948"
		},
		"require": {
		"jasig/phpcas": "^1.3",
		@@ -3519,7 +3520,7 @@
		]
		},
		"description": "Module d'authentification pour les applications Unicaen",
		"time": "2021-06-17T08:39:01+00:00"
		"time": "2021-06-24T09:16:46+00:00"
		},
		{
		"name": "unicaen/auth-token",
		@@ -3527,7 +3528,7 @@
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/auth-token.git",
		"reference": "782bf7f578e672c9098fb896affe2b2274013f52"
		"reference": "81d5e165bef0a62762255a35be757c4bfe7b6176"
		},
		"require": {
		"ramsey/uuid": "^3.7",
		@@ -3546,7 +3547,7 @@
		]
		},
		"description": "Authentification à l'aide d'un token",
		"time": "2021-06-15T08:30:26+00:00"
		"time": "2021-06-18T09:34:01+00:00"
		},
		{
		"name": "unicaen/bjy-authorize",
		@@ -7821,6 +7822,7 @@
		],
		"description": "Provides a list of PHP built-in functions that operate on resources",
		"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
		"abandoned": true,
		"time": "2015-07-28T20:34:47+00:00"
		},
		{

module/Application/config/others/jetons.config.php

0 → 100755

+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,
		],
		];

module/Application/src/Application/Controller/UtilisateurController.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle
		public function ajouterAction()
		{
		$form = $this->creationUtilisateurForm;
		$form->setData(['individu' => 1]);
		// $form->setData(['individu' => 1]);

		/** @var Request $request */
		$request = $this->getRequest();

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.UtilisateurToken.dcm.xml

0 → 100644

+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>