Merge pull request #4645 from kobergj/RemoveLinkItemID

LinkRemoved ItemID
cs3org · Apr 19, 2024 · 8a636c8 · 8a636c8
2 parents f30ce62 + e488d26
commit 8a636c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/changelog/unreleased/linkremoved-itemid.md b/changelog/unreleased/linkremoved-itemid.md
@@ -0,0 +1,5 @@
+Enhancement: Add ItemID to LinkRemoved
+
+Add itemID to linkremoved response and event
+
+https://github.com/cs3org/reva/pull/4645
diff --git a/internal/grpc/interceptors/eventsmiddleware/conversion.go b/internal/grpc/interceptors/eventsmiddleware/conversion.go
@@ -179,11 +179,14 @@ func LinkAccessFailed(r *link.GetPublicShareByTokenResponse, req *link.GetPublic
 
 // LinkRemoved converts the response to an event
 func LinkRemoved(r *link.RemovePublicShareResponse, req *link.RemovePublicShareRequest, executant *user.UserId) events.LinkRemoved {
+	var rid *provider.ResourceId
+	_ = utils.ReadJSONFromOpaque(r.Opaque, "resourceid", &rid)
 	return events.LinkRemoved{
 		Executant:  executant,
 		ShareID:    req.Ref.GetId(),
 		ShareToken: req.Ref.GetToken(),
 		Timestamp:  utils.TSNow(),
+		ItemID:     rid,
 	}
 }
 

diff --git a/internal/grpc/services/publicshareprovider/publicshareprovider.go b/internal/grpc/services/publicshareprovider/publicshareprovider.go
@@ -372,6 +372,7 @@ func (s *service) RemovePublicShare(ctx context.Context, req *link.RemovePublicS
 		}, err
 	}
 	return &link.RemovePublicShareResponse{
+		Opaque: utils.AppendJSONToOpaque(nil, "resourceid", ps.GetResourceId()),
 		Status: status.NewOK(ctx),
 	}, nil
 }

diff --git a/pkg/events/sharing.go b/pkg/events/sharing.go
@@ -223,6 +223,7 @@ type LinkRemoved struct {
 	ShareID    *link.PublicShareId
 	ShareToken string
 	Timestamp  *types.Timestamp
+	ItemID     *provider.ResourceId
 }
 
 // Unmarshal to fulfill umarshaller interface
-Original file line number
+Diff line change
@@ Expand Up @@
     		}, err
     	}
     	return &link.RemovePublicShareResponse{
+    		Opaque: utils.AppendJSONToOpaque(nil, "resourceid", ps.GetResourceId()),
     		Status: status.NewOK(ctx),
     	}, nil
     }
@@ Expand Down @@