wip #5788 @2:00 mot de passe oublié fix regression

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index f71acc8353234207a39759500850f2ec8c511a47..1f5aeaebb4b135309b46d3d9d679ddeb0d5bfc87 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -28,7 +28,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('backup:run')->daily()->at('05:00');
         $schedule->command('cubist:search:index', ['PMI', 'all'])->cron('35 */4 * * *');
         $schedule->command('cubist:search:index', ['MICHSCI', 'all'])->cron('5 */4 * * *');
-        $schedule->command('auth:clear-resets')->everyFifteenMinutes();
     }
 
     /**

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 91670fe9d3219d275f157aebdebb1e7bf2e3a9c2..0b1d082587a097e03dee70081db72447279bf846 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -373,7 +373,8 @@ class AjaxController extends CubistFrontController
 
         if (Auth::guard('web-clients')->attempt($data, $remember)) {
             $request->session()->regenerate();
-            return Auth::guard('web-clients')->user();
+
+            return json_encode(['success']);
         } else {
             throw ValidationException::withMessages(['password' => __('Erreur lors de la validation du formulaire')]);
         }

diff --git a/app/Http/Controllers/ClientChangePassword.php b/app/Http/Controllers/ClientChangePassword.php
index b848d8beb80fcf2bc214b628a3b0c8d35691bb21..d387af6a340b6f4aa9c1b96b5ad559c64483434d 100644 (file)
--- a/app/Http/Controllers/ClientChangePassword.php
+++ b/app/Http/Controllers/ClientChangePassword.php
@@ -2,13 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use Cubist\Backpack\app\Magic\Menu\Facade as CubistMenu;
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Illuminate\Http\Request;
-use App\Models\News;
 use Cubist\Backpack\app\Http\Controllers\CubistFrontController;
-use Cubist\Backpack\app\Magic\PageData;
-use Illuminate\Support\Facades\DB;
 
 class ClientChangePassword extends CubistFrontController
 {
@@ -28,8 +24,6 @@ class ClientChangePassword extends CubistFrontController
         $item = $nav->findItemWithURL($path,true);
         $this->data['item'] = $item;
 
-        //dd($item->hasChildren(), $item->getChildren());
-
         return view('pages.change_password', $this->data);
     }
 }

diff --git a/app/Models/AuthClient.php b/app/Models/AuthClient.php
index 46187cc59cd56f4d92085579df9d6904209b8ac5..08e74947d7d0f6e52716e483e1201b14519782b3 100644 (file)
--- a/app/Models/AuthClient.php
+++ b/app/Models/AuthClient.php
@@ -5,8 +5,6 @@ use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Auth\Notifications\ResetPassword;
-use Illuminate\Auth\Passwords\PasswordBroker;
 
 class AuthClient extends Authenticatable implements CanResetPasswordContract
 {

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 82c6e0eab3ce5a2f303914a3bbedf41486b0cfd5..454b89b73edd69284c6e18783226ad2ae7d70c18 100644 (file)
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -4,8 +4,6 @@ namespace App\Providers;
 
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use App\Models\AuthClient;
-use Illuminate\Auth\Notifications\ResetPassword;
 
 class AuthServiceProvider extends ServiceProvider
 {

diff --git a/resources/js/app.js b/resources/js/app.js
index d3c3a249146785bbcba8fa2b7a7d3fd17077c9ba..0d267d5cfd3edd72b9eb400f27e3cc4f3d6eb493 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -313,11 +313,11 @@ const app = new Vue({
                 form = document.getElementById('signin-form'),
                 data = new FormData(form)
 
+            const lastVisitedUrl = document.querySelector('[name="previous-url"]').dataset.content,
+                homeUrl = window.location.origin;
+
             axios.post('/ajax/signin', data)
                 .then(function (response) {
-                    let lastVisitedUrl = document.querySelector('[name="previous-url"]').getAttribute('content'),
-                        homeUrl = window.location.origin;
-
                     if(lastVisitedUrl){
                         if(lastVisitedUrl.includes('pm-instrumentation')){
                             window.location.replace(lastVisitedUrl)
@@ -329,7 +329,14 @@ const app = new Vue({
                     }
                 })
                 .catch(function (error) {
-                    root.errorHandling(error, root)
+                    if (error.response && 419 === error.response.status) {
+                        window.location.reload()
+                    }
+                    if(error.response) {
+                        root.errorHandling(error, root)
+                    }else {
+                        return Promise.reject(error.response);
+                    }
                 }
             )
         },

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c66cbe341fc8e9b3d6f9620ca40e59c34b502ec8..409c97c667ca003e8f02973b4bbb72664b16767b 100644 (file)
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -62,6 +62,7 @@
 @include('cubist::head.htmldeclaration')
 @include('cubist::head.head')
 <meta name="now" data-content="{{ $now }}">
+<meta name="previous-url" data-content="{{ url()->previous() }}">
 <body class="template-{{ $view_name }} {{ $body_class ?? '' }} font-body text-grey-dark">
 @include('cubist::body.begin')
 

diff --git a/resources/views/pages/change_password.blade.php b/resources/views/pages/change_password.blade.php
index 0fbc19ee9a58c1c1ce6d5e5f4b8b7f74b36fb3df..53595e966e0365d0aecaa7e7e86f836a99e07ded 100644 (file)
--- a/resources/views/pages/change_password.blade.php
+++ b/resources/views/pages/change_password.blade.php
@@ -12,7 +12,7 @@
                     <h1 class="text-4xl m-0">{{ $title }}</h1>
                 </div>
 
-                <form id="signin-form" class="form-portal" action="{{ route('password.update') }}"
+                <form class="form-portal" action="{{ route('password.update') }}"
                       method="post">
                     @csrf
                     <input type="hidden" name="token" value="{{ $token }}"/>

diff --git a/resources/views/pages/forgot_password.blade.php b/resources/views/pages/forgot_password.blade.php
index e3501bb30e51abc5863e11ed4817d2176abf59f6..e09210f61e71f35bb7d4c791e304af2012dd9903 100644 (file)
--- a/resources/views/pages/forgot_password.blade.php
+++ b/resources/views/pages/forgot_password.blade.php
@@ -8,9 +8,11 @@
                     <h1 class="text-4xl m-0">Mot de passe oublié</h1>
                 </div>
 
-                <form id="signin-form" class="form-portal" action="/mot-de-passe-oublie"
+                <form class="form-portal" action="/mot-de-passe-oublie"
                       method="post">
 
+                    @csrf
+
                     <div class="form-errors mb-10" v-cloak v-if="errorsForm['errors']">
                         <ul class="list-disc list-inside text-red">
                             <li class="leading-5" v-for="(errorName,errorKey) in errorsForm['errors']" :key="errorKey">
@@ -19,7 +21,6 @@
                         </ul>
                     </div>
 
-                    @csrf
                     <div class="form-group mb-6">
                         <label class="form-input text-navy">
                             {{ __('Email') }}<span>*</span>

diff --git a/resources/views/pages/sign_in.blade.php b/resources/views/pages/sign_in.blade.php
index a3a16d9ad2d8be480a55b373427f4272a9b6ebdc..4829c9b43b0f903b5e75a72498ec5798ec710767 100644 (file)
--- a/resources/views/pages/sign_in.blade.php
+++ b/resources/views/pages/sign_in.blade.php
@@ -45,7 +45,6 @@
                             </li>
                         </ul>
                     </div>
-
                     @csrf
                     <div class="form-group mb-6">
                         <label class="form-input text-navy">
@@ -82,7 +81,7 @@
                             <span class="form-required-legend inline-block my-4 mr-3 text-grey-dark xs:self-start xs:mt-5">
                                 *{{ __('Champs obligatoires')}}
                             </span>
-                        <button class="checkemail form-submit-button btn btn-custom xs:w-full">
+                        <button type="submit" class="checkemail form-submit-button btn btn-custom xs:w-full">
                             {{ __('Connexion') }}
                         </button>
                     </div>