Reset failed login counter and unlock user when changing password

2 files changed, 4 insertions, 4 deletions

diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 193929c7..1ac4656c 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -143,7 +143,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('UserCreationController', '*', Role::APP_ADMIN);
         $acl->add('UserListController', '*', Role::APP_ADMIN);
         $acl->add('UserStatusController', '*', Role::APP_ADMIN);
-        $acl->add('UserViewController', array('authentication'), Role::APP_ADMIN);
+        $acl->add('UserCredentialController', array('changeAuthentication', 'saveAuthentication'), Role::APP_ADMIN);
 
         return $acl;
     }
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 2bf3b6db..eb567e46 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -149,13 +149,13 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('user/show/:user_id/timesheet', 'UserViewController', 'timesheet');
             $container['route']->addRoute('user/show/:user_id/last-logins', 'UserViewController', 'lastLogin');
             $container['route']->addRoute('user/show/:user_id/sessions', 'UserViewController', 'sessions');
-            $container['route']->addRoute('user/:user_id/edit', 'UserViewController', 'edit');
-            $container['route']->addRoute('user/:user_id/password', 'UserViewController', 'password');
+            $container['route']->addRoute('user/:user_id/edit', 'UserModificationController', 'show');
+            $container['route']->addRoute('user/:user_id/password', 'UserCredentialController', 'changePassword');
             $container['route']->addRoute('user/:user_id/share', 'UserViewController', 'share');
             $container['route']->addRoute('user/:user_id/notifications', 'UserViewController', 'notifications');
             $container['route']->addRoute('user/:user_id/accounts', 'UserViewController', 'external');
             $container['route']->addRoute('user/:user_id/integrations', 'UserViewController', 'integrations');
-            $container['route']->addRoute('user/:user_id/authentication', 'UserViewController', 'authentication');
+            $container['route']->addRoute('user/:user_id/authentication', 'UserCredentialController', 'changeAuthentication');
             $container['route']->addRoute('user/:user_id/2fa', 'twofactor', 'index');
             $container['route']->addRoute('user/:user_id/avatar', 'AvatarFile', 'show');