saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-06-05 08:52:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): display error messages from validator

Browse Source
This commit is contained in:
Yassine Doghri 2023-10-03 16:21:08 +00:00
parent fcad25a551
commit 5a834c0f89
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/Auth/Controllers/InteractController.php
View File

@ -24,7 +24,7 @@ class InteractController extends Controller
return redirect() return redirect()
->back() ->back()
->withInput() ->withInput()
->with('errors', service('validation')->getErrors()); ->with('errors', $this->validator->getErrors());
} }
$validData = $this->validator->getValidated(); $validData = $this->validator->getValidated();

4
modules/Auth/Controllers/MagicLinkController.php
View File

@ -45,12 +45,11 @@ class MagicLinkController extends ShieldMagicLinkController
'new_password' => 'required|strong_password', 'new_password' => 'required|strong_password',
]; ];
$userModel = new UserModel();
if (! $this->validate($rules)) { if (! $this->validate($rules)) {
return redirect() return redirect()
->back() ->back()
->withInput() ->withInput()
->with('errors', $userModel->errors()); ->with('errors', $this->validator->getErrors());
} }
$validData = $this->validator->getValidated(); $validData = $this->validator->getValidated();
@ -60,6 +59,7 @@ class MagicLinkController extends ShieldMagicLinkController
->user() ->user()
->password = $validData['new_password']; ->password = $validData['new_password'];
$userModel = new UserModel();
if (! $userModel->update(auth()->user()->id, auth()->user())) { if (! $userModel->update(auth()->user()->id, auth()->user())) {
return redirect() return redirect()
->back() ->back()

4
modules/Auth/Controllers/MyAccountController.php
View File

@ -35,12 +35,11 @@ class MyAccountController extends BaseController
'new_password' => 'required|strong_password|differs[password]', 'new_password' => 'required|strong_password|differs[password]',
]; ];
$userModel = new UserModel();
if (! $this->validate($rules)) { if (! $this->validate($rules)) {
return redirect() return redirect()
->back() ->back()
->withInput() ->withInput()
->with('errors', $userModel->errors()); ->with('errors', $this->validator->getErrors());
} }
$validData = $this->validator->getValidated(); $validData = $this->validator->getValidated();
@ -66,6 +65,7 @@ class MyAccountController extends BaseController
->user() ->user()
->password = $validData['new_password']; ->password = $validData['new_password'];
$userModel = new UserModel();
if (! $userModel->update(auth()->user()->id, auth()->user())) { if (! $userModel->update(auth()->user()->id, auth()->user())) {
return redirect() return redirect()
->back() ->back()

4
modules/Install/Controllers/InstallController.php
View File

@ -290,12 +290,11 @@ class InstallController extends Controller
'password' => 'required|strong_password', 'password' => 'required|strong_password',
]; ];
$userModel = new UserModel();
if (! $this->validate($rules)) { if (! $this->validate($rules)) {
return redirect() return redirect()
->back() ->back()
->withInput() ->withInput()
->with('errors', $userModel->errors()); ->with('errors', $this->validator->getErrors());
} }
$validData = $this->validator->getValidated(); $validData = $this->validator->getValidated();
@ -308,6 +307,7 @@ class InstallController extends Controller
'is_owner' => true, 'is_owner' => true,
]); ]);
$userModel = new UserModel();
try { try {
$userModel->save($user); $userModel->save($user);
} catch (ValidationException) { } catch (ValidationException) {

2
themes/cp_auth/login.php
View File

@ -20,7 +20,7 @@ use Modules\Auth\Config\Auth;
required="true" required="true"
type="email" type="email"
inputmode="email" inputmode="email"
autocomplete="email" autocomplete="username"
autofocus="autofocus" autofocus="autofocus"
/> />

1
themes/cp_install/create_superadmin.php
View File

@ -19,6 +19,7 @@
name="email" name="email"
label="<?= lang('Install.form.email') ?>" label="<?= lang('Install.form.email') ?>"
type="email" type="email"
autocomplete="username"
required="true" /> required="true" />
<Forms.Field <Forms.Field