fix(auth): display error messages from validator

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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