Skip to content

confirm user is internal to globalscale #31907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Apr 12, 2022
Merged

confirm user is internal to globalscale #31907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/private/Collaboration/Collaborators/LookupPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
'label' => $label,
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => $isGlobalScaleEnabled,
'shareWith' => $lookup['federationId'],
],
'extra' => $lookup,
Expand Down
12 changes: 12 additions & 0 deletions tests/lib/Collaboration/Collaborators/LookupPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[0],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
],
'extra' => ['federationId' => $fedIDs[0]],
Expand All @@ -311,6 +312,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[1],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
],
'extra' => ['federationId' => $fedIDs[1]],
Expand All @@ -319,6 +321,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[2],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
],
'extra' => ['federationId' => $fedIDs[2]],
Expand All @@ -342,6 +345,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[0],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
],
'extra' => ['federationId' => $fedIDs[0]],
Expand All @@ -350,6 +354,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[1],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
],
'extra' => ['federationId' => $fedIDs[1]],
Expand All @@ -358,6 +363,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[2],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
],
'extra' => ['federationId' => $fedIDs[2]],
Expand All @@ -381,6 +387,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[0],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[0]
],
'extra' => ['federationId' => $fedIDs[0]],
Expand All @@ -389,6 +396,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[1],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[1]
],
'extra' => ['federationId' => $fedIDs[1]],
Expand All @@ -397,6 +405,7 @@ public function dataSearchEnableDisableLookupServer() {
'label' => $fedIDs[2],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[2]
],
'extra' => ['federationId' => $fedIDs[2]],
Expand Down Expand Up @@ -471,6 +480,7 @@ public function searchDataProvider() {
'label' => $fedIDs[0],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[0]
],
'extra' => ['federationId' => $fedIDs[0]],
Expand All @@ -479,6 +489,7 @@ public function searchDataProvider() {
'label' => $fedIDs[1],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[1]
],
'extra' => ['federationId' => $fedIDs[1]],
Expand All @@ -487,6 +498,7 @@ public function searchDataProvider() {
'label' => $fedIDs[2],
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => false,
'shareWith' => $fedIDs[2]
],
'extra' => ['federationId' => $fedIDs[2]],
Expand Down