Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move files_sharing to IBootStrap #28314

Merged
merged 5 commits into from
Oct 20, 2021
Merged

move files_sharing to IBootStrap #28314

merged 5 commits into from
Oct 20, 2021

Conversation

icewind1991
Copy link
Member

reduce debug log spam

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Aug 4, 2021
@icewind1991 icewind1991 added this to the Nextcloud 23 milestone Aug 4, 2021
@PVince81
Copy link
Member

PVince81 commented Aug 10, 2021

  • BUG: extra nav item

image

@PVince81
Copy link
Member

PVince81 commented Aug 10, 2021

  • BUG: missing sharing section on the left sidebar

image

@icewind1991 can you do a bit more thorough testing ? this is especially important when refactoring such deep bits of code
ideal would be to list the test cases also as checkboxes so we don't retest the same things when reviewing

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 10, 2021
@icewind1991
Copy link
Member Author

Sorry, I didn't notice because the "missing image" in the navbar just shows as transparent for me, so unless I hover over the topbar the extra nav item is invisible.

Fixed.

@icewind1991 icewind1991 added 3. to review Waiting for reviews 2. developing Work in progress and removed 2. developing Work in progress 3. to review Waiting for reviews labels Aug 12, 2021
@icewind1991 icewind1991 force-pushed the sharing-ibootstrap branch 2 times, most recently from 53c4e50 to 373b0ef Compare August 12, 2021 12:22
@icewind1991 icewind1991 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 12, 2021
@PVince81
Copy link
Member

