Merge pull request #8757 from nextcloud/search_controller

Move search to proper Controller

5 files changed, 56 insertions, 65 deletions

diff --git a/core/Controller/SearchController.php b/core/Controller/SearchController.php
new file mode 100644
index 00000000000..b32609bb4b2
--- /dev/null
+++ b/core/Controller/SearchController.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\ISearch;
+
+class SearchController extends Controller {
+
+	/** @var ISearch */
+	private $searcher;
+
+	public function __construct(string $appName,
+								IRequest $request,
+								ISearch $search) {
+		parent::__construct($appName, $request);
+
+		$this->searcher = $search;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function search(string $query, array $inApps = [], int $page = 1, int $size = 30): JSONResponse {
+		$results = $this->searcher->searchPaged($query, $inApps, $page, $size);
+
+		return new JSONResponse($results);
+	}
+}
diff --git a/core/routes.php b/core/routes.php
index eb6db1046fb..87c265d8098 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -66,6 +66,7 @@ $application->registerRoutes($this, [
 		['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
 		['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'],
 		['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+		['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
 	],
 	'ocs' => [
 		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
@@ -81,9 +82,6 @@ $application->registerRoutes($this, [
 
 /** @var $this OCP\Route\IRouter */
 // Core ajax actions
-// Search
-$this->create('search_ajax_search', '/core/search')
-	->actionInclude('core/search/ajax/search.php');
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
 	->actionInclude('core/ajax/update.php');
diff --git a/core/search/ajax/search.php b/core/search/ajax/search.php
deleted file mode 100644
index 1de53158ada..00000000000
--- a/core/search/ajax/search.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-// Check if we are a user
-\OCP\JSON::checkLoggedIn();
-\OCP\JSON::callCheck();
-\OC::$server->getSession()->close();
-
-if (isset($_GET['query'])) {
-	$query = $_GET['query'];
-} else {
-	$query = '';
-}
-if (isset($_GET['inApps'])) {
-	$inApps = $_GET['inApps'];
-	if (is_string($inApps)) {
-		$inApps = array($inApps);
-	}
-} else {
-	$inApps = array();
-}
-if (isset($_GET['page'])) {
-	$page = (int)$_GET['page'];
-} else {
-	$page = 1;
-}
-if (isset($_GET['size'])) {
-	$size = (int)$_GET['size'];
-} else {
-	$size = 30;
-}
-if($query) {
-	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
-	OC_JSON::encodedPrint($result);
-}
-else {
-	echo 'false';
-}
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index d0667b889cb..5a390eaf443 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -529,6 +529,7 @@ return array(
     'OC\\Core\\Controller\\OCJSController' => $baseDir . '/core/Controller/OCJSController.php',
     'OC\\Core\\Controller\\OCSController' => $baseDir . '/core/Controller/OCSController.php',
     'OC\\Core\\Controller\\PreviewController' => $baseDir . '/core/Controller/PreviewController.php',
+    'OC\\Core\\Controller\\SearchController' => $baseDir . '/core/Controller/SearchController.php',
     'OC\\Core\\Controller\\SetupController' => $baseDir . '/core/Controller/SetupController.php',
     'OC\\Core\\Controller\\TwoFactorChallengeController' => $baseDir . '/core/Controller/TwoFactorChallengeController.php',
     'OC\\Core\\Controller\\UserController' => $baseDir . '/core/Controller/UserController.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 62cfc188949..8e9749f2683 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -559,6 +559,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Core\\Controller\\OCJSController' => __DIR__ . '/../../..' . '/core/Controller/OCJSController.php',
         'OC\\Core\\Controller\\OCSController' => __DIR__ . '/../../..' . '/core/Controller/OCSController.php',
         'OC\\Core\\Controller\\PreviewController' => __DIR__ . '/../../..' . '/core/Controller/PreviewController.php',
+        'OC\\Core\\Controller\\SearchController' => __DIR__ . '/../../..' . '/core/Controller/SearchController.php',
         'OC\\Core\\Controller\\SetupController' => __DIR__ . '/../../..' . '/core/Controller/SetupController.php',
         'OC\\Core\\Controller\\TwoFactorChallengeController' => __DIR__ . '/../../..' . '/core/Controller/TwoFactorChallengeController.php',
         'OC\\Core\\Controller\\UserController' => __DIR__ . '/../../..' . '/core/Controller/UserController.php',