unify endpoints form core and the the provisioning api

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

apps/provisioning_api/appinfo/routes.php

@@ -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'],

apps/provisioning_api/lib/Controller/UsersController.php

@@ -218,6 +218,7 @@ 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();
@@ -229,6 +230,30 @@ class UsersController extends OCSController {
 		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

apps/provisioning_api/tests/Controller/UsersControllerTest.php

@@ -33,6 +33,7 @@ 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;
@@ -57,6 +58,8 @@ class UsersControllerTest extends OriginalTest {
 	protected $api;
 	/** @var  AccountManager | PHPUnit_Framework_MockObject_MockObject */
 	protected $accountManager;
+	/** @var  IRequest | PHPUnit_Framework_MockObject_MockObject */
+	protected $request;
 
 	protected function tearDown() {
 		parent::tearDown();
@@ -80,7 +83,7 @@ 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)
@@ -89,7 +92,7 @@ class UsersControllerTest extends OriginalTest {
 		$this->api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
 			->setConstructorArgs([
 				'provisioning_api',
-				$request,
+				$this->request,
 				$this->userManager,
 				$this->config,
 				$this->groupManager,
@@ -683,8 +686,13 @@ 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',
@@ -752,6 +760,10 @@ 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(
@@ -764,6 +776,7 @@ class UsersControllerTest extends OriginalTest {
 			);
 
 		$expected = [
+			'id' => 'UID',
 			'enabled' => 'true',
 			'quota' => ['DummyValue'],
 			'email' => 'demo@owncloud.org',
@@ -872,6 +885,10 @@ 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(
@@ -884,6 +901,7 @@ class UsersControllerTest extends OriginalTest {
 			);
 
 		$expected = [
+			'id' => 'UID',
 			'quota' => ['DummyValue'],
 			'email' => 'subadmin@owncloud.org',
 			'displayname' => 'Subadmin User',
@@ -2534,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();
+	}
+
+
 }

core/Controller/OCSController.php

@@ -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
 	 *

core/routes.php

@@ -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'],

tests/Core/Controller/OCSControllerTest.php

@@ -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');