Cleanup and do not list current user shares in getShares too

[skjnldsv]

• getSharesInDir was properly excluding shares where shared_with was the current user (returns reshares in API #14605) but we were missing the check in getShares too
• Added more comments on the code
• Cleanup and move duplicate code into one function

I could use some help on the tests :)

[skjnldsv]

Same here everyone, please let's get this in so I can continue the sharing revamp!

[ChristophWurst]

🐘

[danxuliu]

There are several failing tests, not ready to release yet. I will take a look.

[danxuliu]

Sorry, it took me way longer than expected :-(

I have added more unit and integration tests, split the fixes and the refactorings, did some minor cleanups and fixed the pending issues (I hope :-P ).

@skjnldsv I moved if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $path)) { back to its original position because in the previous code it was called after if ($share->getSharedWith() === $this->currentUser) {, and given that getShareWith() is checked too in shareProviderResharingRights() that might change the behaviour (although no test was affected, and I was not able to make a test that caused a behaviour change... so if you changed it for some specific reason please provide a test that shows it :-) ).

I have also added some integration tests in a last commit that show the current behaviour in some strange scenarios. After working on this so much time I no longer know what works as expected or not... so I just document it and I let others decide for me :-P And if the tests themselves do not make sense either just drop the last commit; I sense a bug (not from this pull request, but coming already from the previous code) lurking around in the code that returns a reduced set of shares when there are not enough resharing rights, but as much as I tried I could not find it. So maybe everything is just fine :-P

[skjnldsv]

so if you changed it for some specific reason please provide a test that shows it

Argh, I cannot recall! :(
I think aside from cleaning the code and not showing your own shares in the getShares function, that was all this pr was about.

The issue I noticed was on the new sidebar, when listing the shares of a shared-with-me folder, I could also see the share that made the folder available to me.
Not sure if that's really clear.
But to sums it up, if userA share a folder with resharing rights to userB, and then as userB I open the folder, I see all the shares that userA shared with others on this folder. Since I'm userB, I should not see the initial userA->userB share, I can still unshare it from the files list (instead of delte, that's how we do it).

I have added more unit and integration tests, split the fixes and the refactorings, did some minor cleanups and fixed the pending issues (I hope :-P ).

That's is an incredible work!!
Thanks a lot Daniel!!! 🤗 ❤️

[skjnldsv]

After working on this so much time I no longer know what works as expected or not

that is the issue here.
That's why I split my 4 previous pr into 4 because it's so complicated! :O

did some minor cleanups and fixed the pending issues (I hope :-P ).

So far:

--- Failed scenarios:
699 |  
700 | /drone/src/build/integration/sharing_features/sharing-v1.feature:308
701

EDIT: fixed 🚀

[skjnldsv]

Failed integration test now passes.
Acceptances failures are timeouts and were passing on the previous one

[Composer\Downloader\TransportException]
The "https://packagist.org/p/provider-2015%24388aba92c0dcf5c49c5ef6281aee51336f0df71b3d6a4111efbe8558d462bb03.json" file could not be downloaded (HTTP/1.1 404 Not Found)

🚀