sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graph sharing: Avoid usage for deprecated CS3 Request attributes

Browse Source 
The sharereference attribute in the CS3 UpdateShareRequest is deprecated.
Set the shareid via the Share.ID attribute.
This commit is contained in:
Ralf Haferkamp
2023-12-15 14:48:54 +01:00
committed by Michael Barz
parent ff0bc0e602
commit 419619041b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/graph/pkg/service/v0/driveitems.go
+3 -6
View File
@@ -800,14 +800,11 @@ func (g Graph) updateUserShare(ctx context.Context, permissionID string, oldPerm
}
cs3UpdateShareReq := &collaboration.UpdateShareRequest{
Ref: &collaboration.ShareReference{
Spec: &collaboration.ShareReference_Id{
Id: &collaboration.ShareId{
OpaqueId: permissionID,
},
Share: &collaboration.Share{
Id: &collaboration.ShareId{
OpaqueId: permissionID,
},
},
Share: &collaboration.Share{},
}
fieldmask := []string{}
if expiration, ok := newPermission.GetExpirationDateTimeOk(); ok {
services/graph/pkg/service/v0/driveitems_test.go
+4 -4
View File
@@ -597,7 +597,7 @@ var _ = Describe("Driveitems", func() {
updateShareMock := gatewayClient.On("UpdateShare",
mock.Anything,
mock.MatchedBy(func(req *collaboration.UpdateShareRequest) bool {
if req.GetRef().GetId().GetOpaqueId() == "permissionid" {
if req.GetShare().GetId().GetOpaqueId() == "permissionid" {
return expiration.Equal(utils.TSToTime(req.GetShare().GetExpiration()))
}
return false
@@ -628,7 +628,7 @@ var _ = Describe("Driveitems", func() {
updateShareMock := gatewayClient.On("UpdateShare",
mock.Anything,
mock.MatchedBy(func(req *collaboration.UpdateShareRequest) bool {
if req.GetRef().GetId().GetOpaqueId() == "permissionid" {
if req.GetShare().GetId().GetOpaqueId() == "permissionid" {
return true
}
return false
@@ -659,7 +659,7 @@ var _ = Describe("Driveitems", func() {
updateShareMock := gatewayClient.On("UpdateShare",
mock.Anything,
mock.MatchedBy(func(req *collaboration.UpdateShareRequest) bool {
return req.GetRef().GetId().GetOpaqueId() == "permissionid"
return req.GetShare().GetId().GetOpaqueId() == "permissionid"
}),
)
updateShareMock.Return(updateShareMockResponse, nil)
@@ -687,7 +687,7 @@ var _ = Describe("Driveitems", func() {
updateShareMock := gatewayClient.On("UpdateShare",
mock.Anything,
mock.MatchedBy(func(req *collaboration.UpdateShareRequest) bool {
return req.GetRef().GetId().GetOpaqueId() == "permissionid"
return req.GetShare().GetId().GetOpaqueId() == "permissionid"
}),
)
updateShareMockResponse.Share.Permissions = &collaboration.SharePermissions{