- aded npm packages @types/qrcode, qrcode and node-f2a
Some checks failed
CI Pipeline / japa-tests (push) Failing after 53s
Some checks failed
CI Pipeline / japa-tests (push) Failing after 53s
- corrected UsersController.ts and RoleController.ts with correct routes for settings - added migration script and ui and Controller for 2 Factor Authentication - npm updates
This commit is contained in:
parent
87e9314b00
commit
c70fa4a0d8
16 changed files with 1098 additions and 417 deletions
|
@ -129,7 +129,7 @@ export default class RoleController {
|
|||
}
|
||||
|
||||
session.flash('message', 'Role has been updated successfully');
|
||||
return response.redirect().toRoute('role.index');
|
||||
return response.redirect().toRoute('settings.role.index');
|
||||
}
|
||||
|
||||
public async destroy({ request, response, session }: HttpContextContract) {
|
||||
|
|
|
@ -151,7 +151,7 @@ export default class UsersController {
|
|||
}
|
||||
|
||||
session.flash('message', 'User has been updated successfully');
|
||||
return response.redirect().toRoute('user.index');
|
||||
return response.redirect().toRoute('settings.user.index');
|
||||
}
|
||||
|
||||
public async destroy({ request, response, session }: HttpContextContract) {
|
||||
|
@ -222,13 +222,13 @@ export default class UsersController {
|
|||
const { old_password, new_password } = request.only(['old_password', 'new_password']);
|
||||
|
||||
// if (!(old_password && new_password && confirm_password)) {
|
||||
// return response.status(400).send({ message: 'Old password and new password are required.' });
|
||||
// return response.status(400).send({ warning: 'Old password and new password are required.' });
|
||||
// }
|
||||
|
||||
// Verify if the provided old password matches the user's current password
|
||||
const isSame = await Hash.verify(user.password, old_password);
|
||||
if (!isSame) {
|
||||
return response.flash({ message: 'Old password is incorrect.' }).redirect().back();
|
||||
return response.flash({ warning: 'Old password is incorrect.' }).redirect().back();
|
||||
}
|
||||
|
||||
// Hash the new password before updating the user's password
|
||||
|
@ -237,7 +237,7 @@ export default class UsersController {
|
|||
|
||||
// return response.status(200).send({ message: 'Password updated successfully.' });
|
||||
session.flash('Password updated successfully.');
|
||||
return response.redirect().toRoute('settings.user');
|
||||
return response.redirect().toRoute('settings.user.index');
|
||||
} catch (error) {
|
||||
// return response.status(500).send({ message: 'Internal server error.' });
|
||||
return response.flash('warning', `Invalid server state. Internal server error.`).redirect().back();
|
||||
|
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue