refactor(appstore): split appstore from settings app by susnux · Pull Request #59997 · nextcloud/server

susnux · 2026-04-29T19:57:45Z

Split of refactor: split appstore from settings and migrate to Typescript and Vue 3 #57290

Summary

See #57290 for details.
This only contains the app split and the needed changes to make it work in a separate app.
Moreover this also applies strict rector rules, for this I needed to fix a bug where rector (and also for psalm strict) did not have access to OCP (lib/public) and thus did not knew about those classes / interfaces and produced wrong output.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

AI (if applicable)

The content of this PR was partly or fully generated using AI

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

provokateurin · 2026-04-30T06:09:13Z

+	/**
+	 * Get all available apps
+	 *
+	 * @return DataResponse<Http::STATUS_OK, list<array{id: string, name: string, description: string, ...}>, array{}>


Would be nice if this could contain all fields (and would use a type alias).

provokateurin · 2026-04-30T06:11:12Z

+	#[ApiRoute(verb: 'POST', url: '/api/v1/apps/force')]
+	public function force(string $appId): DataResponse {


Suggested change

#[ApiRoute(verb: 'POST', url: '/api/v1/apps/force')]

public function force(string $appId): DataResponse {

#[ApiRoute(verb: 'POST', url: '/api/v1/apps/enable/force')]

public function forceEnable(string $appId): DataResponse {

Or just merge it with the normal enable endpoint and add a boolean parameter.

provokateurin · 2026-04-30T06:13:27Z

+#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
+class DiscoverController extends Controller {


I think this should be an OCSController and not be ignored. Maybe clients want to use this API in the future too?

provokateurin · 2026-04-30T06:14:23Z

+	 */
+	#[NoCSRFRequired]
+	#[FrontpageRoute(verb: 'GET', url: '/api/v1/discover/media')]
+	public function getAppDiscoverMedia(string $fileName, ILimiter $limiter, IUserSession $session): FileDisplayResponse|NotFoundResponse {


Suggested change

public function getAppDiscoverMedia(string $fileName, ILimiter $limiter, IUserSession $session): FileDisplayResponse|NotFoundResponse {

public function getAppDiscoverMedia(string $fileName, ILimiter $limiter): FileDisplayResponse|NotFoundResponse {

Does this even work? It should be injected through the constructor.

Yes it does you can inject things in controller methods (its a thing we advertise to do)¹.

The use case is that controllers are always constructed, so e.g. userId must be string | null but if you inject in the methods then you can also inject $userId as string if the method was not flagged as PublicPage.
And also you do not need to inject things you only need in one method.

¹ See also https://docs.nextcloud.com/server/latest/developer_manual/basics/dependency_injection.html#controller-injection

provokateurin · 2026-04-30T06:18:35Z

 		$apps = $appClass->listAllApps();
+		/** @var array{id: string, ...} $app */


The return type of listAllApps should be fixed instead.

provokateurin · 2026-04-30T06:18:51Z


-	private function getBundles() {
+	/**
+	 * @return array{name: mixed, id: mixed, appIdentifiers: mixed}[]


This type should be more concrete than mixed.

provokateurin · 2026-04-30T06:21:49Z

@@ -32,17 +32,26 @@
 		<file name="lib/public/DB/QueryBuilder/ITypedQueryBuilder.php"/>
 		<file name="lib/private/Share20/ShareHelper.php"/>
 		<file name="lib/public/Share/IShareHelper.php"/>
+		<directory name="apps/appstore/lib" />


Suggested change

<directory name="apps/appstore/lib" />

<directory name="apps/appstore" />

provokateurin · 2026-04-30T06:22:36Z

+			<!-- Missing types of the AppFetcher and the OC_Apps class for return types -->
+			<file name="apps/appstore/lib/Controller/ApiController.php" />
+			<!-- ... -->
 			<directory name="apps/**/composer"/>
 			<directory name="apps/**/tests"/>
+			<directory name="lib/private"/>
+			<directory name="lib/public"/>
 			<directory name="lib/composer"/>
 			<directory name="lib/l10n"/>
 			<directory name="3rdparty"/>
+			<directory name="build"/>


All of this should not be necessary 🤔

For Unified Sharing I have a whole new app and parts of lib/public and lib/private in this config and there is no issue with that.

artonge

Much more manageable, thanks for splitting :)

susnux added this to the Nextcloud 34 milestone Apr 29, 2026

susnux requested review from a team and provokateurin as code owners April 29, 2026 19:57

susnux added the 3. to review Waiting for reviews label Apr 29, 2026

susnux requested a review from a team as a code owner April 29, 2026 19:57

susnux added technical debt 🧱 🤔🚀 ♻️ refactor Refactor code (not a bug fix, not a feature just refactoring) labels Apr 29, 2026

susnux requested review from CarlSchwan, leftybournes, nfebe, salmart-dev, sorbaugh and szaimen and removed request for a team April 29, 2026 19:57

susnux force-pushed the chore/split-appstore branch from 40c4086 to 9749a51 Compare April 29, 2026 19:58

susnux requested review from artonge and skjnldsv and removed request for a team and sorbaugh April 29, 2026 19:58

susnux mentioned this pull request Apr 29, 2026

refactor: split appstore from settings and migrate to Typescript and Vue 3 #57290

Open

6 tasks

susnux added 5 commits April 29, 2026 22:04

refactor: split appstore from settings

d45cdcb

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

refactor(appstore): split controllers and use proper root

5c08f32

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

chore: apply strict rector rules on appstore

8bc7ff0

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

refactor(appstore): adjust frontend for new API location

7b1a52c

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

chore: compile assets

4be9862

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

susnux force-pushed the chore/split-appstore branch from 9749a51 to 4be9862 Compare April 29, 2026 20:05

skjnldsv approved these changes Apr 30, 2026

View reviewed changes

provokateurin requested changes Apr 30, 2026

View reviewed changes

susnux mentioned this pull request Apr 30, 2026

chore: fix strict psalm and rector #60012

Merged

7 tasks

artonge approved these changes Apr 30, 2026

View reviewed changes

susnux mentioned this pull request Apr 30, 2026

refactor(Fetcher): properly type AppStore fetcher #60016

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor(appstore): split appstore from settings app#59997

refactor(appstore): split appstore from settings app#59997
susnux wants to merge 5 commits intomasterfrom
chore/split-appstore

susnux commented Apr 29, 2026 •

edited

Loading

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

susnux Apr 30, 2026

Uh oh!

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

provokateurin Apr 30, 2026

Uh oh!

artonge left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		#[ApiRoute(verb: 'POST', url: '/api/v1/apps/force')]
		public function force(string $appId): DataResponse {

		#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
		class DiscoverController extends Controller {

	public function getAppDiscoverMedia(string $fileName, ILimiter $limiter, IUserSession $session): FileDisplayResponse\|NotFoundResponse {
	public function getAppDiscoverMedia(string $fileName, ILimiter $limiter): FileDisplayResponse\|NotFoundResponse {

		$apps = $appClass->listAllApps();
		/** @var array{id: string, ...} $app */

	<directory name="apps/appstore/lib" />
	<directory name="apps/appstore" />

Uh oh!

Conversation

susnux commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

AI (if applicable)

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

susnux commented Apr 29, 2026 •

edited

Loading