From 13d8ead23695604169979ec0bfc325a274d4ef8c Mon Sep 17 00:00:00 2001 From: soufiane Date: Wed, 14 Jun 2023 15:16:52 +0200 Subject: [PATCH] =?utf8?q?wip=20#5788=20@2:00=20mot=20de=20passe=20oubli?= =?utf8?q?=C3=A9=20fix=20regression?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/Console/Kernel.php | 1 - app/Http/Controllers/AjaxController.php | 3 ++- app/Http/Controllers/ClientChangePassword.php | 6 ------ app/Models/AuthClient.php | 2 -- app/Providers/AuthServiceProvider.php | 2 -- resources/js/app.js | 15 +++++++++++---- resources/views/layouts/app.blade.php | 1 + resources/views/pages/change_password.blade.php | 2 +- resources/views/pages/forgot_password.blade.php | 5 +++-- resources/views/pages/sign_in.blade.php | 3 +-- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index f71acc8..1f5aeae 100644 --- 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 91670fe..0b1d082 100644 --- 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 b848d8b..d387af6 100644 --- 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 46187cc..08e7494 100644 --- 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 82c6e0e..454b89b 100644 --- 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 d3c3a24..0d267d5 100644 --- 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 c66cbe3..409c97c 100644 --- 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') + @include('cubist::body.begin') diff --git a/resources/views/pages/change_password.blade.php b/resources/views/pages/change_password.blade.php index 0fbc19e..53595e9 100644 --- a/resources/views/pages/change_password.blade.php +++ b/resources/views/pages/change_password.blade.php @@ -12,7 +12,7 @@

{{ $title }}

-
@csrf diff --git a/resources/views/pages/forgot_password.blade.php b/resources/views/pages/forgot_password.blade.php index e3501bb..e09210f 100644 --- a/resources/views/pages/forgot_password.blade.php +++ b/resources/views/pages/forgot_password.blade.php @@ -8,9 +8,11 @@

Mot de passe oublié

- + @csrf +
  • @@ -19,7 +21,6 @@
- @csrf
- @csrf
-- 2.39.5