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

Support OCM v1.0 schema #3757

Merged
merged 2 commits into from
Apr 3, 2023
Merged

Support OCM v1.0 schema #3757

merged 2 commits into from
Apr 3, 2023

Conversation

glpatcern
Copy link
Member

@glpatcern glpatcern commented Mar 28, 2023

Following cs3org/cs3apis#206, we add the fields to ensure backwards compatibility with OCM v1.0.

However, if we receive a request where the protocol.options undocumented object is not empty, we bail out for now. Also, we always send out an empty protocol.options, and use the newly defined properties that (will) come with OCM v1.1. This is reflected in the unit tests as well.

Supporting interoperability with existing OCM v1.0 implementations (notably Nextcloud 25) may come in the future once the undocumented options are fully reverse engineered.

Also added viewMode to the webapp protocol and adapted the SQL layer.

@update-docs
Copy link

update-docs bot commented Mar 28, 2023

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@glpatcern glpatcern marked this pull request as draft March 28, 2023 16:32
@glpatcern glpatcern force-pushed the ocm-reconcile branch 3 times, most recently from 423c0a8 to e47f910 Compare March 31, 2023 07:02
@glpatcern glpatcern changed the title Support OCM v1 schema, WIP Support OCM v1.0 schema Mar 31, 2023
@glpatcern glpatcern force-pushed the ocm-reconcile branch 2 times, most recently from 1696e4a to 33fce17 Compare March 31, 2023 08:40
@glpatcern glpatcern marked this pull request as ready for review March 31, 2023 08:41
@glpatcern glpatcern requested a review from a team as a code owner March 31, 2023 08:41
Copy link
Member

@gmgigi96 gmgigi96 left a comment

Choose a reason for hiding this comment

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

Can you also update the init script for creating the webapp table? https://github.com/cs3org/reva/blob/master/pkg/ocm/share/repository/sql/init.sql#L72

internal/http/services/ocmd/protocols.go Outdated Show resolved Hide resolved
@glpatcern glpatcern requested a review from gmgigi96 March 31, 2023 13:28
@glpatcern glpatcern merged commit e2678c2 into cs3org:master Apr 3, 2023
gmgigi96 pushed a commit to gmgigi96/reva that referenced this pull request Jun 5, 2023
* Support OCM v1.0 schema but bail out if the options aren't empty

* Fixes following PR comments
gmgigi96 pushed a commit to gmgigi96/reva that referenced this pull request Jun 28, 2023
* Support OCM v1.0 schema but bail out if the options aren't empty

* Fixes following PR comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants