Skip to content

Commit b1c51a3

Browse files
authored
Merge pull request #10781 from 2403905/issue-10739
The graph drives invite response now includes the createdDateTime field
2 parents 86b1138 + 6b3a497 commit b1c51a3

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Bugfix: Share creation date is missing in invite response
2+
3+
The graph drives invite response now includes the `createdDateTime` field.
4+
5+
https://github.com/owncloud/ocis/pull/10780
6+
https://github.com/owncloud/ocis/issues/10739

services/graph/pkg/service/v0/api_driveitem_permissions.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId *sto
143143

144144
var shareid string
145145
var expiration *types.Timestamp
146+
var cTime *types.Timestamp
146147
switch driveRecipient.GetLibreGraphRecipientType() {
147148
case "group":
148149
group, err := s.identityCache.GetGroup(ctx, objectID)
@@ -166,6 +167,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId *sto
166167
return libregraph.Permission{}, err
167168
}
168169
shareid = createShareResponse.GetShare().GetId().GetOpaqueId()
170+
cTime = createShareResponse.GetShare().GetCtime()
169171
expiration = createShareResponse.GetShare().GetExpiration()
170172
default:
171173
user, err := s.identityCache.GetUser(ctx, objectID)
@@ -209,6 +211,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId *sto
209211
return libregraph.Permission{}, err
210212
}
211213
shareid = createShareResponse.GetShare().GetId().GetOpaqueId()
214+
cTime = createShareResponse.GetShare().GetCtime()
212215
expiration = createShareResponse.GetShare().GetExpiration()
213216
} else {
214217
createShareRequest := createShareRequestToUser(user, statResponse.GetInfo(), cs3ResourcePermissions)
@@ -221,6 +224,7 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId *sto
221224
return libregraph.Permission{}, err
222225
}
223226
shareid = createShareResponse.GetShare().GetId().GetOpaqueId()
227+
cTime = createShareResponse.GetShare().GetCtime()
224228
expiration = createShareResponse.GetShare().GetExpiration()
225229
}
226230

@@ -238,6 +242,11 @@ func (s DriveItemPermissionsService) Invite(ctx context.Context, resourceId *sto
238242
permission.SetExpirationDateTime(utils.TSToTime(expiration))
239243
}
240244

245+
// set cTime
246+
if cTime != nil {
247+
permission.SetCreatedDateTime(cs3TimestampToTime(cTime))
248+
}
249+
241250
if user, ok := revactx.ContextGetUser(ctx); ok {
242251
identity, err := userIdToIdentity(ctx, s.identityCache, user.GetId().GetOpaqueId())
243252
if err != nil {

0 commit comments

Comments
 (0)