update accounts table if email address or display name changes from outside
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle
parent
546989959c
commit
3fc75073b8
|
|
@ -758,6 +758,7 @@ class OC {
|
|||
self::registerLogRotate();
|
||||
self::registerEncryptionWrapper();
|
||||
self::registerEncryptionHooks();
|
||||
self::registerAccountHooks();
|
||||
self::registerSettingsHooks();
|
||||
|
||||
//make sure temporary files are cleaned up
|
||||
|
|
@ -868,6 +869,11 @@ class OC {
|
|||
}
|
||||
}
|
||||
|
||||
private static function registerAccountHooks() {
|
||||
$hookHandler = new \OC\Accounts\Hooks();
|
||||
\OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
|
||||
}
|
||||
|
||||
/**
|
||||
* register hooks for the cache
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
namespace OC\Accounts;
|
||||
|
||||
use OCP\IConfig;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\IUser;
|
||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||
|
|
@ -62,6 +63,9 @@ class AccountManager {
|
|||
/** @var EventDispatcherInterface */
|
||||
private $eventDispatcher;
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
/**
|
||||
* AccountManager constructor.
|
||||
*
|
||||
|
|
@ -81,16 +85,22 @@ class AccountManager {
|
|||
*/
|
||||
public function updateUser(IUser $user, $data) {
|
||||
$userData = $this->getUser($user);
|
||||
$updated = true;
|
||||
if (empty($userData)) {
|
||||
$this->insertNewUser($user, $data);
|
||||
} else {
|
||||
} elseif ($userData !== $data) {
|
||||
$this->updateExistingUser($user, $data);
|
||||
} else {
|
||||
// nothing needs to be done if new and old data set are the same
|
||||
$updated = false;
|
||||
}
|
||||
|
||||
$this->eventDispatcher->dispatch(
|
||||
'OC\AccountManager::userUpdated',
|
||||
new GenericEvent($user)
|
||||
);
|
||||
if ($updated) {
|
||||
$this->eventDispatcher->dispatch(
|
||||
'OC\AccountManager::userUpdated',
|
||||
new GenericEvent($user)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,78 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
namespace OC\Accounts;
|
||||
|
||||
use OCP\IUser;
|
||||
|
||||
class Hooks {
|
||||
|
||||
/** @var AccountManager */
|
||||
private $accountManager = null;
|
||||
|
||||
/**
|
||||
* update accounts table if email address or display name was changed from outside
|
||||
*
|
||||
* @param array $params
|
||||
*/
|
||||
public function changeUserHook($params) {
|
||||
|
||||
$this->instantiateAccountManager();
|
||||
|
||||
/** @var IUser $user */
|
||||
$user = $params['user'];
|
||||
$feature = $params['feature'];
|
||||
$newValue = $params['value'];
|
||||
$accountData = $this->accountManager->getUser($user);
|
||||
|
||||
switch ($feature) {
|
||||
case 'eMailAddress':
|
||||
if ($accountData[AccountManager::PROPERTY_EMAIL]['value'] !== $newValue) {
|
||||
$accountData[AccountManager::PROPERTY_EMAIL]['value'] = $newValue;
|
||||
$this->accountManager->updateUser($user, $accountData);
|
||||
}
|
||||
break;
|
||||
case 'displayName':
|
||||
if ($accountData[AccountManager::PROPERTY_DISPLAYNAME]['value'] !== $newValue) {
|
||||
$accountData[AccountManager::PROPERTY_DISPLAYNAME]['value'] = $newValue;
|
||||
$this->accountManager->updateUser($user, $accountData);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* return instance of accountManager
|
||||
*
|
||||
* @return AccountManager
|
||||
*/
|
||||
protected function instantiateAccountManager() {
|
||||
if (is_null($this->accountManager)) {
|
||||
$this->accountManager = new AccountManager(
|
||||
\OC::$server->getDatabaseConnection(),
|
||||
\OC::$server->getEventDispatcher()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -78,36 +78,45 @@ class AccountsManagerTest extends TestCase {
|
|||
*
|
||||
* @param bool $userAlreadyExists
|
||||
*/
|
||||
public function testUpdateUser($userAlreadyExists) {
|
||||
public function testUpdateUser($newData, $oldData, $insertNew, $updateExisitng) {
|
||||
$accountManager = $this->getInstance(['getUser', 'insertNewUser', 'updateExistingUser']);
|
||||
$user = $this->getMockBuilder('OCP\IUser')->getMock();
|
||||
|
||||
$accountManager->expects($this->once())->method('getUser')->with($user)->willReturn($userAlreadyExists);
|
||||
$accountManager->expects($this->once())->method('getUser')->with($user)->willReturn($oldData);
|
||||
|
||||
if ($userAlreadyExists) {
|
||||
if ($updateExisitng) {
|
||||
$accountManager->expects($this->once())->method('updateExistingUser')
|
||||
->with($user, 'data');
|
||||
->with($user, $newData);
|
||||
$accountManager->expects($this->never())->method('insertNewUser');
|
||||
} else {
|
||||
}
|
||||
if ($insertNew) {
|
||||
$accountManager->expects($this->once())->method('insertNewUser')
|
||||
->with($user, 'data');
|
||||
->with($user, $newData);
|
||||
$accountManager->expects($this->never())->method('updateExistingUser');
|
||||
}
|
||||
|
||||
$this->eventDispatcher->expects($this->once())->method('dispatch')
|
||||
->willReturnCallback(function($eventName, $event) use ($user) {
|
||||
$this->assertSame('OC\AccountManager::userUpdated', $eventName);
|
||||
$this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
|
||||
}
|
||||
);
|
||||
if (!$insertNew && !$updateExisitng) {
|
||||
$accountManager->expects($this->never())->method('updateExistingUser');
|
||||
$accountManager->expects($this->never())->method('insertNewUser');
|
||||
$this->eventDispatcher->expects($this->never())->method('dispatch');
|
||||
} else {
|
||||
$this->eventDispatcher->expects($this->once())->method('dispatch')
|
||||
->willReturnCallback(
|
||||
function ($eventName, $event) use ($user) {
|
||||
$this->assertSame('OC\AccountManager::userUpdated', $eventName);
|
||||
$this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
$accountManager->updateUser($user, 'data');
|
||||
$accountManager->updateUser($user, $newData);
|
||||
}
|
||||
|
||||
public function dataTrueFalse() {
|
||||
return [
|
||||
[true],
|
||||
[false]
|
||||
[['newData'], ['oldData'], false, true],
|
||||
[['newData'], [], true, false],
|
||||
[['oldData'], ['oldData'], false, false]
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue