[WIP] Move MetaData and Group selector to core

lib/Controller/GroupsController.php

@@ -25,7 +25,7 @@
 namespace OCA\UserManagement\Controller;
 
 use OC\AppFramework\Http;
-use OCA\UserManagement\MetaData;
+use OC\MetaData;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IGroupManager;
@@ -62,33 +62,6 @@ public function __construct($appName,
 		$this->l10n = $l10n;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $pattern
-	 * @param bool $filterGroups
-	 * @param int $sortGroups
-	 * @return DataResponse
-	 */
-	public function index($pattern = '', $filterGroups = false, $sortGroups = MetaData::SORT_USERCOUNT) {
-		$groupPattern = $filterGroups ? $pattern : '';
-
-		$groupsInfo = new MetaData(
-			$this->userSession->getUser()->getUID(),
-			$this->isAdmin(),
-			$this->groupManager,
-			$this->userSession
-		);
-		$groupsInfo->setSorting($sortGroups);
-		list($adminGroups, $groups) = $groupsInfo->get($groupPattern, $pattern);
-
-		return new DataResponse(
-			[
-				'data' => ['adminGroups' => $adminGroups, 'groups' => $groups]
-			]
-		);
-	}
-
 	/**
 	 * @param string $id
 	 * @return DataResponse
@@ -151,19 +124,4 @@ public function destroy($id) {
 			Http::STATUS_FORBIDDEN
 		);
 	}
-
-	/**
-	 * Check if current user (active and not in incognito mode)
-	 * is an admin
-	 *
-	 * @return bool
-	 */
-	private function isAdmin() {
-		// Get current user (active and not in incognito mode)
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
 }

lib/Controller/PageController.php

@@ -19,7 +19,7 @@
 
 namespace OCA\UserManagement\Controller;
 
-use OCA\UserManagement\MetaData;
+use OC\MetaData;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;