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

Bugfix: Pass remote share id and shared secret in OCM call #3852

Merged
merged 18 commits into from
May 10, 2023

Conversation

michielbdejong
Copy link
Contributor

In internal/grpc/services/ocmshareprovider/ocmshareprovider.go, pass share.Token as SharedSecret inside the WebDAV protocol details, and use the remote id as the resource id.

This PR also adds some debug messages.

@update-docs
Copy link

update-docs bot commented May 8, 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.

@michielbdejong
Copy link
Contributor Author

Let's call it ProviderID and then add it here as well:

ResourceID string `json:"resourceId" validate:"required"` // unique identifier of the resource at provider side

@michielbdejong
Copy link
Contributor Author

In

ResourceId: req.ResourceID,
it passes into CS3APIs

@michielbdejong
Copy link
Contributor Author

@michielbdejong
Copy link
Contributor Author

And also in ocm.ReceivedShare

share, err := s.repo.StoreReceivedShare(ctx, &ocm.ReceivedShare{

@michielbdejong
Copy link
Contributor Author

As discussed in the Zoom call now, @gmgigi96 will update this PR so that is uses provider_id instead of resource_id at all levels and layers it passes through.

@gmgigi96
Copy link
Member

gmgigi96 commented May 8, 2023

@michielbdejong @glpatcern I have pushed my changes, can you review?
In particular, Michiel, can you fix the tests for the nextcloud driver?

@gmgigi96
Copy link
Member

gmgigi96 commented May 8, 2023

I have opened cs3org/cs3apis#209 for the needed changes in the CS3APIs

@michielbdejong
Copy link
Contributor Author

@gmgigi96 cs3org/cs3apis#209 is merged so you can revert 7e55510 right?

This reverts commit c466de2.
@michielbdejong michielbdejong changed the title Pass remote id and sharedSecret in OCM call Bugfix: Pass remote share id and shared secret in OCM call May 10, 2023
@michielbdejong michielbdejong requested a review from a team as a code owner May 10, 2023 07:05
gmgigi96
gmgigi96 previously approved these changes May 10, 2023
@gmgigi96 gmgigi96 merged commit 51ceae0 into master May 10, 2023
gmgigi96 added a commit to gmgigi96/reva that referenced this pull request Jun 5, 2023
Co-authored-by: Gianmaria Del Monte <g.macmount@gmail.com>
gmgigi96 added a commit to gmgigi96/reva that referenced this pull request Jun 28, 2023
Co-authored-by: Gianmaria Del Monte <g.macmount@gmail.com>
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.

None yet

3 participants