Skip to content

Allow some apps to have root URLs in their own routing file - #20114

Merged
rullzer merged 11 commits into
masterfrom
techdebt/noid/allow-some-apps-to-have-root-urls
Apr 21, 2020
Merged

Allow some apps to have root URLs in their own routing file#20114
rullzer merged 11 commits into
masterfrom
techdebt/noid/allow-some-apps-to-have-root-urls

Conversation

@nickvergessen

Copy link
Copy Markdown
Member

Follow up to prevent #20038 from spreading

@nickvergessennickvergessen added 3. to review Waiting for reviews technical debt 🧱 🤔🚀 labels Mar 23, 2020
@nickvergessennickvergessen added this to the Nextcloud 19 milestone Mar 23, 2020
@nickvergessennickvergessen mentioned this pull request Mar 23, 2020
2 tasks
Comment threadcore/routes.php
['name' => 'requesthandlercontroller#addShare', 'url' => '/ocm/shares', 'verb' => 'POST', 'app' => 'cloud_federation_api'],
['name' => 'requesthandlercontroller#receiveNotification', 'url' => '/ocm/notifications', 'verb' => 'POST', 'app' => 'cloud_federation_api'],
['name' => 'pagecontroller#showCall', 'url' => '/call/{token}', 'verb' => 'GET', 'app' => 'spreed'],
['name' => 'pagecontroller#authenticatePassword', 'url' => '/call/{token}', 'verb' => 'POST', 'app' => 'spreed'],

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are now in nextcloud/spreed#3134

All other apps are in this PR

private function processOCS(array $routes): void {
$ocsRoutes = $routes['ocs'] ?? [];
foreach ($ocsRoutes as $ocsRoute) {
$name = $ocsRoute['name'];

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was referenced Apr 4, 2020
@skjnldsv
skjnldsvforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from 90dda67 to 12c43b3CompareApril 11, 2020 06:42
@skjnldsv

Copy link
Copy Markdown
Member

Rebased

@skjnldsv

Copy link
Copy Markdown
Member

Lots of failures

@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 11, 2020
@nickvergessen
nickvergessenforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from 12c43b3 to e07f126CompareApril 14, 2020 15:26
@nickvergessennickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Apr 14, 2020
@skjnldsv
skjnldsvforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from d7058c6 to 8e786e4CompareApril 15, 2020 06:00
@nickvergessen
nickvergessenforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from 8e786e4 to 4bae8dbCompareApril 15, 2020 12:13
This was referenced Apr 15, 2020

@danxuliudanxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PHP CS is not happy.

Some integration and acceptance tests failures are legit, and all seem to be caused by Unable to generate a URL for the named route \"cloud_federation_api.RequestHandler.addShare\" as such route does not exist.

@nickvergessen

Copy link
Copy Markdown
MemberAuthor

PHP CS is not happy.

Should be fixed by a last rebase as it's not caused by this PR.

@nickvergessen
nickvergessenforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from 4bae8db to a0f75aeCompareApril 17, 2020 09:21
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@rullzer
rullzerforce-pushed the techdebt/noid/allow-some-apps-to-have-root-urls branch from ebba033 to 1b93d5fCompareApril 18, 2020 09:21
@nickvergessen

Copy link
Copy Markdown
MemberAuthor

SHould be good to go now?
Not sure what the acceptance tests complain about. And the failing integration tests are caused by #16035

@rullzer

Copy link
Copy Markdown
Member

SHould be good to go now?
Not sure what the acceptance tests complain about. And the failing integration tests are caused by #16035

Lets do this and we fix stuff if it does boom

@rullzer
rullzer merged commit 8f650fe into masterApr 21, 2020
@rullzer
rullzer deleted the techdebt/noid/allow-some-apps-to-have-root-urls branch April 21, 2020 14:00
@danxuliu

Copy link
Copy Markdown
Member

Not sure what the acceptance tests complain about

The app-comments can be ignored, they are caused by a regression in the sidebar. The others are legit; for some reason with this pull request the Apps app and the Users app show a blank page (and in 8f650fe^ they work fine).

@rullzer

Copy link
Copy Markdown
Member

Not sure what the acceptance tests complain about

The app-comments can be ignored, they are caused by a regression in the sidebar. The others are legit; for some reason with this pull request the Apps app and the Users app show a blank page (and in 8f650fe^ they work fine).

which apps?

@rullzer

Copy link
Copy Markdown
Member

aah the apps and user page
mmm indeed.... so I ahve a crude fix ut this seems to break js...

@rullzerrullzer mentioned this pull request Apr 21, 2020
joshtrichards added a commit that referenced this pull request Aug 4, 2025
No longer needed from what I can tell since #20114 & nextcloud/spreed#3134
Signed-off-by: Josh <josh.t.richards@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishtechnical debt🧱 🤔🚀

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@nickvergessen@skjnldsv@rullzer@danxuliu@ChristophWurst