feat(federation): auto-accept shares from trusted servers#49973
Merged
feat(federation): auto-accept shares from trusted servers#49973
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
skjnldsv
added
enhancement
2. developing
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
2 times, most recently
from
ff6f6e6 to
5d4c7b7
Compare
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
2 times, most recently
from
e29a165 to
c78d1fe
Compare
skjnldsv
force-pushed
the
backport/49973/master
branch
from
1d4cadb to
a710e0c
Compare
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
9 times, most recently
from
0ba688c to
9e36462
Compare
skjnldsv
added
3. to review
provokateurin
requested changes
Jan 7, 2025
Member
provokateurin
left a comment
provokateurin
left a comment
There was a problem hiding this comment.
Some things that could be improved over the old code, if you're already migrating it anyway 🙈
Merged
…cates` Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
4 times, most recently
from
6bf6515 to
968be50
Compare
come-nc
reviewed
Jan 9, 2025
come-nc
approved these changes
Jan 9, 2025
come-nc
reviewed
Jan 9, 2025
…dleware Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
from
968be50 to
669e6ca
Compare
ChristophWurst
approved these changes
Jan 9, 2025
Member
ChristophWurst
left a comment
ChristophWurst
left a comment
There was a problem hiding this comment.
Looks sane, didn't test
| margin-top: 20px; | ||
| } | ||
|
|
||
| .settings-subsection__name { |
Member
There was a problem hiding this comment.
nit: use scss and move this into .settings-subsection?
| $servers = $this->trustedServers->getServers(); | ||
|
|
||
| // obfuscate the shared secret | ||
| $servers = array_map(function ($server) { |
Member
There was a problem hiding this comment.
nit: introduce a new variable instead of repurposing the old one.
Suggested change
| $servers = array_map(function ($server) { | |
| $redactedServers = array_map(function ($server) { |
| try { | ||
| $this->trustedServers->getServer($id); | ||
| } catch (\Exception $e) { | ||
| throw new OCSNotFoundException($this->l->t('No server found with ID: %s', [$id])); |
Member
There was a problem hiding this comment.
It could be something else as well, other than server not found. Log the exception at debug level.
provokateurin
approved these changes
Jan 9, 2025
Member
|
I did not expect the fast merge :x |
Merged
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Needs #49974
Fix #34550