Skip to content

Commit 28fbe23

Browse files
authored
Merge pull request #55643 from nextcloud/backport/55080/stable31
[stable31] fix(sharing): Adapt share suggestions to match trusted servers configs
2 parents a46781a + f512b56 commit 28fbe23

File tree

12 files changed

+62
-25
lines changed

12 files changed

+62
-25
lines changed

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,12 @@ export default {
254254
255255
// remove invalid data and format to user-select layout
256256
const exactSuggestions = this.filterOutExistingShares(rawExactSuggestions)
257+
.filter(result => this.filterByTrustedServer(result))
257258
.map(share => this.formatForMultiselect(share))
258259
// sort by type so we can get user&groups first...
259260
.sort((a, b) => a.shareType - b.shareType)
260261
const suggestions = this.filterOutExistingShares(rawSuggestions)
262+
.filter(result => this.filterByTrustedServer(result))
261263
.map(share => this.formatForMultiselect(share))
262264
// sort by type so we can get user&groups first...
263265
.sort((a, b) => a.shareType - b.shareType)
@@ -340,6 +342,7 @@ export default {
340342
341343
// remove invalid data and format to user-select layout
342344
this.recommendations = this.filterOutExistingShares(rawRecommendations)
345+
.filter(result => this.filterByTrustedServer(result))
343346
.map(share => this.formatForMultiselect(share))
344347
.concat(externalResults)
345348
@@ -462,6 +465,20 @@ export default {
462465
}
463466
},
464467
468+
/**
469+
* Filter suggestion results based on trusted server configuration
470+
*
471+
* @param {object} result The raw suggestion result from API
472+
* @return {boolean} Whether to include this result in suggestions
473+
*/
474+
filterByTrustedServer(result) {
475+
const isRemoteEntity = result.value.shareType === ShareType.Remote || result.value.shareType === ShareType.RemoteGroup
476+
if (isRemoteEntity && this.config.showFederatedSharesToTrustedServersAsInternal) {
477+
return result.value.isTrustedServer === true
478+
}
479+
return true
480+
},
481+
465482
/**
466483
* Format shares for the multiselect options
467484
*

dist/1406-1406.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

dist/1406-1406.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/1406-1406.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1406-1406.js.license

dist/3798-3798.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/3798-3798.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/3798-3798.js.map.license

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)