Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-state
Return proper boolean and do not save enabled state in db
This commit is contained in:
commit
acbcc607ea
|
@ -92,7 +92,7 @@ abstract class AUserData extends OCSController {
|
||||||
// Should be at least Admin Or SubAdmin!
|
// Should be at least Admin Or SubAdmin!
|
||||||
if( $this->groupManager->isAdmin($currentLoggedInUser->getUID())
|
if( $this->groupManager->isAdmin($currentLoggedInUser->getUID())
|
||||||
|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
|
|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
|
||||||
$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true');
|
$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
|
||||||
} else {
|
} else {
|
||||||
// Check they are looking up themselves
|
// Check they are looking up themselves
|
||||||
if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
|
if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
|
||||||
|
|
|
@ -766,7 +766,7 @@ class UsersControllerTest extends TestCase {
|
||||||
|
|
||||||
$expected = [
|
$expected = [
|
||||||
'id' => 'UID',
|
'id' => 'UID',
|
||||||
'enabled' => 'true',
|
'enabled' => true,
|
||||||
'storageLocation' => '/var/www/newtcloud/data/UID',
|
'storageLocation' => '/var/www/newtcloud/data/UID',
|
||||||
'lastLogin' => 1521191471000,
|
'lastLogin' => 1521191471000,
|
||||||
'backend' => 'Database',
|
'backend' => 'Database',
|
||||||
|
@ -881,7 +881,7 @@ class UsersControllerTest extends TestCase {
|
||||||
|
|
||||||
$expected = [
|
$expected = [
|
||||||
'id' => 'UID',
|
'id' => 'UID',
|
||||||
'enabled' => 'true',
|
'enabled' => true,
|
||||||
'storageLocation' => '/var/www/newtcloud/data/UID',
|
'storageLocation' => '/var/www/newtcloud/data/UID',
|
||||||
'lastLogin' => 1521191471000,
|
'lastLogin' => 1521191471000,
|
||||||
'backend' => 'Database',
|
'backend' => 'Database',
|
||||||
|
|
|
@ -349,13 +349,12 @@ class User implements IUser {
|
||||||
*
|
*
|
||||||
* @param bool $enabled
|
* @param bool $enabled
|
||||||
*/
|
*/
|
||||||
public function setEnabled($enabled) {
|
public function setEnabled(bool $enabled = true) {
|
||||||
$oldStatus = $this->isEnabled();
|
$oldStatus = $this->isEnabled();
|
||||||
$this->enabled = $enabled;
|
$this->enabled = $enabled;
|
||||||
$enabled = $enabled ? 'true' : 'false';
|
|
||||||
if ($oldStatus !== $this->enabled) {
|
if ($oldStatus !== $this->enabled) {
|
||||||
$this->triggerChange('enabled', $enabled);
|
$this->triggerChange('enabled', $enabled);
|
||||||
$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
|
$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ interface IUser {
|
||||||
* @param bool $enabled
|
* @param bool $enabled
|
||||||
* @since 8.0.0
|
* @since 8.0.0
|
||||||
*/
|
*/
|
||||||
public function setEnabled($enabled);
|
public function setEnabled(bool $enabled = true);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the users email address
|
* get the users email address
|
||||||
|
|
|
@ -816,7 +816,7 @@ class UserTest extends TestCase {
|
||||||
->method('triggerChange')
|
->method('triggerChange')
|
||||||
->with(
|
->with(
|
||||||
'enabled',
|
'enabled',
|
||||||
'false'
|
false
|
||||||
);
|
);
|
||||||
|
|
||||||
$user->setEnabled(false);
|
$user->setEnabled(false);
|
||||||
|
|
Loading…
Reference in New Issue