[stable10] User IUserSession in Share20OcsController ctor#34696
[stable10] User IUserSession in Share20OcsController ctor#34696phil-davis wants to merge 3 commits into
Conversation
Codecov Report
@@ Coverage Diff @@
## stable10 #34696 +/- ##
===============================================
- Coverage 64% 45.03% -18.98%
===============================================
Files 1276 116 -1160
Lines 75801 11465 -64336
Branches 1291 1291
===============================================
- Hits 48515 5163 -43352
+ Misses 26907 5923 -20984
Partials 379 379
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## stable10 #34696 +/- ##
==============================================
- Coverage 65.17% 64% -1.17%
- Complexity 19244 19256 +12
==============================================
Files 1212 1276 +64
Lines 68476 75834 +7358
Branches 0 1291 +1291
==============================================
+ Hits 44627 48540 +3913
- Misses 23849 26915 +3066
- Partials 0 379 +379
Continue to review full report at Codecov.
|
fd1057c to
39122b9
Compare
DeepDiver1975
left a comment
There was a problem hiding this comment.
ocsPUTAuth.feature seems to be missing - https://github.com/owncloud/core/pull/34622/files#diff-960259729d5ea049d7dccedc7accf2e9R14
In |
or remove these changes to aa9f637#diff-910e48efa188d7af32364e0de3db5a2b - they are not necessary because the IUser in ctor issue only allies to controllers .... |
|
The backport was not easy. So I have probably made some errors, or stuff needs to be implemented differently in Or @DeepDiver1975 do you want to start from the beginning and do the cherry-pick backport yourself. Then you will see the conflicts and maybe resolve them much more easily than me. |
4ae4c1f to
370e159
Compare
Properly handle unauthorised response in OCSController implementations 401/Unauthorized in DAV responses requires CORS headers as well Handle accept and decline of invalid share id Unit tests for accept and decline of invalid share id Adjust unauthorized tests for ocs sharing api
370e159 to
3a039f8
Compare
|
let's see how far we get: #34786 |
|
Closing in favor of PR #34786 - it sorts this out and passes CI |
Backport #34622
Note: there were various conflicts to resolve when backporting this. Many of them were just in lines that replaced
currentUserwithuserSession->getUser()because lines at or around those points also had older code instable10with stuff like\OCP\Share::STATE_ACCEPTEDPoints of note were:
apps/files_sharing/lib/AppInfo/Application.phphad code changes in a block that does not exist instable10so that file is not backported.apps/files_sharing/tests/Controller/Share20OcsControllerTest.phpbackports toapps/files_sharing/tests/API/Share20OcsTest.php(git knew that!)tests/acceptance/features/apiAuth/ocsPUTAuth.featurealready had the "new" test scenario examples instable10(hmm, why was that?)