upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #55196 from nextcloud/fix/55182/ocm-invite-accept-dialog

Browse source 
fix(ocm-invites): add route to invite accept dialog
This commit is contained in:
Andy Scherzinger 2025-09-21 14:04:24 +02:00 committed by GitHub
commit edd8112dda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/AppInfo/ConfigLexicon.php
View file

@ -28,6 +28,8 @@ class ConfigLexicon implements ILexicon {
public const SHARE_LINK_EXPIRE_DATE_ENFORCED = 'shareapi_enforce_expire_date';
public const USER_LANGUAGE = 'lang';
public const OCM_DISCOVERY_ENABLED = 'ocm_discovery_enabled';
public const OCM_INVITE_ACCEPT_DIALOG = 'ocm_invite_accept_dialog';
public const USER_LOCALE = 'locale';
public const USER_TIMEZONE = 'timezone';
@ -87,6 +89,7 @@ class ConfigLexicon implements ILexicon {
),
new Entry(self::LASTCRON_TIMESTAMP, ValueType::INT, 0, 'timestamp of last cron execution'),
new Entry(self::OCM_DISCOVERY_ENABLED, ValueType::BOOL, true, 'enable/disable OCM', lazy: true),
new Entry(self::OCM_INVITE_ACCEPT_DIALOG, ValueType::STRING, '', 'route to local invite accept dialog', lazy: true, note: 'set as empty string to disable feature'),
];
}

5
lib/private/OCM/Model/OCMProvider.php
View file

@ -226,6 +226,7 @@ class OCMProvider implements ICapabilityAwareOCMProvider {
$resources[] = $resource->import($resourceData);
}
$this->setResourceTypes($resources);
$this->setInviteAcceptDialog($data['inviteAcceptDialog'] ?? '');
if (isset($data['publicKey'])) {
// import details about the remote request signing public key, if available
@ -271,11 +272,11 @@ class OCMProvider implements ICapabilityAwareOCMProvider {
];
$capabilities = $this->getCapabilities();
$inviteAcceptDialog = $this->getInviteAcceptDialog();
if ($capabilities) {
$response['capabilities'] = $capabilities;
}
if ($inviteAcceptDialog) {
$inviteAcceptDialog = $this->getInviteAcceptDialog();
if ($inviteAcceptDialog !== '') {
$response['inviteAcceptDialog'] = $inviteAcceptDialog;
}
return $response;

6
lib/private/OCM/OCMDiscoveryService.php
View file

@ -152,6 +152,12 @@ class OCMDiscoveryService implements IOCMDiscoveryService {
$provider->setEndPoint(substr($url, 0, $pos));
$provider->setCapabilities(['/invite-accepted', '/notifications', '/shares']);
// The inviteAcceptDialog is available from the contacts app, if this config value is set
$inviteAcceptDialog = $this->appConfig->getValueString('core', ConfigLexicon::OCM_INVITE_ACCEPT_DIALOG);
if ($inviteAcceptDialog !== '') {
$provider->setInviteAcceptDialog($this->urlGenerator->linkToRouteAbsolute($inviteAcceptDialog));
}
$resource = $provider->createNewResourceType();
$resource->setName('file')
->setShareTypes(['user', 'group'])