Skip to content

feat: exchange cloud ID #4417

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

Open
redblom wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat: exchange cloud ID #4417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e67ff76
feat(OCM-Invites): Implement exchanging cloud IDs through OCM invitat…
antoonp Oct 29, 2025
f57cdf3
Revert messed up rebase.
antoonp Nov 19, 2025
335c299
Handle possible different app root url's.
antoonp Nov 19, 2025
b1eba22
Get/Set config value as array and lazy.
antoonp Nov 20, 2025
29792a6
Fix redundant bool conversion.
antoonp Nov 20, 2025
e730dea
Use CSRF check where relevant.
antoonp Nov 20, 2025
0b6c5e9
Remove redundant parameter check.
antoonp Nov 20, 2025
86027f9
Fix messed up rebase.
antoonp Nov 20, 2025
379d9a3
Merge branch 'main' into invite-for-cloudid-exchange
redblom Nov 21, 2025
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
Prev Previous commit
Next Next commit
Fix redundant bool conversion. 
Use core config lexicon.
  • Loading branch information
@antoonp
antoonp committed Nov 20, 2025
commit 29792a66fbaba5c23c8799baf790e70a0088d3aa
8 changes: 4 additions & 4 deletions lib/Command/DisableOcmInvites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace OCA\Contacts\Command;

use OC\Core\AppInfo\ConfigLexicon;
use OCP\IAppConfig;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
Expand All @@ -26,15 +27,14 @@ protected function configure(): void {
}

protected function execute(InputInterface $input, OutputInterface $output): int {
$isAlreadyDisabled = $this->appConfig->getValueBool('contacts', 'ocm_invites_enabled') === false;

if ($isAlreadyDisabled) {
$isEnabled = $this->appConfig->getValueBool('contacts', 'ocm_invites_enabled');
if (!$isEnabled) {
$output->writeln('OCM Invites already disabled.');
return self::SUCCESS;
}

$this->appConfig->setValueBool('contacts', 'ocm_invites_enabled', false);
$this->appConfig->deleteKey('core', 'ocm_invite_accept_dialog');
$this->appConfig->deleteKey('core', ConfigLexicon::OCM_INVITE_ACCEPT_DIALOG);
$output->writeln('OCM Invites successfully disabled.');
return self::SUCCESS;
}
Expand Down
4 changes: 1 addition & 3 deletions lib/Service/FederatedInvitesService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ public function __construct(
}

public function isOcmInvitesEnabled():bool {
$val = $this->appConfig->getValueBool(Application::APP_ID, 'ocm_invites_enabled', FederatedInvitesService::OCM_INVITES_ENABLED_BY_DEFAULT);
$boolval = (is_string($val) ? filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : (bool)$val);
return ($boolval === null ? false : $boolval);
return $this->appConfig->getValueBool(Application::APP_ID, 'ocm_invites_enabled', FederatedInvitesService::OCM_INVITES_ENABLED_BY_DEFAULT);
}

/**
Expand Down