π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Return sharee metadata when fetching a shared collection
Yugi0d0eac6d6f45
diff --git a/server/pkg/controller/collections/shared_sync_test.go b/server/pkg/controller/collections/shared_sync_test.goindex 5ffc76b20f..8263997307 100644--- a/server/pkg/controller/collections/shared_sync_test.go+++ b/server/pkg/controller/collections/shared_sync_test.go@@ -196,3 +196,48 @@ func TestUnshareEmitsOneRedactedTombstone(t *testing.T) {t.Fatalf("GetDiffV2() error = %v, want sql.ErrNoRows", err)}}++func TestSharingDetailsIncludeShareeMetadata(t *testing.T) {+ db, collectionRepo, ownerID, shareeID := setupCollectionShareTest(t)+ collectionID := createShareTestCollection(t, collectionRepo, ownerID)+ addShareTestShare(t, collectionRepo, collectionID, ownerID, shareeID, ente.VIEWER)++ sharedMetadata := ente.MagicMetadata{+ Version: 2,+ Count: 1,+ Data: "sharee-metadata",+ Header: "sharee-header",+ }+ if _, err := db.Exec(+ `UPDATE collection_shares SET magic_metadata = $1, shared_at = 5+ WHERE collection_id = $2 AND to_user_id = $3`,+ sharedMetadata,+ collectionID,+ shareeID,+ ); err != nil {+ t.Fatal(err)+ }+ collection, err := collectionRepo.Get(collectionID)+ if err != nil {+ t.Fatal(err)+ }++ shareeView, err := collectionRepo.WithSharingDetailsForUser(collection, shareeID)+ if err != nil {+ t.Fatal(err)+ }+ if shareeView.SharedMagicMetadata == nil || *shareeView.SharedMagicMetadata != sharedMetadata {+ t.Fatalf("sharee metadata = %+v, want %+v", shareeView.SharedMagicMetadata, sharedMetadata)+ }+ if shareeView.SharedAt == nil || *shareeView.SharedAt != 5 {+ t.Fatalf("sharee sharedAt missing or wrong, want 5")+ }++ ownerView, err := collectionRepo.WithSharingDetailsForUser(collection, ownerID)+ if err != nil {+ t.Fatal(err)+ }+ if ownerView.SharedMagicMetadata != nil || ownerView.SharedAt != nil {+ t.Fatalf("owner view has sharee fields: metadata = %+v", ownerView.SharedMagicMetadata)+ }+}diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.goindex f3456aaa16..847e9eda81 100644--- a/server/pkg/repo/collection.go+++ b/server/pkg/repo/collection.go@@ -117,8 +117,9 @@ func (repo *CollectionRepository) WithSharingDetailsForUser(c ente.Collection, a}if actorUserID != c.Owner.ID {var encryptedKey sql.NullString- err := repo.DB.QueryRow(`SELECT encrypted_key FROM collection_shares WHERE collection_id = $1 AND to_user_id = $2 AND is_deleted = $3`,- c.ID, actorUserID, false).Scan(&encryptedKey)+ var sharedAt sql.NullInt64+ err := repo.DB.QueryRow(`SELECT encrypted_key, magic_metadata, shared_at FROM collection_shares WHERE collection_id = $1 AND to_user_id = $2 AND is_deleted = $3`,+ c.ID, actorUserID, false).Scan(&encryptedKey, &c.SharedMagicMetadata, &sharedAt)if err != nil {return ente.Collection{}, stacktrace.Propagate(err, "failed to fetch sharee encrypted key")}@@ -126,6 +127,9 @@ func (repo *CollectionRepository) WithSharingDetailsForUser(c ente.Collection, areturn ente.Collection{}, stacktrace.Propagate(fmt.Errorf("share key missing for user %d collection %d", actorUserID, c.ID), "")}c.EncryptedKey = encryptedKey.String+ if sharedAt.Valid {+ c.SharedAt = &sharedAt.Int64+ }}return c, nil}