optimization: system flag and ex_app_users removal

appinfo/info.xml

@@ -89,7 +89,6 @@ to join us in shaping a more versatile, stable, and secure app landscape.
 		<command>OCA\AppAPI\Command\ExApp\ListExApps</command>
 		<command>OCA\AppAPI\Command\ExApp\Notify</command>
 		<command>OCA\AppAPI\Command\ExApp\Scopes\ListScopes</command>
-		<command>OCA\AppAPI\Command\ExApp\Users\ListUsers</command>
 		<command>OCA\AppAPI\Command\ExAppConfig\GetConfig</command>
 		<command>OCA\AppAPI\Command\ExAppConfig\SetConfig</command>
 		<command>OCA\AppAPI\Command\ExAppConfig\DeleteConfig</command>

docs/ManagingExternalApplications.rst

@@ -103,18 +103,8 @@ ListExApps command will show all ExApps:
 
     ExApps:
     appid (Display Name): version [enabled/disabled]
-    to_gif (ToGif): 1.0.0 [enabled]
-    upscaler_demo (Upscaler Demo): 1.0.0 [enabled]
-
-List ExApp users
-----------------
-
-Command: ``app_api:app:users:list <appid>``
-
-System user
-***********
-
-System user (``[system user]``) in the list means that this ExApp was setup as a system ExApp.
+    to_gif_example (To Gif Example): 1.0.0 [enabled]
+    upscaler_example (Upscaler Example): 1.0.0 [enabled]
 
 Using the ExApp Management UI
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

lib/AppInfo/Application.php

@@ -12,7 +12,6 @@
 use OCA\AppAPI\Listener\FileEventsListener;
 use OCA\AppAPI\Listener\LoadFilesPluginListener;
 use OCA\AppAPI\Listener\SabrePluginAuthInitListener;
-use OCA\AppAPI\Listener\UserDeletedListener;
 use OCA\AppAPI\Middleware\AppAPIAuthMiddleware;
 use OCA\AppAPI\Middleware\ExAppUIL10NMiddleware;
 use OCA\AppAPI\Middleware\ExAppUiMiddleware;
@@ -47,7 +46,6 @@
 use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
 use OCP\Settings\Events\DeclarativeSettingsRegisterFormEvent;
 use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
