Skip to content

feat(files_sharing): Toggle display for trusted server shares#53661

Merged
nfebe merged 2 commits into
masterfrom
feat/52635/toggle-for-trusted-server-sharing
Jul 29, 2025
Merged

feat(files_sharing): Toggle display for trusted server shares#53661
nfebe merged 2 commits into
masterfrom
feat/52635/toggle-for-trusted-server-sharing

Conversation

@nfebe

@nfebe nfebe commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

Exposes the trust status of federated shares in the Share API, allowing the frontend to filter them based on the new show_federated_shares_to_trusted_servers_as_internal setting.

Usage: occ config:app:set files_sharing show_federated_shares_to_trusted_servers_as_internal --value true --type boolean

Screenshots

Stable31 is trusted server and stable30 is not

Config default or set to false Config set to true
trusted-and-untrusted-mixed trusted-seperated

Fixes #52635

@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch 6 times, most recently from 3a848ee to 92e64f3 Compare June 25, 2025 12:41
@nfebe

nfebe commented Jun 25, 2025

Copy link
Copy Markdown
Contributor Author

Tested the behavior. It works, but there are a few issues:

  • There are two input fields: one for internal shares (users/groups on the same server or trusted servers) and one for external shares (federated).

  • Right now, users can only type federated addresses in the external shares input. With trusted servers now treated as internal, it's unclear where users should enter those addresses.

  • The sidebar is split based on share types. To handle this properly, we need to detect if the entered address belongs to a trusted server and guide the user accordingly.

    • Example feedback:

      • “Server is trusted. Use the internal shares section.”
      • “Server is not trusted. Use the external shares section.”

Proposals:

  • [Current] If a trusted server is entered in the external shares input, the share appears under internal shares.
  • One alternative is to let users enter addresses in either input and automatically sort the result into the right section.

@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 92e64f3 to b95563e Compare June 25, 2025 14:02
@nfebe nfebe added 3. to review Waiting for reviews feature: sharing labels Jun 25, 2025
@github-project-automation github-project-automation Bot moved this to 🏗️ In progress in 📁 Files team Jun 25, 2025
@nfebe nfebe marked this pull request as ready for review June 25, 2025 14:03
@nfebe nfebe requested review from a team as code owners June 25, 2025 14:03
@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch 4 times, most recently from 1c29e9c to 6bb5bdc Compare June 25, 2025 18:21
@nfebe

nfebe commented Jun 25, 2025

Copy link
Copy Markdown
Contributor Author

/compile

Comment thread apps/files_sharing/src/components/SharingInput.vue Outdated
@nextcloud-command nextcloud-command requested a review from a team as a code owner June 25, 2025 18:29
@susnux

susnux commented Jun 30, 2025

Copy link
Copy Markdown
Contributor

Psalm is related, the return types do not match anymore.

@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch 2 times, most recently from c31bfcf to 2e8080c Compare June 30, 2025 16:13
@skjnldsv skjnldsv force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from f620ccd to 8995368 Compare July 17, 2025 07:58
@skjnldsv skjnldsv removed the request for review from artonge July 17, 2025 07:58
@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 8995368 to fc7eaa2 Compare July 17, 2025 14:02
@nfebe

nfebe commented Jul 17, 2025

Copy link
Copy Markdown
Contributor Author

/compile

@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch 2 times, most recently from 1817e98 to 30bce1d Compare July 24, 2025 14:18
@nfebe

nfebe commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

/compile

@susnux susnux force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 12b9125 to 41e0753 Compare July 24, 2025 17:40
@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 41e0753 to 4c15167 Compare July 25, 2025 11:07
@nfebe

nfebe commented Jul 25, 2025

Copy link
Copy Markdown
Contributor Author

/compile

@nfebe

nfebe commented Jul 25, 2025

Copy link
Copy Markdown
Contributor Author

We have to force merge this, this has been for a while due to a the download cypress tests.

I looked at this with @susnux and we concluded the tests are not related and flaky as also elsewhere.

cc: @AndyScherzinger @skjnldsv

@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 859716e to 59cd4bc Compare July 25, 2025 12:12
@susnux susnux force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 59cd4bc to 83e557b Compare July 25, 2025 15:35
@susnux

susnux commented Jul 25, 2025

Copy link
Copy Markdown
Contributor
Bildschirmfoto_20250725_173509

@susnux

susnux commented Jul 25, 2025

Copy link
Copy Markdown
Contributor

Meaning it was related because you moved the "create share" in the component to the bottom - adjusted the test code.

@kesselb

kesselb commented Jul 25, 2025

Copy link
Copy Markdown
Contributor

@susnux one more rebase and recompile? :)

Signed-off-by: nfebe <fenn25.fn@gmail.com>
@nfebe nfebe force-pushed the feat/52635/toggle-for-trusted-server-sharing branch from 83e557b to 2bb8c72 Compare July 29, 2025 12:24
@nfebe

nfebe commented Jul 29, 2025

Copy link
Copy Markdown
Contributor Author

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe nfebe dismissed provokateurin’s stale review July 29, 2025 16:52

Comments addressed, work needs to get in.

@nfebe nfebe merged commit f0485e4 into master Jul 29, 2025
214 of 222 checks passed
@nfebe nfebe deleted the feat/52635/toggle-for-trusted-server-sharing branch July 29, 2025 16:52
@nfebe

nfebe commented Jul 29, 2025

Copy link
Copy Markdown
Contributor Author

Meaning it was related because you moved the "create share" in the component to the bottom - adjusted the test code.

Thanks for double checking @susnux

@nfebe

nfebe commented Jul 29, 2025

Copy link
Copy Markdown
Contributor Author

/backport to stable31

@backportbot

backportbot Bot commented Jul 29, 2025

Copy link
Copy Markdown

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/53661/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 2bb8c72c 21b273dc

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/53661/stable31

Error: Failed to check for changes with origin/stable31: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: 🏗️ In progress

Development

Successfully merging this pull request may close these issues.

new setting: allow federated shares to trusted servers to appear in the Internal shares section

6 participants