upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

refactor(provisioning): do not use legacy OC_App class

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2026-04-30 14:40:32 +02:00
parent fdbd39a4a0
commit 1dbc2c4c10
No known key found for this signature in database
GPG key ID: 7E849AE05218500F
4 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/provisioning_api/lib/Controller/AppsController.php
View file

@ -10,7 +10,6 @@ namespace OCA\Provisioning_API\Controller;
use OC\App\AppStore\AppNotFoundException;
use OC\Installer;
use OC_App;
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
use OCP\AppFramework\Http;
@ -46,35 +45,31 @@ class AppsController extends OCSController {
/**
* Get a list of installed apps
*
* @param ?string $filter Filter for enabled or disabled apps
* @param 'enabled'|'disabled'|null $filter Filter for enabled or disabled apps
* @return DataResponse<Http::STATUS_OK, array{apps: list<string>}, array{}>
* @throws OCSException
*
* 200: Installed apps returned
*/
public function getApps(?string $filter = null): DataResponse {
$apps = (new OC_App())->listAllApps();
/** @var list<string> $list */
$list = [];
foreach ($apps as $app) {
$list[] = $app['id'];
}
if ($filter) {
switch ($filter) {
case 'enabled':
return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
break;
case 'disabled':
$enabled = OC_App::getEnabledApps();
return new DataResponse(['apps' => array_values(array_diff($list, $enabled))]);
break;
default:
// Invalid filter variable
throw new OCSException('', 101);
if ($filter !== null) {
$enabledApps = $this->appManager->getEnabledApps();
if ($filter === 'enabled') {
return new DataResponse(['apps' => $enabledApps]);
} elseif ($filter === 'disabled') {
$allApps = $this->appManager->getAllAppsInAppsFolders();
$coreApps = $this->appManager->getAlwaysEnabledApps();
$disabledApps = array_diff($allApps, $enabledApps, $coreApps);
return new DataResponse(['apps' => array_values($disabledApps)]);
} else {
throw new OCSException('Invalid filter', 101);
}
} else {
return new DataResponse(['apps' => $list]);
}
$allApps = $this->appManager->getAllAppsInAppsFolders();
$coreApps = $this->appManager->getAlwaysEnabledApps();
$apps = array_diff($allApps, $coreApps);
return new DataResponse(['apps' => array_values($apps)]);
}
/**

6
apps/provisioning_api/openapi-administration.json
View file

@ -390,7 +390,11 @@
"schema": {
"type": "string",
"nullable": true,
"default": null
"default": null,
"enum": [
"enabled",
"disabled"
]
}
},
{

6
apps/provisioning_api/openapi-full.json
View file

@ -437,7 +437,11 @@
"schema": {
"type": "string",
"nullable": true,
"default": null
"default": null,
"enum": [
"enabled",
"disabled"
]
}
},
{

6
openapi.json
View file

@ -27887,7 +27887,11 @@
"schema": {
"type": "string",
"nullable": true,
"default": null
"default": null,
"enum": [
"enabled",
"disabled"
]
}
},
{