Skip to content

fix: expose via dav capabilities whether calendar app is enabled #53206

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −2
Draft

fix: expose via dav capabilities whether calendar app is enabled #53206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf6b147
fix: expose via dav capabilities whether calendar app is enabled
Antreesy May 30, 2025
054f443
fixup! revert dav capabilities
Antreesy May 31, 2025
3cf6fec
feat: expose enabled apps in core capabilities
Antreesy May 31, 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
16 changes: 15 additions & 1 deletion lib/private/OCS/CoreCapabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
*/
namespace OC\OCS;

use OCP\App\IAppManager;
use OCP\Capabilities\ICapability;
use OCP\IConfig;
use OCP\IURLGenerator;
use OCP\IUserSession;

/**
* Class Capabilities
Expand All @@ -22,24 +24,27 @@
*/
public function __construct(
private IConfig $config,
private IAppManager $appManager,
private IUserSession $userSession,
) {
}

/**
* Return this classes capabilities
*
* @return array{

Check failure on line 35 in lib/private/OCS/CoreCapabilities.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

MoreSpecificReturnType 

lib/private/OCS/CoreCapabilities.php:35:13: MoreSpecificReturnType: The declared return type 'array{core: array{'enabled-apps': list<string>, 'mod-rewrite-working': bool, 'reference-api': bool, 'reference-regex': string, 'webdav-root': string, pollinterval: int}}' for OC\OCS\CoreCapabilities::getCapabilities is more specific than the inferred return type 'array{core: array{'enabled-apps': array<array-key, string>, 'mod-rewrite-working': bool, 'reference-api': true, 'reference-regex': '(\\s|\\n|^)(https?:\\/\\/)([-A-Z0-9+_.]+(?::[0-9]+)?(?:\\/[-A-Z0-9+&@#%?=~_|!:,....', 'webdav-root': string, pollinterval: int}}' (see https://psalm.dev/070)
* core: array{
* pollinterval: int,
* webdav-root: string,
* reference-api: boolean,
* reference-regex: string,
* mod-rewrite-working: boolean,
* enabled-apps: list<string>,
* },
* }
*/
public function getCapabilities(): array {
return [
$capabilities = [
'core' => [
'pollinterval' => $this->config->getSystemValueInt('pollinterval', 60),
'webdav-root' => $this->config->getSystemValueString('webdav-root', 'remote.php/webdav'),
Expand All @@ -48,5 +53,14 @@
'mod-rewrite-working' => $this->config->getSystemValueBool('htaccess.IgnoreFrontController') || getenv('front_controller_active') === 'true',
],
];

$user = $this->userSession->getUser();
if ($user === null) {
$capabilities['core']['enabled-apps'] = $this->appManager->getEnabledApps();
} else {
$capabilities['core']['enabled-apps'] = $this->appManager->getEnabledAppsForUser($user);
}

return $capabilities;

Check failure on line 64 in lib/private/OCS/CoreCapabilities.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

LessSpecificReturnStatement 

lib/private/OCS/CoreCapabilities.php:64:10: LessSpecificReturnStatement: The type 'array{core: array{'enabled-apps': array<array-key, string>, 'mod-rewrite-working': bool, 'reference-api': true, 'reference-regex': '(\\s|\\n|^)(https?:\\/\\/)([-A-Z0-9+_.]+(?::[0-9]+)?(?:\\/[-A-Z0-9+&@#%?=~_|!:,....', 'webdav-root': string, pollinterval: int}}' is more general than the declared return type 'array{core: array{'enabled-apps': list<string>, 'mod-rewrite-working': bool, 'reference-api': bool, 'reference-regex': string, 'webdav-root': string, pollinterval: int}}' for OC\OCS\CoreCapabilities::getCapabilities (see https://psalm.dev/129)
}
}
2 changes: 1 addition & 1 deletion lib/private/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ public function __construct($webRoot, \OC\Config $config) {
$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
$manager->registerCapability(function () use ($c) {
return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class), $c->get(IAppManager::class), $c->get(IUserSession::class),);
});
$manager->registerCapability(function () use ($c) {
return $c->get(\OC\Security\Bruteforce\Capabilities::class);
Expand Down
Loading