diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-15 16:01:54 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-29 11:44:04 +0200 |
| commit | c9622ccb62652b71fc12f000813d94f62f7ac327 (patch) | |
| tree | 3fa46984183dafb4179fb941319d782a10542bb0 /apps/user_ldap/appinfo | |
| parent | 95ec247d102f968322457e49ba16e13a2ec1bddd (diff) | |
| download | nextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.tar.gz nextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.zip | |
fix LDAP User deletion (cleanup)
discovered a bug in the integration test which lead to following a
different code path and giving a false-positive success feedback.
Also listens now to the evendispatcher instead of old hook system
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/appinfo')
| -rw-r--r-- | apps/user_ldap/appinfo/app.php | 3 | ||||
| -rw-r--r-- | apps/user_ldap/appinfo/register_command.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index df08a2acd70..5239e52234a 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -44,9 +44,10 @@ if(count($configPrefixes) > 0) { 'name' => $l->t('LDAP user and group backend'), ]; }); + $userSession = \OC::$server->getUserSession(); $userBackend = new OCA\User_LDAP\User_Proxy( - $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager + $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession ); $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper); // register user backend diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index 3ae8bdbfc13..bd706e61f22 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -36,7 +36,8 @@ $uBackend = new User_Proxy( $helper->getServerConfigurationPrefixes(true), new LDAP(), $ocConfig, - \OC::$server->getNotificationManager() + \OC::$server->getNotificationManager(), + \OC::$server->getUserSession() ); $deletedUsersIndex = new DeletedUsersIndex( $ocConfig, $dbConnection, $userMapping |