From db142145215f348f62af5e52c3c06674a725a35c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 14 May 2020 05:51:53 +0300 Subject: [PATCH 1/2] #1424 fixed redirect admin --- .../profile-module/src/Profile/SignIn/SignInFormHandler.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php index 421de2b52..92c197bbd 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php @@ -30,6 +30,12 @@ class SignInFormHandler return; } + if (isset(session('url')['intended'])) { + $url = parse_url(session('url')['intended']); + if (substr($url['path'], 0, 7) === "/admin/") { + request()->session()->flush(); + } + } $authenticator->login($user, $builder->getFormValue('remember_me')); From bfdeba09a26d68a94594dfc8bcc131f9687f2924 Mon Sep 17 00:00:00 2001 From: "vedat@vebze.com" Date: Fri, 15 May 2020 02:34:37 +0300 Subject: [PATCH 2/2] url search admin --- .../profile-module/src/Profile/SignIn/SignInFormHandler.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php index 92c197bbd..4ccada848 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php @@ -31,10 +31,7 @@ class SignInFormHandler return; } if (isset(session('url')['intended'])) { - $url = parse_url(session('url')['intended']); - if (substr($url['path'], 0, 7) === "/admin/") { - request()->session()->flush(); - } + (strpos(session('url')['intended'], 'admin') !== false) ? request()->session()->flush() : ''; } $authenticator->login($user, $builder->getFormValue('remember_me'));