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

Jump to bottom

Fix legacy DAV endpoint #2712

Merged
merged 2 commits into from Jan 2, 2017
Merged

Fix legacy DAV endpoint #2712

merged 2 commits into from Jan 2, 2017

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Dec 16, 2016

Master forward port of #2685

@rullzer rullzer added this to the Nextcloud 12.0 milestone Dec 16, 2016
@rullzer
Copy link
Member Author

rullzer commented Dec 16, 2016

@pbek mind to give the the one against master a quick test as well?

@pbek
Copy link
Member

pbek commented Dec 16, 2016

You mean master-2648? I can do that tomorrow.

@rullzer
Copy link
Member Author

rullzer commented Dec 16, 2016

You mean master-2648? I can do that tomorrow.

yep! Thanks a lot!

@pbek
Copy link
Member

pbek commented Dec 17, 2016

@rullzer, I terribly sorry! On master-2648 GET works, PUT throws

<?xml version="1.0" encoding="utf-8"?>
<d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
    <s:sabredav-version>3.2.0</s:sabredav-version>
    <s:exception>Sabre\DAV\Exception\NotFound</s:exception>
    <s:message>File not found: groups in 'principals'</s:message>
</d:error>

[Sat Dec 17 10:06:04 2016] 127.0.0.1:57720 [200]: /remote.php/caldav/calendars/admin/admin-test/ownCloud-48x0fj081ahtxyn5tdwv6j38frc6787302w69b2re4wrhkw3ik9.ics
[Sat Dec 17 10:06:11 2016] 127.0.0.1:57738 [404]: /remote.php/caldav/calendars/admin/admin-test/ownCloud-48x0fj081ahtxyn5tdwv6j38frc6787302w69b2re4wrhkw3ik9.ics

@rullzer
Copy link
Member Author

rullzer commented Dec 17, 2016

:S I don't get that. master and stable11 are not that far diverged :S...

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 22, 2016
@MorrisJobke
Copy link
Member

@rullzer Merge conflicts

LukasReschke and others added 2 commits January 2, 2017 15:02
@LukasReschke @rullzer
Add test execution against legacy DAV backend
3c34b85 
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Fix legacy caldav endpoints
db3c918 
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Copy link
Member Author

rullzer commented Jan 2, 2017

Rebased.

@LukasReschke I vote to get this in. The tests pass now. We still need to debug the issue of @pbek but lets not keep master without tests because we don't fix everything.

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Jan 2, 2017
@codecov-io
Copy link

Current coverage is 54.09% (diff: 63.15%)

Merging #2712 into master will increase coverage by <.01%

@@             master      #2712   diff @@
==========================================
  Files          1304       1304          
  Lines         80542      80540     -2   
  Methods        7981       7980     -1   
  Messages          0          0          
  Branches       1243       1243          
==========================================
+ Hits          43563      43565     +2   
+ Misses        36979      36975     -4   
  Partials          0          0
Diff Coverage File Path
0% apps/dav/appinfo/v1/caldav.php
0% apps/dav/lib/Connector/LegacyDAVACL.php
0% apps/dav/appinfo/v1/carddav.php
••••• 50% apps/dav/lib/CalDAV/Activity/Backend.php
•••••••• 84% apps/dav/lib/CalDAV/CalDavBackend.php

Powered by Codecov. Last update 60a8a1a...db3c918

@MorrisJobke MorrisJobke merged commit 9e32885 into master Jan 2, 2017
@MorrisJobke MorrisJobke deleted the master-2648 branch January 2, 2017 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@LukasReschke LukasReschke LukasReschke approved these changes

@pbek pbek Awaiting requested review from pbek

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: dav
Projects
None yet
Milestone
Nextcloud 12.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rullzer @pbek @MorrisJobke @codecov-io @LukasReschke