Skip to content

Commit

Permalink
Send remote share id on OCM share create (#209)
Browse files Browse the repository at this point in the history 
* send remote share id on ocm share create

* Update proto.lock
  • Loading branch information
@gmgigi96
gmgigi96 authored May 8, 2023
1 parent 742abb3 commit f2caf73
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 10 deletions.
5 changes: 4 additions & 1 deletion cs3/sharing/ocm/v1beta1/resources.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ message ReceivedShare {
// Name of the shared resource.
string name = 2;
// REQUIRED.
storage.provider.v1beta1.ResourceId resource_id = 3;
// Identifier to identify the shared resource at the provider side.
// This is unique per provider such that if the same resource is shared twice, this will not be repeated.
// This correspond to the `providerId` in the OCM API specs.
string remote_share_id = 3;
// REQUIRED.
// The receiver of the share, like a user, group ...
storage.provider.v1beta1.Grantee grantee = 4;
Expand Down
165 changes: 156 additions & 9 deletions proto.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2258,6 +2258,11 @@
"in_type": "cs3.sharing.ocm.v1beta1.GetOCMShareRequest",
"out_type": "cs3.sharing.ocm.v1beta1.GetOCMShareResponse"
},
{
"name": "GetOCMShareByToken",
"in_type": "cs3.sharing.ocm.v1beta1.GetOCMShareByTokenRequest",
"out_type": "cs3.sharing.ocm.v1beta1.GetOCMShareByTokenResponse"
},
{
"name": "ListOCMShares",
"in_type": "cs3.sharing.ocm.v1beta1.ListOCMSharesRequest",
Expand Down Expand Up @@ -2373,6 +2378,11 @@
"in_type": "cs3.ocm.invite.v1beta1.GenerateInviteTokenRequest",
"out_type": "cs3.ocm.invite.v1beta1.GenerateInviteTokenResponse"
},
{
"name": "ListInviteTokens",
"in_type": "cs3.ocm.invite.v1beta1.ListInviteTokensRequest",
"out_type": "cs3.ocm.invite.v1beta1.ListInviteTokensResponse"
},
{
"name": "ForwardInvite",
"in_type": "cs3.ocm.invite.v1beta1.ForwardInviteRequest",
Expand Down Expand Up @@ -3553,16 +3563,16 @@
"path": "cs3/identity/user/v1beta1/resources.proto"
},
{
"path": "cs3/storage/provider/v1beta1/resources.proto"
"path": "cs3/rpc/v1beta1/status.proto"
},
{
"path": "cs3/rpc/v1beta1/status.proto"
"path": "cs3/sharing/ocm/v1beta1/resources.proto"
},
{
"path": "cs3/types/v1beta1/types.proto"
"path": "cs3/storage/provider/v1beta1/resources.proto"
},
{
"path": "cs3/sharing/ocm/v1beta1/resources.proto"
"path": "cs3/types/v1beta1/types.proto"
}
],
"package": {
Expand Down Expand Up @@ -3639,6 +3649,25 @@
}
]
},
{
"name": "ListInviteTokensRequest"
},
{
"name": "ListInviteTokensResponse",
"fields": [
{
"id": 1,
"name": "status",
"type": "cs3.rpc.v1beta1.Status"
},
{
"id": 2,
"name": "invite_tokens",
"type": "InviteToken",
"is_repeated": true
}
]
},
{
"name": "ForwardInviteRequest",
"fields": [
Expand Down Expand Up @@ -3820,6 +3849,11 @@
"in_type": "GenerateInviteTokenRequest",
"out_type": "GenerateInviteTokenResponse"
},
{
"name": "ListInviteTokens",
"in_type": "ListInviteTokensRequest",
"out_type": "ListInviteTokensResponse"
},
{
"name": "ForwardInvite",
"in_type": "ForwardInviteRequest",
Expand Down Expand Up @@ -4890,6 +4924,16 @@
"id": 3,
"name": "field",
"type": "UpdateField"
},
{
"id": 4,
"name": "update_mask",
"type": "google.protobuf.FieldMask"
},
{
"id": 5,
"name": "share",
"type": "Share"
}
],
"messages": [
Expand Down Expand Up @@ -5382,6 +5426,11 @@
"id": 8,
"name": "mtime",
"type": "cs3.types.v1beta1.Timestamp"
},
{
"id": 9,
"name": "expiration",
"type": "cs3.types.v1beta1.Timestamp"
}
]
},
Expand Down Expand Up @@ -5472,6 +5521,11 @@
"id": 2,
"name": "permissions",
"type": "SharePermissions"
},
{
"id": 3,
"name": "expiration",
"type": "cs3.types.v1beta1.Timestamp"
}
]
},
Expand Down Expand Up @@ -5591,6 +5645,14 @@
{
"name": "TYPE_DESCRIPTION",
"integer": 5
},
{
"name": "TYPE_NOTIFYUPLOADS",
"integer": 6
},
{
"name": "TYPE_NOTIFYUPLOADSEXTRARECIPIENTS",
"integer": 7
}
]
},
Expand Down Expand Up @@ -5643,6 +5705,16 @@
"id": 5,
"name": "internal",
"type": "bool"
},
{
"id": 6,
"name": "notify_uploads",
"type": "bool"
},
{
"id": 7,
"name": "notify_uploads_extra_recipients",
"type": "string"
}
]
},
Expand Down Expand Up @@ -5708,6 +5780,16 @@
"id": 6,
"name": "description",
"type": "string"
},
{
"id": 7,
"name": "notify_uploads",
"type": "bool"
},
{
"id": 8,
"name": "notify_uploads_extra_recipients",
"type": "string"
}
]
}
Expand Down Expand Up @@ -6109,6 +6191,16 @@
"id": 14,
"name": "description",
"type": "string"
},
{
"id": 15,
"name": "notify_uploads",
"type": "bool"
},
{
"id": 16,
"name": "notify_uploads_extra_recipients",
"type": "string"
}
]
},
Expand Down Expand Up @@ -6539,6 +6631,31 @@
}
]
},
{
"name": "GetOCMShareByTokenRequest",
"fields": [
{
"id": 1,
"name": "token",
"type": "string"
}
]
},
{
"name": "GetOCMShareByTokenResponse",
"fields": [
{
"id": 1,
"name": "status",
"type": "cs3.rpc.v1beta1.Status"
},
{
"id": 2,
"name": "share",
"type": "Share"
}
]
},
{
"name": "ListReceivedOCMSharesRequest",
"fields": [
Expand Down Expand Up @@ -6675,6 +6792,11 @@
"in_type": "GetOCMShareRequest",
"out_type": "GetOCMShareResponse"
},
{
"name": "GetOCMShareByToken",
"in_type": "GetOCMShareByTokenRequest",
"out_type": "GetOCMShareByTokenResponse"
},
{
"name": "ListOCMShares",
"in_type": "ListOCMSharesRequest",
Expand Down Expand Up @@ -6904,8 +7026,8 @@
},
{
"id": 3,
"name": "resource_id",
"type": "storage.provider.v1beta1.ResourceId"
"name": "remote_share_id",
"type": "string"
},
{
"id": 4,
Expand Down Expand Up @@ -6957,6 +7079,11 @@
"id": 13,
"name": "opaque",
"type": "cs3.types.v1beta1.Opaque"
},
{
"id": 14,
"name": "resource_type",
"type": "cs3.storage.provider.v1beta1.ResourceType"
}
]
},
Expand Down Expand Up @@ -7002,6 +7129,11 @@
"id": 2,
"name": "key",
"type": "ShareKey"
},
{
"id": 3,
"name": "token",
"type": "string"
}
]
},
Expand Down Expand Up @@ -7072,6 +7204,11 @@
"id": 1,
"name": "uri_template",
"type": "string"
},
{
"id": 2,
"name": "view_mode",
"type": "cs3.app.provider.v1beta1.ViewMode"
}
]
},
Expand Down Expand Up @@ -7145,6 +7282,9 @@
}
],
"imports": [
{
"path": "cs3/app/provider/v1beta1/resources.proto"
},
{
"path": "cs3/identity/user/v1beta1/resources.proto"
},
Expand All @@ -7153,9 +7293,6 @@
},
{
"path": "cs3/types/v1beta1/types.proto"
},
{
"path": "cs3/app/provider/v1beta1/resources.proto"
}
],
"package": {
Expand Down Expand Up @@ -8553,6 +8690,11 @@
"id": 1,
"name": "opaque",
"type": "cs3.types.v1beta1.Opaque"
},
{
"id": 2,
"name": "quota",
"type": "Quota"
}
]
},
Expand Down Expand Up @@ -9457,6 +9599,11 @@
"id": 3,
"name": "creator",
"type": "cs3.identity.user.v1beta1.UserId"
},
{
"id": 4,
"name": "expiration",
"type": "cs3.types.v1beta1.Timestamp"
}
]
},
Expand Down

0 comments on commit f2caf73

Please sign in to comment.