-use OCP\User\Events\UserDeletedEvent;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Throwable;
@@ -74,7 +72,6 @@ public function register(IRegistrationContext $context): void {
 		$context->registerMiddleware(ExAppUiMiddleware::class);
 		$context->registerMiddleware(ExAppUIL10NMiddleware::class, true);
 		$context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 		$context->registerNotifierService(ExAppNotifier::class);
 		$context->registerNotifierService(ExAppAdminNotifier::class);
 

lib/Command/ExApp/Notify.php

@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$route = $input->getArgument('route');
 		$userId = $input->getOption('user-id');
-		$response = $this->service->aeRequestToExApp($exApp, $route, $userId, params: $eventJsonData,
+		$response = $this->service->requestToExApp($exApp, $route, $userId, params: $eventJsonData,
 			options: ['timeout' => 2]);
 		if (is_array($response) && isset($response['error'])) {
 			$output->writeln(sprintf('Failed to notify ExApp %s: %s', $appId, $response['error']));

lib/Controller/ExAppProxyController.php

@@ -81,7 +81,7 @@ public function ExAppGet(string $appId, string $other): Response {
 			return new NotFoundResponse();
 		}
 
-		$response = $this->service->aeRequestToExApp2(
+		$response = $this->service->requestToExApp2(
 			$exApp, '/' . $other, $this->userId, 'GET', queryParams: $_GET, options: [
 				RequestOptions::COOKIES => $this->buildProxyCookiesJar($_COOKIE, $this->service->getExAppDomain($exApp)),
 			],
@@ -110,7 +110,7 @@ public function ExAppPost(string $appId, string $other): Response {
 		}
 		$bodyParams = $this->prepareBodyParams($this->request->getParams());
 
-		$response = $this->service->aeRequestToExApp2(
+		$response = $this->service->requestToExApp2(
 			$exApp, '/' . $other, $this->userId,
 			queryParams: $_GET, bodyParams: $bodyParams, options: $options,
 			request: $this->request,
@@ -138,7 +138,7 @@ public function ExAppPut(string $appId, string $other): Response {
 		}
 		$bodyParams = $this->prepareBodyParams($this->request->getParams());
 
-		$response = $this->service->aeRequestToExApp2(
+		$response = $this->service->requestToExApp2(
 			$exApp, '/' . $other, $this->userId, 'PUT', queryParams: $_GET, bodyParams: $bodyParams,
 			options: $options,
 			request: $this->request,
@@ -158,7 +158,7 @@ public function ExAppDelete(string $appId, string $other): Response {
 		}
 
 		$bodyParams = $this->prepareBodyParams($this->request->getParams());
-		$response = $this->service->aeRequestToExApp2(
+		$response = $this->service->requestToExApp2(
 			$exApp, '/' . $other, $this->userId, 'DELETE', queryParams: $_GET, bodyParams: $bodyParams,
 			options: [
 				RequestOptions::COOKIES => $this->buildProxyCookiesJar($_COOKIE, $this->service->getExAppDomain($exApp)),

lib/Controller/ExAppsPageController.php

@@ -18,7 +18,6 @@
 use OCA\AppAPI\Service\DaemonConfigService;
 use OCA\AppAPI\Service\ExAppApiScopeService;
 use OCA\AppAPI\Service\ExAppService;
-use OCA\AppAPI\Service\ExAppUsersService;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -51,7 +50,6 @@ class ExAppsPageController extends Controller {
 	private IL10N $l10n;
 	private LoggerInterface $logger;
 	private IAppManager $appManager;
-	private ExAppUsersService $exAppUsersService;
 
 	public function __construct(
 		IRequest $request,
@@ -60,7 +58,6 @@ public function __construct(
 		AppAPIService $service,
 		DaemonConfigService $daemonConfigService,
 		ExAppApiScopeService $exAppApiScopeService,
-		ExAppUsersService $exAppUsersService,
 		DockerActions $dockerActions,
 		CategoryFetcher $categoryFetcher,
 		IFactory $l10nFactory,
@@ -84,7 +81,6 @@ public function __construct(
 		$this->exAppFetcher = $exAppFetcher;
 		$this->logger = $logger;
 		$this->appManager = $appManager;
-		$this->exAppUsersService = $exAppUsersService;
 	}
 
 	#[NoCSRFRequired]
@@ -243,7 +239,6 @@ private function getAppsForCategory(string $requestedCategory = ''): array {
 				'appstoreData' => $app,
 				'scopes' => $scopes,
 				'daemon' => $daemon,
-				'systemApp' => $exApp !== null && $this->exAppUsersService->exAppUserExists($exApp->getAppid(), ''),
 				'status' => $exApp !== null ? $exApp->getStatus() : [],
 				'error' => $exApp !== null ? $exApp->getStatus()['error'] ?? '' : '',
 			];
@@ -375,7 +370,6 @@ private function buildLocalAppsList(array $apps, array $exApps): array {
 					'appstoreData' => $app,
 					'scopes' => $scopes,
 					'daemon' => $daemon,
-					'systemApp' => $this->exAppUsersService->exAppUserExists($exApp->getAppid(), ''),
 					'exAppUrl' => $this->service->getExAppUrl($exApp, $exApp->getPort(), $auth),
 					'releases' => [],
 					'update' => null,

lib/Controller/OCSExAppController.php

@@ -98,6 +98,11 @@ public function requestToExApp(
 		]);
 	}
 
+	/**
+	 * TODO: remove later
+	 *
+	 * @deprecated since AppAPI 2.8.0
+	 */
 	#[NoCSRFRequired]
 	public function aeRequestToExApp(
 		string $appId,
@@ -111,7 +116,7 @@ public function aeRequestToExApp(
 		if ($exApp === null) {
 			return new DataResponse(['error' => sprintf('ExApp `%s` not found', $appId)]);
 		}
-		$response = $this->service->aeRequestToExApp($exApp, $route, $userId, $method, $params, $options, $this->request);
+		$response = $this->service->requestToExApp($exApp, $route, $userId, $method, $params, $options, $this->request);
 		if (is_array($response) && isset($response['error'])) {
 			return new DataResponse($response, Http::STATUS_BAD_REQUEST);
 		}

lib/Controller/TopMenuController.php

@@ -6,7 +6,6 @@
 
 use OCA\AppAPI\AppInfo\Application;
 use OCA\AppAPI\Service\ExAppService;
-use OCA\AppAPI\Service\ExAppUsersService;
 use OCA\AppAPI\Service\UI\InitialStateService;
 use OCA\AppAPI\Service\UI\ScriptsService;
 use OCA\AppAPI\Service\UI\StylesService;
@@ -34,7 +33,6 @@ public function __construct(
 		private readonly InitialStateService $initialStateService,
 		private readonly ScriptsService      $scriptsService,
 		private readonly StylesService       $stylesService,
-		private readonly ExAppUsersService   $exAppUsersService,
 		private readonly ExAppService        $service,
 		private readonly ?string             $userId,
 		private readonly IGroupManager       $groupManager,
@@ -70,7 +68,6 @@ public function viewExAppPage(string $appId, string $name, string $other): Templ
 		$this->stylesService->applyExAppStyles($appId, 'top_menu', $menuEntry->getName());
 
 		$this->postprocess = true;
-		$this->exAppUsersService->setupExAppUser($exApp->getAppid(), $this->userId);
 		$response = new TemplateResponse(Application::APP_ID, 'embedded');
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedScriptDomain($this->request->getServerHost());

lib/Db/ExApp.php

@@ -24,7 +24,6 @@
  * @method int getEnabled()
  * @method int getCreatedTime()
  * @method int getLastCheckTime()
- * @method int getIsSystem()
  * @method array getApiScopes()
  * @method array getDeployConfig()
  * @method string getAcceptsDeployId()
@@ -40,7 +39,6 @@
  * @method void setEnabled(int $enabled)
  * @method void setCreatedTime(int $createdTime)
  * @method void setLastCheckTime(int $lastCheckTime)
- * @method void setIsSystem(int $system)
  * @method void setApiScopes(array $apiScopes)
  * @method void setDeployConfig(array $deployConfig)
  * @method void setAcceptsDeployId(string $acceptsDeployId)
@@ -58,7 +56,6 @@ class ExApp extends Entity implements JsonSerializable {
 	protected $enabled;
 	protected $createdTime;
 	protected $lastCheckTime;
-	protected $isSystem;
 	protected $apiScopes;
 	protected $deployConfig;
 	protected $acceptsDeployId;
@@ -79,7 +76,6 @@ public function __construct(array $params = []) {
 		$this->addType('enabled', 'int');
 		$this->addType('createdTime', 'int');
 		$this->addType('lastCheckTime', 'int');
-		$this->addType('isSystem', 'int');
 		$this->addType('apiScopes', 'json');
 		$this->addType('deployConfig', 'json');
 		$this->addType('acceptsDeployId', 'string');
@@ -123,9 +119,6 @@ public function __construct(array $params = []) {
 		if (isset($params['last_check_time'])) {
 			$this->setLastCheckTime($params['last_check_time']);
 		}
-		if (isset($params['is_system'])) {
-			$this->setIsSystem($params['is_system']);
-		}
 		if (isset($params['api_scopes'])) {
 			$this->setApiScopes($params['api_scopes']);
 		} else {
@@ -154,7 +147,6 @@ public function jsonSerialize(): array {
 			'enabled' => $this->getEnabled(),
 			'created_time' => $this->getCreatedTime(),
 			'last_check_time' => $this->getLastCheckTime(),
-			'is_system' => $this->getIsSystem(),
 			'api_scopes' => $this->getApiScopes(),
 			'deploy_config' => $this->getDeployConfig(),
 			'accepts_deploy_id' => $this->getAcceptsDeployId(),

lib/Db/ExAppMapper.php

@@ -114,8 +114,6 @@ public function updateExApp(ExApp $exApp, array $fields): int {
 				$qb = $qb->set('enabled', $qb->createNamedParameter($exApp->getEnabled(), IQueryBuilder::PARAM_INT));
 			} elseif ($field === 'last_check_time') {
 				$qb = $qb->set('last_check_time', $qb->createNamedParameter($exApp->getLastCheckTime(), IQueryBuilder::PARAM_INT));
-			} elseif ($field === 'is_system') {
-				$qb = $qb->set('is_system', $qb->createNamedParameter($exApp->getIsSystem(), IQueryBuilder::PARAM_INT));
 			} elseif ($field === 'api_scopes') {
 				$qb = $qb->set('api_scopes', $qb->createNamedParameter($exApp->getApiScopes(), IQueryBuilder::PARAM_JSON));
 			}