PVince81 commented Aug 13, 2021

  • BUG: receiving federated shares not working:
{"reqId":"TUy7L6N0SWenYRoywbhh","level":3,"time":"2021-08-13T10:00:29+00:00","remoteAddr":"127.0.0.1","user":"--","app":"index","method":"POST","url":"/index.php/ocm/shares","message":"Argument 11 passed to OCA\\Files_Sharing\\External\\Manager::__construct() must implement interface OCP\\IUserSession, string given, called in /srv/www/htdocs/server/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php on line 255","userAgent":"Nextcloud Server Crawler","version":"23.0.0.0","exception":{"Exception":"Exception","Message":"Argument 11 passed to OCA\\Files_Sharing\\External\\Manager::__construct() must implement interface OCP\\IUserSession, string given, called in /srv/www/htdocs/server/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php on line 255","Code":0,"Trace":[{"file":"/srv/www/htdocs/server/lib/private/AppFramework/App.php","line":157,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->","args":[{"__class__":"OCA\\CloudFederationAPI\\Controller\\RequestHandlerController"},"addShare"]},{"file":"/srv/www/htdocs/server/lib/private/Route/Router.php","line":301,"function":"main","class":"OC\\AppFramework\\App","type":"::","args":["OCA\\CloudFederationAPI\\Controller\\RequestHandlerController","addShare",{"__class__":"OC\\AppFramework\\DependencyInjection\\DIContainer"},{"_route":"cloud_federation_api.RequestHandler.addShare"}]},{"file":"/srv/www/htdocs/server/lib/base.php","line":1000,"function":"match","class":"OC\\Route\\Router","type":"->","args":["/ocm/shares"]},{"file":"/srv/www/htdocs/server/index.php","line":36,"function":"handleRequest","class":"OC","type":"::","args":[]}],"File":"/srv/www/htdocs/server/lib/private/AppFramework/Http/Dispatcher.php","Line":158,"Previous":{"Exception":"TypeError","Message":"Argument 11 passed to OCA\\Files_Sharing\\External\\Manager::__construct() must implement interface OCP\\IUserSession, string given, called in /srv/www/htdocs/server/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php on line 255","Code":0,"Trace":[{"file":"/srv/www/htdocs/server/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php","line":255,"function":"__construct","class":"OCA\\Files_Sharing\\External\\Manager","type":"->","args":[{"__class__":"OC\\DB\\ConnectionAdapter"},{"__class__":"OC\\Files\\Mount\\Manager"},{"__class__":"OC\\Files\\Storage\\StorageFactory"},{"__class__":"OC\\Http\\Client\\ClientService"},{"__class__":"OC\\Notification\\Manager"},{"__class__":"OC\\OCS\\DiscoveryService"},{"__class__":"OC\\Federation\\CloudFederationProviderManager"},{"__class__":"OC\\Federation\\CloudFederationFactory"},{"__class__":"OC\\Group\\Manager"},{"__class__":"OC\\User\\Manager"},"admin",{"__class__":"OC\\EventDispatcher\\EventDispatcher"},{"__class__":"OC\\Log\\PsrLoggerAdapter"}]},{"file":"/srv/www/htdocs/server/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php","line":190,"function":"shareReceived","class":"OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles","type":"->","args":[{"__class__":"OC\\Federation\\CloudFederationShare"}]},{"file":"/srv/www/htdocs/server/lib/private/AppFramework/Http/Dispatcher.php","line":217,"function":"addShare","class":"OCA\\CloudFederationAPI\\Controller\\RequestHandlerController","type":"->","args":["admin","abc","",7,"admin@https://vvortex-release.local/","admin","admin@https://vvortex-release.local/","admin",{"name":"webdav","options":{"sharedSecret":"cXJh8glnZvcYufd","permissions":"{http://open-cloud-mesh.org/ns}share-permissions"}},"user","file"]},{"file":"/srv/www/htdocs/server/lib/private/AppFramework/Http/Dispatcher.php","line":126,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->","args":[{"__class__":"OCA\\CloudFederationAPI\\Controller\\RequestHandlerController"},"addShare"]},{"file":"/srv/www/htdocs/server/lib/private/AppFramework/App.php","line":157,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->","args":[{"__class__":"OCA\\CloudFederationAPI\\Controller\\RequestHandlerController"},"addShare"]},{"file":"/srv/www/htdocs/server/lib/private/Route/Router.php","line":301,"function":"main","class":"OC\\AppFramework\\App","type":"::","args":["OCA\\CloudFederationAPI\\Controller\\RequestHandlerController","addShare",{"__class__":"OC\\AppFramework\\DependencyInjection\\DIContainer"},{"_route":"cloud_federation_api.RequestHandler.addShare"}]},{"file":"/srv/www/htdocs/server/lib/base.php","line":1000,"function":"match","class":"OC\\Route\\Router","type":"->","args":["/ocm/shares"]},{"file":"/srv/www/htdocs/server/index.php","line":36,"function":"handleRequest","class":"OC","type":"::","args":[]}],"File":"/srv/www/htdocs/server/apps/files_sharing/lib/External/Manager.php","Line":100},"CustomMessage":"--"}}

This error doesn't appear on master.

@icewind1991
Copy link
Member Author

forgot that external sharing is semi-split between 2 apps, fixed now (and improved my dev setup to allow for easier federated sharing testing)

@PVince81
Copy link
Member

forgot that external sharing is semi-split between 2 apps, fixed now (and improved my dev setup to allow for easier federated sharing testing)

indeed. my trick is to always pick a convoluted test scenario that is connected to the topic and is likely to break 😉

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

I've tested a few scenarios like federated shares, federated group shares, link share, group share and user share, all seemed fine now 👍

Can you also add the missing return types in the code parts you have touched ? (see code scanner comments in the PR diff)

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 16, 2021
@skjnldsv
Copy link
Member

/drone/src/tests/acceptance/features/app-files-sharing.feature:249

Is failing. php:cs too :)

@PVince81
Copy link
Member

@icewind1991 please fix with cs:fix

@blizzz
Copy link
Member

blizzz commented Aug 24, 2021

🏓

@szaimen
Copy link
Contributor

szaimen commented Aug 31, 2021

CI is failing

@szaimen szaimen added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Aug 31, 2021
@skjnldsv skjnldsv mentioned this pull request Oct 13, 2021
@skjnldsv
Copy link
Member

does not see resharing option for a folder if resharing is disabled in the settings after the share is created # /drone/src/tests/acceptance/features/app-files-sharing.feature:249
--
337 | Given I am logged in as the admin                                                                                             # LoginPageContext::iAmLoggedInAsTheAdmin()
338 | And I create a new folder named "Shared folder"                                                                               # FileListContext::iCreateANewFolderNamed()
339 | │ Create menu button in file list could not be clicked
340 | │ Exception message: element not interactable
341 | │   (Session info: chrome=90.0.4430.85)
342 | │   (Driver info: chromedriver=90.0.4430.24 (4c6d850f087da467d926e8eddb76550aed655991-refs/branch-heads/4430@{#429}),platform=Linux 4.15.0-124-generic x86_64)
343 | │ Trying again
344 | │

Seems unrelated

@skjnldsv
Copy link
Member

Lint / php-cs check (pull_request) Failing after 1m — php-cs check

this is needed though

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Oct 19, 2021
@ChristophWurst ChristophWurst merged commit 1021c89 into master Oct 20, 2021
@ChristophWurst ChristophWurst deleted the sharing-ibootstrap branch October 20, 2021 15:32
@skjnldsv skjnldsv mentioned this pull request Oct 25, 2021
25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: sharing technical debt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants