refactor(appstore): split appstore from settings app#59997
Open
refactor(appstore): split appstore from settings app#59997
Conversation
susnux
added
technical debt
susnux
requested review from
CarlSchwan,
leftybournes,
nfebe,
salmart-dev,
sorbaugh and
szaimen
and removed request for
a team
susnux
force-pushed
the
chore/split-appstore
branch
from
40c4086 to
9749a51
Compare
susnux
requested review from
artonge and
skjnldsv
and removed request for
a team and
sorbaugh
6 tasks
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
susnux
force-pushed
the
chore/split-appstore
branch
from
9749a51 to
4be9862
Compare
skjnldsv
approved these changes
Apr 30, 2026
provokateurin
requested changes
Apr 30, 2026
| /** | ||
| * Get all available apps | ||
| * | ||
| * @return DataResponse<Http::STATUS_OK, list<array{id: string, name: string, description: string, ...}>, array{}> |
Member
There was a problem hiding this comment.
Would be nice if this could contain all fields (and would use a type alias).
Comment on lines
+273
to
+274
| #[ApiRoute(verb: 'POST', url: '/api/v1/apps/force')] | ||
| public function force(string $appId): DataResponse { |
Member
There was a problem hiding this comment.
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.
Comment on lines
+34
to
+35
| #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] | ||
| class DiscoverController extends Controller { |
Member
There was a problem hiding this comment.
I think this should be an OCSController and not be ignored. Maybe clients want to use this API in the future too?
| */ | ||
| #[NoCSRFRequired] | ||
| #[FrontpageRoute(verb: 'GET', url: '/api/v1/discover/media')] | ||
| public function getAppDiscoverMedia(string $fileName, ILimiter $limiter, IUserSession $session): FileDisplayResponse|NotFoundResponse { |
Member
There was a problem hiding this comment.
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.
| #[FrontpageRoute(verb: 'GET', url: '/settings/apps', root: '')] | ||
| #[FrontpageRoute(verb: 'GET', url: '/settings/apps/{category}', defaults: ['category' => ''], root: '')] | ||
| #[FrontpageRoute(verb: 'GET', url: '/settings/apps/{category}/{id}', defaults: ['category' => '', 'id' => ''], root: '')] | ||
| public function viewApps(): TemplateResponse { |
Member
There was a problem hiding this comment.
Why is there no category parameter on the method?
Comment on lines
87
to
+88
| $apps = $appClass->listAllApps(); | ||
| /** @var array{id: string, ...} $app */ |
Member
There was a problem hiding this comment.
The return type of listAllApps should be fixed instead.
|
|
||
| private function getBundles() { | ||
| /** | ||
| * @return array{name: mixed, id: mixed, appIdentifiers: mixed}[] |
Member
There was a problem hiding this comment.
This type should be more concrete than mixed.
Member
| @@ -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" /> | |||
Member
There was a problem hiding this comment.
Suggested change
| <directory name="apps/appstore/lib" /> | |
| <directory name="apps/appstore" /> |
Comment on lines
+37
to
+47
| <!-- 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"/> |
Member
There was a problem hiding this comment.
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
3. to review, feature component)stable32)AI (if applicable)