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

Page utilisateur : possibilité de voir/ajouter/supprimer/prolonger/tester le...

Page utilisateur : possibilité de voir/ajouter/supprimer/prolonger/tester le jeton d'authentification éventuel
parent 547df890
Loading
Loading
Loading
Loading
+52 −51
Changes for composer.lock: 52 added lines, 51 removed lines.
Original line number Diff line number Diff line
@@ -3430,11 +3430,11 @@
        },
        {
            "name": "unicaen/app",
            "version": "3.1.18",
            "version": "3.1.19",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/app.git",
                "reference": "4676702d03c1b748913a5207436c024cd81a244e"
                "reference": "cfd68a5c18308b0c54b8a449a71f9b11fbf1bccf"
            },
            "require": {
                "beberlei/assert": "^2.9",
@@ -3490,7 +3490,7 @@
                ]
            },
            "description": "Module de base des applications unicaen",
            "time": "2021-05-04T07:57:25+00:00"
            "time": "2021-06-25T09:52:59+00:00"
        },
        {
            "name": "unicaen/auth",
@@ -3528,7 +3528,7 @@
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/auth-token.git",
                "reference": "81d5e165bef0a62762255a35be757c4bfe7b6176"
                "reference": "60912b5a510aef43c015e601139b8fec3f0bf31b"
            },
            "require": {
                "ramsey/uuid": "^3.7",
@@ -3547,7 +3547,7 @@
                ]
            },
            "description": "Authentification à l'aide d'un token",
            "time": "2021-06-18T09:34:01+00:00"
            "time": "2021-06-25T09:56:26+00:00"
        },
        {
            "name": "unicaen/bjy-authorize",
@@ -7208,16 +7208,16 @@
        },
        {
            "name": "phpunit/phpunit",
            "version": "5.7.27",
            "version": "5.6.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
                "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ddb822f1de421b4cadb47570a525fd7d9359493",
                "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493",
                "shasum": ""
            },
            "require": {
@@ -7228,24 +7228,26 @@
                "ext-xml": "*",
                "myclabs/deep-copy": "~1.3",
                "php": "^5.6 || ^7.0",
                "phpspec/prophecy": "^1.6.2",
                "phpunit/php-code-coverage": "^4.0.4",
                "phpspec/prophecy": "^1.3.1",
                "phpunit/php-code-coverage": "^4.0.1",
                "phpunit/php-file-iterator": "~1.4",
                "phpunit/php-text-template": "~1.2",
                "phpunit/php-timer": "^1.0.6",
                "phpunit/phpunit-mock-objects": "^3.2",
                "sebastian/comparator": "^1.2.4",
                "sebastian/diff": "^1.4.3",
                "sebastian/environment": "^1.3.4 || ^2.0",
                "sebastian/exporter": "~2.0",
                "sebastian/global-state": "^1.1",
                "sebastian/object-enumerator": "~2.0",
                "sebastian/comparator": "~1.1",
                "sebastian/diff": "~1.2",
                "sebastian/environment": "^1.3 || ^2.0",
                "sebastian/exporter": "~1.2",
                "sebastian/global-state": "~1.0",
                "sebastian/object-enumerator": "~1.0",
                "sebastian/resource-operations": "~1.0",
                "sebastian/version": "^1.0.6|^2.0.1",
                "symfony/yaml": "~2.1|~3.0|~4.0"
                "sebastian/version": "~1.0|~2.0",
                "symfony/yaml": "~2.1|~3.0"
            },
            "conflict": {
                "phpdocumentor/reflection-docblock": "3.0.2"
                "phpdocumentor/reflection-docblock": "3.0.2",
                "sebastian/object-enumerator": "1.0.1",
                "sebastian/recursion-context": "1.0.3 || 1.0.4"
            },
            "require-dev": {
                "ext-pdo": "*"
@@ -7260,7 +7262,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "5.7.x-dev"
                    "dev-master": "5.6.x-dev"
                }
            },
            "autoload": {
@@ -7286,7 +7288,7 @@
                "testing",
                "xunit"
            ],
            "time": "2018-02-01T05:50:59+00:00"
            "time": "2016-11-18T09:50:51+00:00"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -7567,21 +7569,21 @@
        },
        {
            "name": "sebastian/exporter",
            "version": "2.0.0",
            "version": "1.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
                "sebastian/recursion-context": "~2.0"
                "sebastian/recursion-context": "~1.0"
            },
            "require-dev": {
                "ext-mbstring": "*",
@@ -7590,7 +7592,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "2.0.x-dev"
                    "dev-master": "1.3.x-dev"
                }
            },
            "autoload": {
@@ -7630,7 +7632,7 @@
                "export",
                "exporter"
            ],
            "time": "2016-11-19T08:54:04+00:00"
            "time": "2016-06-17T09:04:28+00:00"
        },
        {
            "name": "sebastian/global-state",
@@ -7685,21 +7687,21 @@
        },
        {
            "name": "sebastian/object-enumerator",
            "version": "2.0.1",
            "version": "1.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
                "shasum": ""
            },
            "require": {
                "php": ">=5.6",
                "sebastian/recursion-context": "~2.0"
                "sebastian/recursion-context": "~1.0"
            },
            "require-dev": {
                "phpunit/phpunit": "~5"
@@ -7707,7 +7709,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "2.0.x-dev"
                    "dev-master": "1.0.x-dev"
                }
            },
            "autoload": {
@@ -7727,20 +7729,20 @@
            ],
            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
            "time": "2017-02-18T15:18:39+00:00"
            "time": "2016-01-28T13:25:10+00:00"
        },
        {
            "name": "sebastian/recursion-context",
            "version": "2.0.0",
            "version": "1.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/recursion-context.git",
                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                "shasum": ""
            },
            "require": {
@@ -7752,7 +7754,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "2.0.x-dev"
                    "dev-master": "1.0.x-dev"
                }
            },
            "autoload": {
@@ -7780,7 +7782,7 @@
            ],
            "description": "Provides functionality to recursively process PHP variables",
            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
            "time": "2016-11-19T07:33:16+00:00"
            "time": "2016-10-03T07:41:43+00:00"
        },
        {
            "name": "sebastian/resource-operations",
@@ -7822,7 +7824,6 @@
            ],
            "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"
        },
        {
@@ -7870,27 +7871,27 @@
        },
        {
            "name": "symfony/yaml",
            "version": "v4.4.25",
            "version": "v3.4.47",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc"
                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1.3",
                "php": "^5.5.9|>=7.0.8",
                "symfony/polyfill-ctype": "~1.8"
            },
            "conflict": {
                "symfony/console": "<3.4"
            },
            "require-dev": {
                "symfony/console": "^3.4|^4.0|^5.0"
                "symfony/console": "~3.4|~4.0"
            },
            "suggest": {
                "symfony/console": "For validating YAML files using the lint command"
@@ -7918,7 +7919,7 @@
                    "homepage": "https://symfony.com/contributors"
                }
            ],
            "description": "Loads and dumps YAML files",
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
            "funding": [
                {
@@ -7934,7 +7935,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2021-05-26T17:39:37+00:00"
            "time": "2020-10-24T10:57:07+00:00"
        },
        {
            "name": "unicaen/test",
+1 −0
Changes for module/Application/config/module.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ return array(
            '061_uploader' => "/js/jquery.iframe-transport.js",
            '062_uploader' => "/js/jquery.fileupload.js",
            '063_uploader' => "/js/unicaen.uploader.widget.js",
            '070_clipboard' => "/js/clipboard.min.js",
        ],
        'inline_scripts' => [
            '070_bootstrap-select' => '/vendor/bootstrap-select-1.13.18/js/bootstrap-select.min.js',
+4 −4
Changes for module/Application/src/Application/Controller/UtilisateurController.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -31,14 +31,12 @@ use UnicaenAuth\Entity\Shibboleth\ShibUser;
use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\ShibService;
use UnicaenAuth\Service\Traits\UserServiceAwareTrait;
use UnicaenAuthToken\Entity\Db\UserToken;
use UnicaenAuthToken\Service\TokenServiceAwareTrait;
use UnicaenAuthToken\Service\TokenServiceException;
use Zend\Authentication\AuthenticationService;
use Zend\Http\Request;
use Zend\Http\Response;
use Zend\Paginator\Paginator as ZendPaginator;
use Zend\Validator\Date;
use Zend\View\Model\JsonModel;
use Zend\View\Model\ViewModel;

@@ -161,16 +159,18 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle
        $unites = $this->structureService->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle', true, true);
        $ecoles = $this->structureService->getAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle', true, true);

        $tokens = $this->tokenService->findUserTokensByUserId($utilisateur->getId());
        $userTokens = $this->tokenService->findUserTokensByUserId($utilisateur->getId());
        $this->tokenService->injectLogInUriInUserTokens($userTokens);

        return new ViewModel([
            'utilisateur' => $utilisateur,
            'tokens' => $tokens,
            'tokens' => $userTokens,
            'roles' => $roles,
            'rolesAffectes' => $rolesAffectes,
            'etablissements' => $etablissements,
            'ecoles' => $ecoles,
            'unites' => $unites,
            'redirect' => $this->url()->fromRoute(null, [], [], true),
        ]);

    }
+12 −34
Changes for module/Application/view/application/utilisateur/voir.phtml: 12 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ use UnicaenAuthToken\Entity\Db\UserToken;
 * @var Etablissement[] $etablissements
 * @var EcoleDoctorale[] $ecoles
 * @var UniteRecherche[] $unites
 * @var string $redirect
 *
 * @see \Application\Controller\UtilisateurController::indexAction()
 * @see \Application\Controller\UtilisateurController::voirAction()
 */

$canModifier = $this->isAllowed(Privileges::getResourceId(UtilisateurPrivileges::UTILISATEUR_MODIFICATION));
@@ -158,43 +159,20 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(UtilisateurPrivileges:
        <h2 class="first">
            <?php echo $this->translate("Jeton d'authentification") ?>
            <div class="pull-right">
                <br/>
                <a  <?php /** @see UtilisateurController::ajouterTokenAction() */?>
                    href="<?php echo $this->url('utilisateur/ajouter-token', ['utilisateur' => $utilisateur->getId()], [], true);?>" class="btn btn-danger">
                    Ajouter un jeton
                </a>
                <br>
                <?php echo $this->partial('unicaen-auth-token/token/partial/add-button', [
                    'redirect' => $redirect,
                    'user' => $utilisateur->getId(),
                ]) ?>
            </div>
        </h2>
    </div>
    <div class="panel-body">
        <table class="table table-condensed">
            <thead>
            <tr>
                <td>Jeton Id</td>
                <td>Créer le </td>
                <td>Expire le</td>
                <td>Nombre d'utilisation</td>
                <td>Action</td>
            </tr>
            </thead>
            <tbody>
            <?php foreach ($tokens as $token) : ?>
                <tr
                    <?php if ($token->isExpired()) : ?>
                        style="background: lightgray;"  <!-- todo class ---->
                    <?php endif; ?>
                >
                    <td> <?php echo $token->getId(); ?> </td>
                    <td> <?php echo $token->getCreatedOnToString(); ?> </td>
                    <td> <?php echo $token->getExpiredOnToString(); ?> </td>
                    <td> <?php echo $token->getActionsCountToString(); ?> </td>
                    <td>
                        ...
                    </td>
                </tr>
            <?php endforeach; ?>
            </tbody>
        </table>
        <?php if (empty($tokens)): ?>
            L'utilisateur n'a aucun jeton d'authentification.
        <?php else: ?>
            <?php echo $this->partial('unicaen-auth-token/token/partial/table', ['paginator' => $tokens, 'redirect' => $redirect]); ?>
        <?php endif ?>
    </div>
</div>

public/js/clipboard.js

0 → 100644
+864 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading