Merge pull request #18337 from nextcloud/backport/18189/stable17

[stable17] Sharee API GS fixes
nextcloud · Dec 11, 2019 · 624302d · 624302d
2 parents 1241380 + 08c4b86
commit 624302d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php
@@ -104,6 +104,11 @@ public function getCapabilities() {
 			'expire_date' => ['enabled' => true]
 		];
 
+		// Sharee searches
+		$res['sharee'] = [
+			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false)
+		];
+
 		return [
 			'files_sharing' => $res,
 		];

diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -206,14 +206,21 @@ public function search(string $search = '', string $itemType = null, int $page =
 		$this->limit = (int) $perPage;
 		$this->offset = $perPage * ($page - 1);
 
+		// In global scale mode we always search the loogup server
+		if ($this->config->getSystemValueBool('gs.enabled', false)) {
+			$lookup = true;
+			$this->result['lookupEnabled'] = true;
+		} else {
+			$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
+		}
+
 		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
 
 		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
 		if(isset($result['exact'])) {
 			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
 		}
 		$this->result = array_merge($this->result, $result);
-		$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
 		$response = new DataResponse($this->result);
 
 		if ($hasMoreResults) {

diff --git a/core/js/dist/share_backend.js b/core/js/dist/share_backend.js
diff --git a/core/js/dist/share_backend.js.map b/core/js/dist/share_backend.js.map
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
@@ -145,6 +145,14 @@
 			var deferred = $.Deferred();
 			var view = this;
 
+			// query lookup GS by default if enabled
+			var capabilities = OC.getCapabilities()
+			if (capabilities.files_sharing
+				&& capabilities.files_sharing.sharee
+				&& capabilities.files_sharing.sharee.query_lookup_default) {
+					this._lookup = true;
+			}
+
 			$.get(
 				OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees',
 				{