From 502586ae495e6de997a20bc2919b968122b0f802 Mon Sep 17 00:00:00 2001
From: nox <daniel.leporini@gmail.com>
Date: Tue, 10 Dec 2019 04:36:49 +0100
Subject: [PATCH] Avancement sur renvoi mot de passe dans Dashboard User

---
 public/css/style.css                     |  6 ++---
 src/Admin/AdminModule.php                |  2 ++
 src/Admin/views/dashboard_user.twig      | 33 +++++++++++-------------
 src/Auth/Action/PasswordForgetAction.php |  5 ----
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 072889c..7ade86a 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -169,12 +169,12 @@ header.header img {
 }
 
 /******************************************************************/
-/*                         dashboard.twig                         */
+/*             dashboard.twig et dashboard-user.twig              */
 /******************************************************************/
 .tab-de-bord {
     background-color: brown;
     padding: 1rem;
-    min-width: 350px;
+    min-width: 380px;
 }
 /******************************************************************/
 /*                           layout.twig                          */
@@ -212,7 +212,7 @@ body.loading .loadingPubkey {
     .tab-de-bord {
         background-color: brown;
         padding: 1rem;
-        min-width: 280px;
+        min-width: 290px;
     }
     /******************************************************************/
     /*                           layout.twig                          */
diff --git a/src/Admin/AdminModule.php b/src/Admin/AdminModule.php
index 8ce7888..2921494 100644
--- a/src/Admin/AdminModule.php
+++ b/src/Admin/AdminModule.php
@@ -3,6 +3,7 @@
 namespace App\Admin;
 
 use App\Account\Action\ActiveAction;
+use App\Auth\Action\PasswordForgetAction;
 use Framework\Module;
 use Framework\Renderer\RendererInterface;
 use Framework\Renderer\TwigRenderer;
@@ -23,6 +24,7 @@ class AdminModule extends Module
         $router->get('/dashboard/{user:[a-zA-Z\-0-9]+}', DashboardUserAction::class, 'dashboard.user');
         $router->get('/activation', ActiveAction::class, 'account.active');
         $router->post('/activation', ActiveAction::class);
+        $router->any('/password_reinit', PasswordForgetAction::class, 'auth.password');
         if ($renderer instanceof TwigRenderer) {
             $renderer->getTwig()->addExtension($adminTwigExtension);
         }
diff --git a/src/Admin/views/dashboard_user.twig b/src/Admin/views/dashboard_user.twig
index e8a5434..8bd3406 100644
--- a/src/Admin/views/dashboard_user.twig
+++ b/src/Admin/views/dashboard_user.twig
@@ -11,32 +11,29 @@
             <div class="container" style="color:black;background-color: lightgray;opacity: 0.9;margin: 1rem;padding:1rem;">
                 <form action="{{ path('account.active') }}" method="post">
                     <button class="btn btn-primary">Désactiver l'utilisateur</button>
-                    {{ field('actif', false, "", {type: 'hidden'}) }}
-                    {{ field('username', username, "", {type: 'hidden'}) }}
+                    <div style="width:0;height:0;"> {{ field('actif', false, "", {type: 'hidden'}) }}
+                        {{ field('username', username, "", {type: 'hidden'}) }}</div>
                 </form>
             </div>
         </ul>
         <p></p>
         <h4>Profil</h4>
-
-        <ul class="list-group list-group-flush">
-
-                <div class="container" style="color:black;background-color: lightgray;opacity: 0.9;margin: 1rem;padding:1rem;">
-                    <form action="" method="post">
-                        <!-- csrf_input() -->
-                        {{ field('firstname', profil_user.firstname, 'Prénom') }}
-                        {{ field('lastname', profil_user.lastname, 'Nom') }}
-                        Adresse mail {{ profil_user.email }}<p></p>
-                        Clé publique {{ profil_user.pubkey }}
-                        <p></p>
-                        <button class="btn btn-primary">Modifier les informations</button>
-                    </form>
-                </div>
-
-        </ul>
         <ul class="list-group list-group-flush">
             <div class="container" style="color:black;background-color: lightgray;opacity: 0.9;margin: 1rem;padding:1rem;">
                 <form action="" method="post">
+                    <!-- csrf_input() -->
+                    {{ field('firstname', profil_user.firstname, 'Prénom') }}
+                    {{ field('lastname', profil_user.lastname, 'Nom') }}
+                    Adresse mail {{ profil_user.email }}<p></p>
+                    Clé publique {{ profil_user.pubkey }}
+                    <p></p>
+                    <button class="btn btn-primary">Modifier les informations</button>
+                </form>
+            </div>
+        </ul>
+        <ul class="list-group list-group-flush">
+            <div class="container" style="color:black;background-color: lightgray;opacity: 0.9;margin: 1rem;padding:1rem;">
+                <form action="{{ path('auth.reset') }}" method="post">
                     <button class="btn btn-primary">Renvoyer un mot de passe</button>
                 </form>
             </div>
diff --git a/src/Auth/Action/PasswordForgetAction.php b/src/Auth/Action/PasswordForgetAction.php
index b354c59..9d55db6 100644
--- a/src/Auth/Action/PasswordForgetAction.php
+++ b/src/Auth/Action/PasswordForgetAction.php
@@ -72,11 +72,6 @@ class PasswordForgetAction
                     'token' => $token
                 ]);
                 $this->flashService->success('Un email vous a été envoyé');
-                //return new RedirectResponse($request->getUri()->getPath());
-                //$path = $this->router->generateUri('account.profil');
-                //$this->session->delete('auth.redirect');
-
-                //return new RedirectResponse($path);
                 $affichage_div = false;
                 return $this->renderer->render('@auth/password',compact('affichage_div'));
             } catch (NoRecordException $e) {