wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

consolidate setEnabled method

Browse source 
and fix a unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-04-26 12:45:23 +02:00 committed by Morris Jobke
parent 668fe7df51
commit 99e97f135d
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
2 changed files with 29 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
settings/Controller/UsersController.php
View file

@ -519,9 +519,17 @@ class UsersController extends Controller {
* @NoAdminRequired
*
* @param string $id
* @param int $enabled
* @return DataResponse
*/
public function disable($id) {
public function setEnabled($id, $enabled) {
$enabled = (bool)$enabled;
if($enabled) {
$errorMsgGeneral = (string) $this->l10n->t('Error while enabling user.');
} else {
$errorMsgGeneral = (string) $this->l10n->t('Error while disabling user.');
}
$userId = $this->userSession->getUser()->getUID();
$user = $this->userManager->get($id);
@ -530,70 +538,12 @@ class UsersController extends Controller {
[
'status' => 'error',
'data' => [
'message' => (string) $this->l10n->t('Error while disabling user.')
'message' => $errorMsgGeneral
]
], Http::STATUS_FORBIDDEN
);
}
if ($user) {
if(!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
return new DataResponse(
[
'status' => 'error',
'data' => [
'message' => (string) $this->l10n->t('Authentication error')
]
],
Http::STATUS_FORBIDDEN
);
}
$user->setEnabled(false);
return new DataResponse(
[
'status' => 'success',
'data' => [
'username' => $id,
'enabled' => 0
]
]
);
} else {
return new DataResponse(
[
'status' => 'error',
'data' => [
'message' => (string) $this->l10n->t('Error while disabling user.')
]
],
Http::STATUS_FORBIDDEN
);
}
}
/**
* @NoAdminRequired
*
* @param string $id
* @return DataResponse
*/
public function enable($id) {
$userId = $this->userSession->getUser()->getUID();
$user = $this->userManager->get($id);
if ($userId === $id) {
return new DataResponse(
[
'status' => 'error',
'data' => [
'message' => (string) $this->l10n->t('Error while enabling user.')
]
],
Http::STATUS_FORBIDDEN
);
}
if($user) {
if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
return new DataResponse(
@ -607,13 +557,13 @@ class UsersController extends Controller {
);
}
$user->setEnabled(true);
$user->setEnabled($enabled);
return new DataResponse(
[
'status' => 'success',
'data' => [
'username' => $id,
'enabled' => 1
'enabled' => $enabled
]
]
);
@ -622,27 +572,13 @@ class UsersController extends Controller {
[
'status' => 'error',
'data' => [
'message' => (string) $this->l10n->t('Error while enabling user.')
'message' => $errorMsgGeneral
]
],
Http::STATUS_FORBIDDEN
);
}
}
/**
* @NoAdminRequired
*
* @param string $id
* @param int $enabled
* @return DataResponse
*/
public function setEnabled($id, $enabled) {
if ((bool) $enabled) {
return $this->enable($id);
} else {
return $this->disable($id);
}
}
/**

28
tests/Settings/Controller/UsersControllerTest.php
View file

@ -2299,6 +2299,9 @@ class UsersControllerTest extends \Test\TestCase {
->expects($this->once())
->method('getBackendClassName')
->willReturn('bar');
$user
->method('isEnabled')
->willReturn(true);
$this->userManager
->expects($this->once())
@ -2348,6 +2351,7 @@ class UsersControllerTest extends \Test\TestCase {
'email' => 'abc@example.org',
'isRestoreDisabled' => false,
'isAvatarAvailable' => true,
'isEnabled' => true,
],
Http::STATUS_CREATED
);
@ -2460,7 +2464,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(true)->disable('abc');
$response = $this->getController(true)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2502,7 +2506,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(false)->disable('abc');
$response = $this->getController(false)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2535,7 +2539,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(true)->disable('abc');
$response = $this->getController(true)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2568,7 +2572,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(false)->disable('abc');
$response = $this->getController(false)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2606,7 +2610,7 @@ class UsersControllerTest extends \Test\TestCase {
],
]
);
$response = $this->getController(true)->disable('abc');
$response = $this->getController(true)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2648,7 +2652,7 @@ class UsersControllerTest extends \Test\TestCase {
],
]
);
$response = $this->getController(false)->disable('abc');
$response = $this->getController(false)->setEnabled('abc', false);
$this->assertEquals($expectedResponse, $response);
}
@ -2671,7 +2675,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(true)->enable('abc');
$response = $this->getController(true)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
@ -2713,7 +2717,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(false)->enable('abc');
$response = $this->getController(false)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
@ -2746,7 +2750,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(true)->enable('abc');
$response = $this->getController(true)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
@ -2779,7 +2783,7 @@ class UsersControllerTest extends \Test\TestCase {
],
Http::STATUS_FORBIDDEN
);
$response = $this->getController(false)->enable('abc');
$response = $this->getController(false)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
@ -2816,7 +2820,7 @@ class UsersControllerTest extends \Test\TestCase {
],
]
);
$response = $this->getController(true)->enable('abc');
$response = $this->getController(true)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
@ -2859,7 +2863,7 @@ class UsersControllerTest extends \Test\TestCase {
],
]
);
$response = $this->getController(false)->enable('abc');
$response = $this->getController(false)->setEnabled('abc', true);
$this->assertEquals($expectedResponse, $response);
}
}