Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
add data from the users profile to the provisioning api
This commit is contained in:
commit
ffe2543a57
|
@ -45,6 +45,7 @@ return [
|
|||
['root' => '/cloud', 'name' => 'Users#getUsers', 'url' => '/users', 'verb' => 'GET'],
|
||||
['root' => '/cloud', 'name' => 'Users#addUser', 'url' => '/users', 'verb' => 'POST'],
|
||||
['root' => '/cloud', 'name' => 'Users#getUser', 'url' => '/users/{userId}', 'verb' => 'GET'],
|
||||
['root' => '/cloud', 'name' => 'Users#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
|
||||
['root' => '/cloud', 'name' => 'Users#editUser', 'url' => '/users/{userId}', 'verb' => 'PUT'],
|
||||
['root' => '/cloud', 'name' => 'Users#deleteUser', 'url' => '/users/{userId}', 'verb' => 'DELETE'],
|
||||
['root' => '/cloud', 'name' => 'Users#enableUser', 'url' => '/users/{userId}/enable', 'verb' => 'PUT'],
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
namespace OCA\Provisioning_API\Controller;
|
||||
|
||||
use OC\Accounts\AccountManager;
|
||||
use \OC_Helper;
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\AppFramework\OCS\OCSException;
|
||||
|
@ -53,6 +54,8 @@ class UsersController extends OCSController {
|
|||
private $groupManager;
|
||||
/** @var IUserSession */
|
||||
private $userSession;
|
||||
/** @var AccountManager */
|
||||
private $accountManager;
|
||||
/** @var ILogger */
|
||||
private $logger;
|
||||
|
||||
|
@ -63,6 +66,7 @@ class UsersController extends OCSController {
|
|||
* @param IConfig $config
|
||||
* @param IGroupManager $groupManager
|
||||
* @param IUserSession $userSession
|
||||
* @param AccountManager $accountManager
|
||||
* @param ILogger $logger
|
||||
*/
|
||||
public function __construct($appName,
|
||||
|
@ -71,6 +75,7 @@ class UsersController extends OCSController {
|
|||
IConfig $config,
|
||||
IGroupManager $groupManager,
|
||||
IUserSession $userSession,
|
||||
AccountManager $accountManager,
|
||||
ILogger $logger) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
|
@ -78,6 +83,7 @@ class UsersController extends OCSController {
|
|||
$this->config = $config;
|
||||
$this->groupManager = $groupManager;
|
||||
$this->userSession = $userSession;
|
||||
$this->accountManager = $accountManager;
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
|
@ -107,7 +113,7 @@ class UsersController extends OCSController {
|
|||
}
|
||||
|
||||
if($offset === null) {
|
||||
$offset = 0;
|
||||
$offset = 0;
|
||||
}
|
||||
|
||||
$users = [];
|
||||
|
@ -159,7 +165,7 @@ class UsersController extends OCSController {
|
|||
throw new OCSException('no group specified (required for subadmins)', 106);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
$newUser = $this->userManager->createUser($userid, $password);
|
||||
$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
|
||||
|
@ -209,14 +215,45 @@ class UsersController extends OCSController {
|
|||
}
|
||||
}
|
||||
|
||||
$userAccount = $this->accountManager->getUser($targetUserObject);
|
||||
|
||||
// Find the data
|
||||
$data['id'] = $targetUserObject->getUID();
|
||||
$data['quota'] = $this->fillStorageInfo($userId);
|
||||
$data['email'] = $targetUserObject->getEMailAddress();
|
||||
$data['displayname'] = $targetUserObject->getDisplayName();
|
||||
$data['phone'] = $userAccount[\OC\Accounts\AccountManager::PROPERTY_PHONE]['value'];
|
||||
$data['address'] = $userAccount[\OC\Accounts\AccountManager::PROPERTY_ADDRESS]['value'];
|
||||
$data['webpage'] = $userAccount[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['value'];
|
||||
$data['twitter'] = $userAccount[\OC\Accounts\AccountManager::PROPERTY_TWITTER]['value'];
|
||||
|
||||
return new DataResponse($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoSubAdminRequired
|
||||
*
|
||||
* gets user info from the currently logged in user
|
||||
*
|
||||
* @return DataResponse
|
||||
* @throws OCSException
|
||||
*/
|
||||
public function getCurrentUser() {
|
||||
$user = $this->userSession->getUser();
|
||||
if ($user) {
|
||||
$result = $this->getUser($user->getUID());
|
||||
// rename "displayname" to "display-name" only for this call to keep
|
||||
// the API stable.
|
||||
$result['display-name'] = $result['displayname'];
|
||||
unset($result['displayname']);
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoSubAdminRequired
|
||||
|
@ -436,7 +473,7 @@ class UsersController extends OCSController {
|
|||
throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -29,9 +29,11 @@
|
|||
|
||||
namespace OCA\Provisioning_API\Tests\Controller;
|
||||
|
||||
use OC\Accounts\AccountManager;
|
||||
use OCA\Provisioning_API\Controller\UsersController;
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\IGroup;
|
||||
use OCP\IRequest;
|
||||
use OCP\IUser;
|
||||
use OCP\IUserManager;
|
||||
use OCP\IConfig;
|
||||
|
@ -41,7 +43,7 @@ use Test\TestCase as OriginalTest;
|
|||
use OCP\ILogger;
|
||||
|
||||
class UsersControllerTest extends OriginalTest {
|
||||
|
||||
|
||||
/** @var IUserManager | PHPUnit_Framework_MockObject_MockObject */
|
||||
protected $userManager;
|
||||
/** @var IConfig | PHPUnit_Framework_MockObject_MockObject */
|
||||
|
@ -54,6 +56,10 @@ class UsersControllerTest extends OriginalTest {
|
|||
protected $logger;
|
||||
/** @var UsersController | PHPUnit_Framework_MockObject_MockObject */
|
||||
protected $api;
|
||||
/** @var AccountManager | PHPUnit_Framework_MockObject_MockObject */
|
||||
protected $accountManager;
|
||||
/** @var IRequest | PHPUnit_Framework_MockObject_MockObject */
|
||||
protected $request;
|
||||
|
||||
protected function tearDown() {
|
||||
parent::tearDown();
|
||||
|
@ -77,17 +83,21 @@ class UsersControllerTest extends OriginalTest {
|
|||
$this->logger = $this->getMockBuilder('OCP\ILogger')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$request = $this->getMockBuilder('OCP\IRequest')
|
||||
$this->request = $this->getMockBuilder('OCP\IRequest')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->accountManager = $this->getMockBuilder(AccountManager::class)
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
|
||||
->setConstructorArgs([
|
||||
'provisioning_api',
|
||||
$request,
|
||||
$this->request,
|
||||
$this->userManager,
|
||||
$this->config,
|
||||
$this->groupManager,
|
||||
$this->userSession,
|
||||
$this->accountManager,
|
||||
$this->logger,
|
||||
])
|
||||
->setMethods(['fillStorageInfo'])
|
||||
|
@ -652,6 +662,16 @@ class UsersControllerTest extends OriginalTest {
|
|||
->method('isAdmin')
|
||||
->with('admin')
|
||||
->will($this->returnValue(true));
|
||||
$this->accountManager->expects($this->any())->method('getUser')
|
||||
->with($targetUser)
|
||||
->willReturn(
|
||||
[
|
||||
AccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
|
||||
AccountManager::PROPERTY_PHONE => ['value' => 'phone'],
|
||||
AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
|
||||
AccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
|
||||
]
|
||||
);
|
||||
$this->config
|
||||
->expects($this->at(0))
|
||||
->method('getUserValue')
|
||||
|
@ -666,12 +686,21 @@ class UsersControllerTest extends OriginalTest {
|
|||
->expects($this->once())
|
||||
->method('getDisplayName')
|
||||
->will($this->returnValue('Demo User'));
|
||||
$targetUser
|
||||
->expects($this->once())
|
||||
->method('getUID')
|
||||
->will($this->returnValue('UID'));
|
||||
|
||||
$expected = [
|
||||
'id' => 'UID',
|
||||
'enabled' => 'true',
|
||||
'quota' => ['DummyValue'],
|
||||
'email' => 'demo@owncloud.org',
|
||||
'displayname' => 'Demo User',
|
||||
'phone' => 'phone',
|
||||
'address' => 'address',
|
||||
'webpage' => 'website',
|
||||
'twitter' => 'twitter'
|
||||
];
|
||||
$this->assertEquals($expected, $this->api->getUser('UserToGet')->getData());
|
||||
}
|
||||
|
@ -731,12 +760,31 @@ class UsersControllerTest extends OriginalTest {
|
|||
->expects($this->once())
|
||||
->method('getDisplayName')
|
||||
->will($this->returnValue('Demo User'));
|
||||
$targetUser
|
||||
->expects($this->once())
|
||||
->method('getUID')
|
||||
->will($this->returnValue('UID'));
|
||||
$this->accountManager->expects($this->any())->method('getUser')
|
||||
->with($targetUser)
|
||||
->willReturn(
|
||||
[
|
||||
AccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
|
||||
AccountManager::PROPERTY_PHONE => ['value' => 'phone'],
|
||||
AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
|
||||
AccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
|
||||
]
|
||||
);
|
||||
|
||||
$expected = [
|
||||
'id' => 'UID',
|
||||
'enabled' => 'true',
|
||||
'quota' => ['DummyValue'],
|
||||
'email' => 'demo@owncloud.org',
|
||||
'displayname' => 'Demo User',
|
||||
'phone' => 'phone',
|
||||
'address' => 'address',
|
||||
'webpage' => 'website',
|
||||
'twitter' => 'twitter'
|
||||
];
|
||||
$this->assertEquals($expected, $this->api->getUser('UserToGet')->getData());
|
||||
}
|
||||
|
@ -837,11 +885,30 @@ class UsersControllerTest extends OriginalTest {
|
|||
->expects($this->once())
|
||||
->method('getEMailAddress')
|
||||
->will($this->returnValue('subadmin@owncloud.org'));
|
||||
$targetUser
|
||||
->expects($this->once())
|
||||
->method('getUID')
|
||||
->will($this->returnValue('UID'));
|
||||
$this->accountManager->expects($this->any())->method('getUser')
|
||||
->with($targetUser)
|
||||
->willReturn(
|
||||
[
|
||||
AccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
|
||||
AccountManager::PROPERTY_PHONE => ['value' => 'phone'],
|
||||
AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
|
||||
AccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
|
||||
]
|
||||
);
|
||||
|
||||
$expected = [
|
||||
'id' => 'UID',
|
||||
'quota' => ['DummyValue'],
|
||||
'email' => 'subadmin@owncloud.org',
|
||||
'displayname' => 'Subadmin User',
|
||||
'phone' => 'phone',
|
||||
'address' => 'address',
|
||||
'webpage' => 'website',
|
||||
'twitter' => 'twitter'
|
||||
];
|
||||
$this->assertEquals($expected, $this->api->getUser('subadmin')->getData());
|
||||
}
|
||||
|
@ -2485,4 +2552,70 @@ class UsersControllerTest extends OriginalTest {
|
|||
|
||||
$this->assertEquals([], $this->api->disableUser('RequestedUser')->getData());
|
||||
}
|
||||
|
||||
public function testGetCurrentUserLoggedIn() {
|
||||
|
||||
$user = $this->getMock(IUser::class);
|
||||
$user->expects($this->once())->method('getUID')->willReturn('UID');
|
||||
|
||||
$this->userSession->expects($this->once())->method('getUser')
|
||||
->willReturn($user);
|
||||
|
||||
/** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */
|
||||
$api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
|
||||
->setConstructorArgs([
|
||||
'provisioning_api',
|
||||
$this->request,
|
||||
$this->userManager,
|
||||
$this->config,
|
||||
$this->groupManager,
|
||||
$this->userSession,
|
||||
$this->accountManager,
|
||||
$this->logger,
|
||||
])
|
||||
->setMethods(['getUser'])
|
||||
->getMock();
|
||||
|
||||
$api->expects($this->once())->method('getUser')->with('UID')
|
||||
->willReturn(
|
||||
[
|
||||
'id' => 'UID',
|
||||
'enabled' => 'true',
|
||||
'quota' => ['DummyValue'],
|
||||
'email' => 'demo@owncloud.org',
|
||||
'displayname' => 'Demo User',
|
||||
'phone' => 'phone',
|
||||
'address' => 'address',
|
||||
'webpage' => 'website',
|
||||
'twitter' => 'twitter'
|
||||
]
|
||||
);
|
||||
|
||||
$expected = [
|
||||
'id' => 'UID',
|
||||
'enabled' => 'true',
|
||||
'quota' => ['DummyValue'],
|
||||
'email' => 'demo@owncloud.org',
|
||||
'phone' => 'phone',
|
||||
'address' => 'address',
|
||||
'webpage' => 'website',
|
||||
'twitter' => 'twitter',
|
||||
'display-name' => 'Demo User'
|
||||
];
|
||||
|
||||
$this->assertSame($expected, $api->getCurrentUser());
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \OCP\AppFramework\OCS\OCSException
|
||||
*/
|
||||
public function testGetCurrentUserNotLoggedIn() {
|
||||
|
||||
$this->userSession->expects($this->once())->method('getUser')
|
||||
->willReturn(null);
|
||||
|
||||
$this->api->getCurrentUser();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -105,20 +105,6 @@ class OCSController extends \OCP\AppFramework\OCSController {
|
|||
return new DataResponse($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @return DataResponse
|
||||
*/
|
||||
public function getCurrentUser() {
|
||||
$userObject = $this->userSession->getUser();
|
||||
$data = [
|
||||
'id' => $userObject->getUID(),
|
||||
'display-name' => $userObject->getDisplayName(),
|
||||
'email' => $userObject->getEMailAddress(),
|
||||
];
|
||||
return new DataResponse($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
*
|
||||
|
|
|
@ -59,7 +59,6 @@ $application->registerRoutes($this, [
|
|||
],
|
||||
'ocs' => [
|
||||
['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
|
||||
['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
|
||||
['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
|
||||
['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
|
||||
['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
|
||||
|
|
|
@ -116,24 +116,6 @@ class OCSControllerTest extends TestCase {
|
|||
$this->assertEquals($expected, $this->controller->getCapabilities());
|
||||
}
|
||||
|
||||
public function testGetCurrentUser() {
|
||||
$user = $this->createMock(IUser::class);
|
||||
$user->method('getUID')->willReturn('uid');
|
||||
$user->method('getDisplayName')->willReturn('displayName');
|
||||
$user->method('getEMailAddress')->willReturn('e@mail.com');
|
||||
|
||||
|
||||
$this->userSession->method('getUser')
|
||||
->willReturn($user);
|
||||
|
||||
$expected = new DataResponse([
|
||||
'id' => 'uid',
|
||||
'display-name' => 'displayName',
|
||||
'email' => 'e@mail.com',
|
||||
]);
|
||||
$this->assertEquals($expected, $this->controller->getCurrentUser());
|
||||
}
|
||||
|
||||
public function testPersonCheckValid() {
|
||||
$this->request->method('getRemoteAddress')
|
||||
->willReturn('1.2.3.4');
|
||||
|
|
Loading…
Reference in New Issue