Hotfix: add sharedby to received files (#277)

core/space/domain/domain.go

@@ -179,7 +179,8 @@ type SharedDirEntry struct {
 	Bucket       string
 	IsPublicLink bool
 	FileInfo
-	Members []Member // XXX: it is duplicated from FileInfo
+	Members  []Member // XXX: it is duplicated from FileInfo
+	SharedBy string
 }
 
 type SearchFileEntry struct {

core/textile/model/model.go

@@ -44,6 +44,7 @@ type Model interface {
 		invitationId string,
 		accepted bool,
 		key []byte,
+		sharedBy string,
 	) (*ReceivedFileSchema, error)
 	CreateReceivedFileViaPublicLink(
 		ctx context.Context,

core/textile/model/received_file.go

@@ -28,6 +28,7 @@ type ReceivedFileViaInvitationSchema struct {
 	InvitationId  string `json:"invitationId"`
 	BucketKey     string `json:"bucketKey"`
 	EncryptionKey []byte `json:"encryptionKey"`
+	SharedBy      string `json:"sharedBy"`
 }
 
 // ReceivedFileSchema represents data of files shared with a user
@@ -55,6 +56,7 @@ func (m *model) CreateReceivedFileViaInvitation(
 	invitationID string,
 	accepted bool,
 	key []byte,
+	inviterPubKey string,
 ) (*ReceivedFileSchema, error) {
 	log.Debug("Model.CreateReceivedFileViaInvitation: Storing received file", "file:"+file.Path)
 	if existingFile, err := m.FindReceivedFile(ctx, file.DbId, file.Bucket, file.Path); err == nil {
@@ -71,6 +73,7 @@ func (m *model) CreateReceivedFileViaInvitation(
 			InvitationId:  invitationID,
 			BucketKey:     file.BucketKey,
 			EncryptionKey: key,
+			SharedBy:      inviterPubKey,
 		},
 		Accepted:  accepted,
 		CreatedAt: time.Now().UnixNano(),

core/textile/sharing.go

@@ -133,7 +133,7 @@ func (tc *textileClient) createReceivedFiles(
 		if accepted {
 			encryptionKeys = invitation.Keys[i]
 		}
-		receivedFile, err := tc.GetModel().CreateReceivedFileViaInvitation(ctx, path, invitation.InvitationID, accepted, encryptionKeys)
+		receivedFile, err := tc.GetModel().CreateReceivedFileViaInvitation(ctx, path, invitation.InvitationID, accepted, encryptionKeys, invitation.InviterPublicKey)
 
 		// compose each create error
 		if err != nil {
@@ -274,6 +274,7 @@ func (tc *textileClient) buildPublicLinkSharedDirEntry(
 		},
 		Members:      []domain.Member{},
 		IsPublicLink: true,
+		SharedBy:     file.SharedBy,
 	}
 
 	return res, nil

grpc/handlers_sharing.go

@@ -110,8 +110,9 @@ func (srv *grpcServer) GetSharedWithMeFiles(ctx context.Context, request *pb.Get
 		}
 
 		dirEntry := &pb.SharedListDirectoryEntry{
-			DbId:   e.DbID,
-			Bucket: e.Bucket,
+			DbId:     e.DbID,
+			Bucket:   e.Bucket,
+			SharedBy: e.SharedBy,
 			Entry: &pb.ListDirectoryEntry{
 				Path:               e.Path,
 				IsDir:              e.IsDir,

grpc/proto/space.proto

@@ -445,6 +445,7 @@ message SharedListDirectoryEntry {
   string dbId = 2;
   string bucket = 3;
   bool isPublicLink = 4;
+  string sharedBy = 5;
 }
 
 message ListDirectoriesResponse {