feat(federation): auto-accept shares from trusted servers #49973
+2,383
−182
Conversation
This file contains 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
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
skjnldsv
requested review from
ArtificialOwl,
nfebe,
susnux and
come-nc
and removed request for
a team
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
from
9e36462 to
19e8cbe
Compare
skjnldsv
force-pushed
the
backport/49973/master
branch
from
a710e0c to
bc0ad5e
Compare
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
from
19e8cbe to
094727a
Compare
…cates` Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
skjnldsv
force-pushed
the
feat/auto-accept-trusted-server
branch
from
8b3c276 to
2467a25
Compare
come-nc
reviewed
Jan 6, 2025
| @@ -999,6 +999,11 @@ public function isLookupServerUploadEnabled() { | |||
| return ($result === 'yes'); | |||
| } | |||
|
|
|||
| public function isFederatedTrustedShareAutoAccept() { | |||
There was a problem hiding this comment.
Suggested change
| public function isFederatedTrustedShareAutoAccept() { | |
| public function isFederatedTrustedShareAutoAccept(): bool { |
| if ($this->trustedServers->isTrustedServer($url) === true) { | ||
| $message = 'Server is already in the list of trusted servers.'; | ||
| $hint = $this->l->t('Server is already in the list of trusted servers.'); | ||
| throw new HintException($message, $hint); | ||
| return new JSONResponse([ |
There was a problem hiding this comment.
You can use an OCSException from OCP\AppFramework\OCS and then you can keep the old behavior with the throws.
For STATUS_NOT_FOUND there is even OCSNotFoundException.
There was a problem hiding this comment.
Completely forgot about those 🤦
Comment on lines
+61
to
+63
| /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ | ||
| private $config; | ||
|
|
There was a problem hiding this comment.
Suggested change
| /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ | |
| private $config; | |
| private MockObject&IConfig $config; |
| @@ -83,7 +88,8 @@ protected function setUp(): void { | |||
| $this->trustedServers, | |||
| $this->logger, | |||
| $this->discoverService, | |||
| $this->timeFactory | |||
| $this->timeFactory, | |||
| $this->config | |||
There was a problem hiding this comment.
Suggested change
| $this->config | |
| $this->config, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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