π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Limit deleted-share tombstone fix to server
Neeraj Gupta06ca38010e90
diff --git a/cli/pkg/mapper/photo.go b/cli/pkg/mapper/photo.goindex 40a06ab7bb..76cb8a398b 100644--- a/cli/pkg/mapper/photo.go+++ b/cli/pkg/mapper/photo.go@@ -5,24 +5,23 @@ import ("encoding/json""errors""fmt"- "log"-"github.com/ente/cli/internal/api"eCrypto "github.com/ente/cli/internal/crypto""github.com/ente/cli/pkg/model""github.com/ente/cli/pkg/model/export""github.com/ente/cli/pkg/secrets""github.com/ente/cli/utils/encoding"+ "log")func MapCollectionToAlbum(ctx context.Context, collection api.Collection, holder *secrets.KeyHolder) (*model.RemoteAlbum, error) {+ var album model.RemoteAlbumuserID := ctx.Value("user_id").(int64)- album := model.RemoteAlbum{- ID: collection.ID,- OwnerID: collection.Owner.ID,- IsShared: collection.Owner.ID != userID,- LastUpdatedAt: collection.UpdationTime,- }+ album.OwnerID = collection.Owner.ID+ album.ID = collection.ID+ album.IsShared = collection.Owner.ID != userID+ album.LastUpdatedAt = collection.UpdationTime+ album.IsDeleted = collection.IsDeletedcollectionKey, err := holder.GetCollectionKey(ctx, collection)if err != nil {return nil, errdiff --git a/cli/pkg/remote_sync.go b/cli/pkg/remote_sync.goindex a6d4ef93c6..9656ae40af 100644--- a/cli/pkg/remote_sync.go+++ b/cli/pkg/remote_sync.go@@ -4,13 +4,12 @@ import ("context""encoding/json""fmt"- "log"- "strconv"- "time"-"github.com/ente/cli/pkg/mapper""github.com/ente/cli/pkg/model""github.com/ente/cli/utils/encoding"+ "log"+ "strconv"+ "time")func (c *ClICtrl) fetchRemoteCollections(ctx context.Context) error {@@ -24,31 +23,16 @@ func (c *ClICtrl) fetchRemoteCollections(ctx context.Context) error {}maxUpdated := lastSyncTimefor _, collection := range collections {- if collection.UpdationTime > maxUpdated {- maxUpdated = collection.UpdationTime+ if lastSyncTime == 0 && collection.IsDeleted {+ continue}-- var album *model.RemoteAlbum- if collection.IsDeleted {- key := []byte(strconv.FormatInt(collection.ID, 10))- existing, err := c.GetValue(ctx, model.RemoteAlbums, key)- if err != nil {- return err- }- album, err = markRemoteAlbumDeleted(existing, collection.ID, collection.UpdationTime)- if err != nil {- return err- }- if album == nil {- continue- }- } else {- album, err = mapper.MapCollectionToAlbum(ctx, collection, c.KeyHolder)- if err != nil {- return err- }+ album, mapErr := mapper.MapCollectionToAlbum(ctx, collection, c.KeyHolder)+ if mapErr != nil {+ return mapErr+ }+ if album.LastUpdatedAt > maxUpdated {+ maxUpdated = album.LastUpdatedAt}-albumJson := encoding.MustMarshalJSON(album)putErr := c.PutValue(ctx, model.RemoteAlbums, []byte(strconv.FormatInt(album.ID, 10)), albumJson)if putErr != nil {@@ -64,22 +48,6 @@ func (c *ClICtrl) fetchRemoteCollections(ctx context.Context) error {return nil}-func markRemoteAlbumDeleted(existing []byte, collectionID, updationTime int64) (*model.RemoteAlbum, error) {- if len(existing) == 0 {- return nil, nil- }- var album model.RemoteAlbum- if err := json.Unmarshal(existing, &album); err != nil {- return nil, err- }- if album.ID != collectionID {- return nil, fmt.Errorf("stored album ID %d does not match tombstone ID %d", album.ID, collectionID)- }- album.IsDeleted = true- album.LastUpdatedAt = updationTime- return &album, nil-}-func (c *ClICtrl) fetchRemoteFiles(ctx context.Context) error {albums, err := c.getRemoteAlbums(ctx)filter := ctx.Value(model.FilterKey).(model.Filter)diff --git a/cli/pkg/remote_sync_test.go b/cli/pkg/remote_sync_test.godeleted file mode 100644index fd75fa9744..0000000000--- a/cli/pkg/remote_sync_test.go+++ /dev/null@@ -1,99 +0,0 @@-package pkg--import (- "context"- "encoding/json"- "net/http"- "net/http/httptest"- "strconv"- "testing"-- "github.com/ente/cli/internal/api"- "github.com/ente/cli/pkg/model"-)--func TestFetchRemoteCollectionsHandlesDeletedCollectionsWithoutDecrypting(t *testing.T) {- var sinceTime string- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {- if r.URL.Path != "/collections/v2" {- http.NotFound(w, r)- return- }- sinceTime = r.URL.Query().Get("sinceTime")- w.Header().Set("Content-Type", "application/json")- _, _ = w.Write([]byte(`{"collections":[{"id":7,"owner":{"id":1},"updationTime":9,"isDeleted":true},{"id":8,"owner":{"id":1},"updationTime":11,"isDeleted":true}]}`))- }))- defer server.Close()-- db, err := GetDB(t.TempDir() + "/cli.db")- if err != nil {- t.Fatal(err)- }- t.Cleanup(func() { _ = db.Close() })-- account := model.Account{UserID: 2, App: api.AppPhotos}- if err := createDataBuckets(db, account); err != nil {- t.Fatal(err)- }- ctx := context.WithValue(context.Background(), "app", string(account.App))- ctx = context.WithValue(ctx, "account_key", account.AccountKey())- ctx = context.WithValue(ctx, "user_id", account.UserID)-- ctrl := ClICtrl{- Client: api.NewClient(api.Params{Host: server.URL}),- DB: db,- // A nil holder proves tombstones never enter key or metadata decryption.- KeyHolder: nil,- }- existing := model.RemoteAlbum{- ID: 7,- OwnerID: 1,- IsShared: true,- AlbumName: "Vacation",- AlbumKey: model.EncString{- CipherText: "local-key",- Nonce: "local-nonce",- },- PrivateMeta: map[string]interface{}{"visibility": float64(1)},- }- existingJSON, err := json.Marshal(&existing)- if err != nil {- t.Fatal(err)- }- if err := ctrl.PutValue(ctx, model.RemoteAlbums, []byte(strconv.FormatInt(existing.ID, 10)), existingJSON); err != nil {- t.Fatal(err)- }- if err := ctrl.PutConfigValue(ctx, model.CollectionsSyncKey, []byte("5")); err != nil {- t.Fatal(err)- }-- if err := ctrl.fetchRemoteCollections(ctx); err != nil {- t.Fatal(err)- }- if sinceTime != "5" {- t.Fatalf("sinceTime = %q, want 5", sinceTime)- }-- stored, err := ctrl.GetValue(ctx, model.RemoteAlbums, []byte("7"))- if err != nil {- t.Fatal(err)- }- var album model.RemoteAlbum- if err := json.Unmarshal(stored, &album); err != nil {- t.Fatal(err)- }- if !album.IsDeleted || album.LastUpdatedAt != 9 || album.AlbumName != existing.AlbumName || album.AlbumKey != existing.AlbumKey || album.PrivateMeta["visibility"] != float64(1) {- t.Fatalf("deleted album lost local export state: %+v", album)- }- unknown, err := ctrl.GetValue(ctx, model.RemoteAlbums, []byte("8"))- if err != nil {- t.Fatal(err)- }- if unknown != nil {- t.Fatalf("unknown tombstone created album: %s", unknown)- }- cursor, err := ctrl.GetInt64ConfigValue(ctx, model.CollectionsSyncKey)- if err != nil || cursor != 11 {- t.Fatalf("cursor = %d, %v; want 11", cursor, err)- }-}diff --git a/mobile/apps/locker/lib/services/collections/collections_api_client.dart b/mobile/apps/locker/lib/services/collections/collections_api_client.dartindex d4c41b861f..abf23f7537 100644--- a/mobile/apps/locker/lib/services/collections/collections_api_client.dart+++ b/mobile/apps/locker/lib/services/collections/collections_api_client.dart@@ -13,7 +13,6 @@ import 'package:locker/core/errors.dart';import "package:locker/events/collections_updated_event.dart";import "package:locker/services/collections/collections_service.dart";import 'package:locker/services/collections/models/collection.dart';-import 'package:locker/services/collections/models/collection_change.dart';import 'package:locker/services/collections/models/collection_file_item.dart';import 'package:locker/services/collections/models/collection_magic.dart';import 'package:locker/services/collections/models/diff.dart';@@ -43,29 +42,21 @@ class CollectionApiClient {_db = LockerDB.instance;}- Future<List<CollectionChange>> getCollections(int sinceTime) async {+ Future<List<Collection>> getCollections(int sinceTime) async {try {final response = await _enteDio.get("/collections/v2",queryParameters: {"sinceTime": sinceTime},);- final List<CollectionChange> changes = [];+ final List<Collection> collections = [];final c = response.data["collections"];for (final collectionData in c) {- if (isSharedCollectionDeletion(collectionData, _config.getUserID()!)) {- changes.add(- CollectionDeletion(- collectionData['id'] as int,- collectionData['updationTime'] as int,- ),- );- } else {- changes.add(- CollectionUpdate(await _fromRemoteCollection(collectionData)),- );- }+ final Collection collection = await _fromRemoteCollection(+ collectionData,+ );+ collections.add(collection);}- return changes;+ return collections;} catch (e, s) {_logger.warning(e, s);if (e is DioException && e.response?.statusCode == 401) {@@ -233,7 +224,7 @@ class CollectionApiClient {}Future<void> _handleCollectionDeletion(Collection collection) async {- await _db.deleteCollection(collection.id);+ await _db.deleteCollection(collection);final deletedCollection = collection.copyWith(isDeleted: true);await _updateCollectionInDB(deletedCollection);}@@ -314,7 +305,7 @@ class CollectionApiClient {"&collectionID=${collection.id}",);if (skipEventFiring) {- await _db.deleteCollection(collection.id);+ await _db.deleteCollection(collection);final deletedCollection = collection.copyWith(isDeleted: true);await _updateCollectionInDB(deletedCollection);} else {diff --git a/mobile/apps/locker/lib/services/collections/collections_service.dart b/mobile/apps/locker/lib/services/collections/collections_service.dartindex 24f0287c31..eceee2cd47 100644--- a/mobile/apps/locker/lib/services/collections/collections_service.dart+++ b/mobile/apps/locker/lib/services/collections/collections_service.dart@@ -17,7 +17,6 @@ import 'package:locker/events/collections_updated_event.dart';import 'package:locker/events/user_details_refresh_event.dart';import "package:locker/services/collections/collections_api_client.dart";import 'package:locker/services/collections/models/collection.dart';-import 'package:locker/services/collections/models/collection_change.dart';import "package:locker/services/collections/models/files_split.dart";import "package:locker/services/collections/models/public_url.dart";import 'package:locker/services/configuration.dart';@@ -80,10 +79,9 @@ class CollectionService {final previousSyncTime = _db.getSyncTime();final shouldCheckFirstSyncCompletion = previousSyncTime == 0;- final collectionChanges = await CollectionApiClient.instance.getCollections(- previousSyncTime,- );- if (collectionChanges.isEmpty) {+ final updatedCollections = await CollectionApiClient.instance+ .getCollections(previousSyncTime);+ if (updatedCollections.isEmpty) {if (shouldCheckFirstSyncCompletion) {final didMarkFirstSync = await _setFirstSyncCompleted();if (didMarkFirstSync) {@@ -95,29 +93,17 @@ class CollectionService {_logger.info("No collections to sync.");return;}- final persistedCollections = <Collection>[];- var latestUpdationTime = previousSyncTime;- for (final change in collectionChanges) {- latestUpdationTime = max(latestUpdationTime, change.updationTime);- if (change is CollectionDeletion) {- await _db.deleteCollection(change.id);- _collectionIDToCollections.remove(change.id);- continue;- }- final collection = (change as CollectionUpdate).collection;- persistedCollections.add(collection);+ await _db.updateCollections(updatedCollections);+ for (final collection in updatedCollections) {_collectionIDToCollections[collection.id] = collection;}- if (persistedCollections.isNotEmpty) {- await _db.updateCollections(persistedCollections);- }- await _db.setSyncTime(latestUpdationTime);+ await _db.setSyncTime(updatedCollections.last.updationTime);if (shouldCheckFirstSyncCompletion) {await _setFirstSyncCompleted();}final List<Future<bool>> fileFutures = [];- for (final collection in persistedCollections) {+ for (final collection in updatedCollections) {if (collection.isDeleted) {continue;}@@ -157,7 +143,7 @@ class CollectionService {"Skipping offline stale cleanup because one or more collection syncs failed",);}- if (collectionChanges.isNotEmpty) {+ if (updatedCollections.isNotEmpty) {Bus.instance.fire(CollectionsUpdatedEvent('sync'));}}diff --git a/mobile/apps/locker/lib/services/collections/models/collection_change.dart b/mobile/apps/locker/lib/services/collections/models/collection_change.dartdeleted file mode 100644index 0de9908331..0000000000--- a/mobile/apps/locker/lib/services/collections/models/collection_change.dart+++ /dev/null@@ -1,28 +0,0 @@-import 'package:locker/services/collections/models/collection.dart';--sealed class CollectionChange {- const CollectionChange(this.id, this.updationTime);-- final int id;- final int updationTime;-}--final class CollectionUpdate extends CollectionChange {- CollectionUpdate(this.collection)- : super(collection.id, collection.updationTime);-- final Collection collection;-}--final class CollectionDeletion extends CollectionChange {- const CollectionDeletion(super.id, super.updationTime);-}--bool isSharedCollectionDeletion(- Map<String, dynamic> collectionData,- int currentUserID,-) {- final ownerID =- (collectionData['owner'] as Map<String, dynamic>)['id'] as int;- return collectionData['isDeleted'] == true && ownerID != currentUserID;-}diff --git a/mobile/apps/locker/lib/services/db/locker_db.dart b/mobile/apps/locker/lib/services/db/locker_db.dartindex b1855202d7..176b22c6a5 100644--- a/mobile/apps/locker/lib/services/db/locker_db.dart+++ b/mobile/apps/locker/lib/services/db/locker_db.dart@@ -328,21 +328,25 @@ class LockerDB extends EnteBaseDatabase {await batch.commit();}- Future<void> deleteCollection(int collectionID) async {+ Future<void> deleteCollection(Collection collection) async {final batch = _db.batch();- batch.delete(_collectionsTable, where: 'id = ?', whereArgs: [collectionID]);+ batch.delete(+ _collectionsTable,+ where: 'id = ?',+ whereArgs: [collection.id],+ );batch.delete(_collectionFilesTable,where: 'collection_id = ?',- whereArgs: [collectionID],+ whereArgs: [collection.id],);final filesInCollection = await _db.query(_collectionFilesTable,where: 'collection_id = ?',- whereArgs: [collectionID],+ whereArgs: [collection.id],);for (final fileMap in filesInCollection) {@@ -350,7 +354,7 @@ class LockerDB extends EnteBaseDatabase {final otherCollections = await _db.query(_collectionFilesTable,where: 'uploaded_file_id = ? AND collection_id != ?',- whereArgs: [uploadedFileId, collectionID],+ whereArgs: [uploadedFileId, collection.id],);if (otherCollections.isEmpty) {@@ -362,14 +366,7 @@ class LockerDB extends EnteBaseDatabase {}}- batch.delete(- _syncTimesTable,- where: 'key = ?',- whereArgs: ['collection_sync_time_$collectionID'],- );-await batch.commit();- _collectionSyncTimesCache.remove(collectionID);}Future<List<Collection>> getCollections() async {diff --git a/mobile/apps/photos/lib/gateways/collections/collections_gateway.dart b/mobile/apps/photos/lib/gateways/collections/collections_gateway.dartindex b705cb5a45..1ea4f837ca 100644--- a/mobile/apps/photos/lib/gateways/collections/collections_gateway.dart+++ b/mobile/apps/photos/lib/gateways/collections/collections_gateway.dart@@ -1,5 +1,4 @@import "package:dio/dio.dart";-import "package:photos/gateways/collections/models/collection_change.dart";import "package:photos/gateways/collections/models/create_request.dart";import "package:photos/gateways/collections/models/metadata.dart";@@ -96,24 +95,15 @@ class CollectionsGateway {);}- Future<List<RemoteCollectionChange>> getAll({+ Future<Map<String, dynamic>> getAll({required int sinceTime,required String source,- required int currentUserID,}) async {final response = await _enteDio.get("/collections/v2",queryParameters: {"sinceTime": sinceTime, "source": source},);- final collections = response.data['collections'] as List<dynamic>;- return collections- .map(- (data) => RemoteCollectionChange.fromMap(- Map<String, dynamic>.from(data as Map<dynamic, dynamic>),- currentUserID,- ),- )- .toList(growable: false);+ return response.data;}Future<Map<String, dynamic>> fetchPendingRemovalActions() async {diff --git a/mobile/apps/photos/lib/gateways/collections/models/collection_change.dart b/mobile/apps/photos/lib/gateways/collections/models/collection_change.dartdeleted file mode 100644index 7076bf7910..0000000000--- a/mobile/apps/photos/lib/gateways/collections/models/collection_change.dart+++ /dev/null@@ -1,47 +0,0 @@-sealed class RemoteCollectionChange {- const RemoteCollectionChange();-- int get id;- int get updationTime;-- factory RemoteCollectionChange.fromMap(- Map<String, dynamic> map,- int currentUserID,- ) {- final owner = map['owner'] as Map<String, dynamic>;- if (map['isDeleted'] == true && owner['id'] as int != currentUserID) {- return RemoteCollectionDeletion(- id: map['id'] as int,- ownerID: owner['id'] as int,- updationTime: map['updationTime'] as int,- );- }- return RemoteCollectionUpdate(map);- }-}--final class RemoteCollectionUpdate extends RemoteCollectionChange {- const RemoteCollectionUpdate(this.data);-- final Map<String, dynamic> data;-- @override- int get id => data['id'] as int;-- @override- int get updationTime => data['updationTime'] as int;-}--final class RemoteCollectionDeletion extends RemoteCollectionChange {- const RemoteCollectionDeletion({- required this.id,- required this.ownerID,- required this.updationTime,- });-- @override- final int id;- final int ownerID;- @override- final int updationTime;-}diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dartindex 79dfed5923..0b5aa2b847 100644--- a/mobile/apps/photos/lib/services/collections_service.dart+++ b/mobile/apps/photos/lib/services/collections_service.dart@@ -26,7 +26,6 @@ import 'package:photos/events/files_updated_event.dart';import 'package:photos/events/force_reload_home_gallery_event.dart';import 'package:photos/events/local_photos_updated_event.dart';import "package:photos/gateways/collections/collection_share_gateway.dart";-import 'package:photos/gateways/collections/models/collection_change.dart';import 'package:photos/gateways/collections/models/collection_file_item.dart';import "package:photos/gateways/collections/models/collection_share.dart";import 'package:photos/gateways/collections/models/create_request.dart';@@ -143,41 +142,23 @@ class CollectionsService {_logger.info("[COLLECTIONS] Starting sync");- final collectionChanges = await _fetchCollectionChanges(+ final fetchedCollections = await _fetchCollections(lastCollectionUpdationTime,);_logger.info(- "[COLLECTIONS] Fetched ${collectionChanges.length} collection changes from API",+ "[COLLECTIONS] Fetched ${fetchedCollections.length} collections from API",);- watch.log("remote fetch collections ${collectionChanges.length}");+ watch.log("remote fetch collections ${fetchedCollections.length}");- if (collectionChanges.isEmpty) {+ if (fetchedCollections.isEmpty) {await _ensureUncategorizedCollectionExists();return;}final updatedCollections = <Collection>[];int maxUpdationTime = lastCollectionUpdationTime;+ final ownerID = _config.getUserID();bool shouldFireDeleteEvent = false;- for (final change in collectionChanges) {- maxUpdationTime = max(maxUpdationTime, change.updationTime);- if (change is RemoteCollectionDeletion) {- await _filesDB.deleteCollection(change.id);- await _cleanupSocialData(change.id);- await setCollectionSyncTime(change.id, null);- if (_collectionIDToCollections.containsKey(change.id)) {- shouldFireDeleteEvent = true;- }- await _db.deleteCollection(change.id);- _collectionIDToCollections.remove(change.id);- _cachedKeys.remove(change.id);- _localPathToCollectionID.removeWhere((_, id) => id == change.id);- _clearPublicCollectionState(change.id);- continue;- }-- final collection = await _fromRemoteCollection(- (change as RemoteCollectionUpdate).data,- );+ for (final collection in fetchedCollections) {if (collection.isDeleted) {await _filesDB.deleteCollection(collection.id);await _cleanupSocialData(collection.id);@@ -186,9 +167,16 @@ class CollectionsService {shouldFireDeleteEvent = true;}}- // Keep owned deleted collections because their keys may be needed to- // decrypt trashed files.- updatedCollections.add(collection);+ if (collection.isDeleted && ownerID != collection.owner.id) {+ await _db.deleteCollection(collection.id);+ } else {+ // keep entry for deletedCollection as collectionKey may be used during+ // trash file decryption+ updatedCollections.add(collection);+ }+ maxUpdationTime = collection.updationTime > maxUpdationTime+ ? collection.updationTime+ : maxUpdationTime;}if (shouldFireDeleteEvent) {@@ -205,14 +193,14 @@ class CollectionsService {watch.logAndReset("till DB insertion ${updatedCollections.length}");_logger.info("[COLLECTIONS] Updated ${updatedCollections.length} in DB");- for (final collection in updatedCollections) {+ for (final collection in fetchedCollections) {_cacheLocalPathAndCollection(collection);}_logger.info("Collections synced");- watch.log("${updatedCollections.length} collection caches refreshed");+ watch.log("${fetchedCollections.length} collection cached refreshed ");- if (collectionChanges.isNotEmpty) {+ if (fetchedCollections.isNotEmpty) {Bus.instance.fire(ContactRelationshipsInvalidatedEvent());Bus.instance.fire(CollectionUpdatedEvent(@@ -1544,15 +1532,21 @@ class CollectionsService {}}- Future<List<RemoteCollectionChange>> _fetchCollectionChanges(- int sinceTime,- ) async {+ Future<List<Collection>> _fetchCollections(int sinceTime) async {try {- return await collectionsGateway.getAll(+ final response = await collectionsGateway.getAll(sinceTime: sinceTime,source: AppLifecycleService.instance.isForeground ? "fg" : "bg",- currentUserID: _config.getUserID()!,);+ final List<Collection> collections = [];+ final c = response["collections"];+ for (final collectionData in c) {+ final Collection collection = await _fromRemoteCollection(+ collectionData,+ );+ collections.add(collection);+ }+ return collections;} catch (e, s) {_logger.warning("Failed to fetch collections", e, s);if (e is DioException && e.response?.statusCode == 401) {diff --git a/web/apps/locker/src/services/locker-db.ts b/web/apps/locker/src/services/locker-db.tsindex f0dad78811..8af459a989 100644--- a/web/apps/locker/src/services/locker-db.ts+++ b/web/apps/locker/src/services/locker-db.ts@@ -256,20 +256,6 @@ export const saveCollectionRecords = async (await tx.done;};-export const deleteCollectionRecords = async (- collectionIDs: number[],- userID = ensureLocalUser().id,-) => {- if (collectionIDs.length === 0) return;-- const db = await resolveLockerDB(userID);- const tx = db.transaction("collections", "readwrite");- await Promise.all(- collectionIDs.map((collectionID) => tx.store.delete(collectionID)),- );- await tx.done;-};-export const saveCollectionsSinceTime = async (sinceTime: number,userID = ensureLocalUser().id,diff --git a/web/apps/locker/src/services/sync/schemas.ts b/web/apps/locker/src/services/sync/schemas.tsindex 36db132f3c..d6caf300c8 100644--- a/web/apps/locker/src/services/sync/schemas.ts+++ b/web/apps/locker/src/services/sync/schemas.ts@@ -28,26 +28,8 @@ export const RemoteCollection = z.object({export type RemoteCollection = z.infer<typeof RemoteCollection>;-export const RemoteCollectionDeletionTombstone = z.object({- id: z.number(),- owner: z.object({ id: z.number() }),- updationTime: z.number(),- isDeleted: z.literal(true),-});--export type RemoteCollectionDeletionTombstone = z.infer<- typeof RemoteCollectionDeletionTombstone->;--export const RemoteCollectionChange = z.union([- RemoteCollection,- RemoteCollectionDeletionTombstone,-]);--export type RemoteCollectionChange = z.infer<typeof RemoteCollectionChange>;-export const CollectionsResponse = z.object({- collections: z.array(RemoteCollectionChange),+ collections: z.array(RemoteCollection),});const RemoteEncryptedMetadata = z.object({diff --git a/web/apps/locker/src/services/sync/sync.ts b/web/apps/locker/src/services/sync/sync.tsindex f2cf6b8e98..c15e487c64 100644--- a/web/apps/locker/src/services/sync/sync.ts+++ b/web/apps/locker/src/services/sync/sync.ts@@ -1,5 +1,4 @@import type { LockerCollection, LockerItem } from "@/types";-import { ensureLocalUser } from "ente-accounts/services/user";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";import log from "ente-base/log";import { apiURL } from "ente-base/origins";@@ -12,7 +11,6 @@ import {} from "../locker-cache";import {type StoredTrashFileRecord,- deleteCollectionRecords,deleteCollectionSinceTime,deleteFileRecords,deleteFileRecordsForCollection,@@ -222,7 +220,6 @@ export const syncLockerState = async (): Promise<LockerHydratedState> => {let latestCollectionsSinceTime = snapshot.collectionsSinceTime;const changedCollections: EncryptedCollectionRecord[] = [];- const revokedCollectionIDs: number[] = [];const deletedCollectionIDs: number[] = [];for (const change of collectionChanges) {@@ -230,15 +227,6 @@ export const syncLockerState = async (): Promise<LockerHydratedState> => {latestCollectionsSinceTime,change.updationTime,);- if (change.isDeleted && change.owner.id != ensureLocalUser().id) {- revokedCollectionIDs.push(change.id);- deletedCollectionIDs.push(change.id);- continue;- }-- if (!("encryptedKey" in change)) {- throw new Error(`Incomplete owned collection change ${change.id}`);- }const record = await toEncryptedCollectionRecord(change);changedCollections.push(record);if (record.isDeleted) {@@ -249,7 +237,6 @@ export const syncLockerState = async (): Promise<LockerHydratedState> => {if (changedCollections.length > 0) {await saveCollectionRecords(changedCollections);}- await deleteCollectionRecords(revokedCollectionIDs);for (const collectionID of deletedCollectionIDs) {await deleteFileRecordsForCollection(collectionID);await deleteCollectionSinceTime(collectionID);diff --git a/web/apps/locker/tests/sync.test.ts b/web/apps/locker/tests/sync.test.tsindex e26e46eec8..a814881f64 100644--- a/web/apps/locker/tests/sync.test.ts+++ b/web/apps/locker/tests/sync.test.ts@@ -13,7 +13,6 @@ import {vi.mock("../src/services/locker-db", () => ({loadLockerSnapshotFromDB: vi.fn(),- deleteCollectionRecords: vi.fn(),saveCollectionRecords: vi.fn(),saveCollectionsSinceTime: vi.fn(),saveCollectionSinceTime: vi.fn(),@@ -25,9 +24,6 @@ vi.mock("../src/services/locker-db", () => ({deleteTrashFileRecords: vi.fn(),saveTrashSinceTime: vi.fn(),}));-vi.mock("ente-accounts/services/user", () => ({- ensureLocalUser: () => ({ id: 1 }),-}));const { openCollectionKey, decryptMetadataJSON } = vi.hoisted(() => ({openCollectionKey: vi.fn(),decryptMetadataJSON: vi.fn(),@@ -246,94 +242,6 @@ test("incremental sync paginates changed collections and trash, skipping up-to-d);});-test("collection changes remove foreign deletions and retain owned records", async () => {- const afterDeletion = {- ...snapshot(),- collections: new Map([[2, collection(2)]]),- files: [file(10, 2)],- collectionsSinceTime: 9,- collectionSinceTimeByID: new Map([[2, 20]]),- };- vi.mocked(db.loadLockerSnapshotFromDB)- .mockResolvedValueOnce(snapshot())- .mockResolvedValueOnce(afterDeletion)- .mockResolvedValueOnce(afterDeletion);- fetchMock- .mockResolvedValueOnce(- response({- collections: [- {- id: 1,- owner: { id: 7, email: "" },- encryptedKey: "legacy-key",- type: "folder",- updationTime: 9,- isDeleted: true,- },- {- id: 3,- owner: { id: 7 },- updationTime: 10,- isDeleted: true,- futureField: "ignored",- },- {- id: 4,- owner: { id: 1 },- encryptedKey: "owned-key",- type: "folder",- updationTime: 11,- isDeleted: true,- },- {- id: 5,- owner: { id: 1 },- encryptedKey: "active-key",- type: "folder",- updationTime: 12,- isDeleted: false,- },- ],- }),- )- .mockResolvedValueOnce(response({ diff: [], hasMore: false }));-- await syncLockerState();-- expect(db.deleteCollectionRecords).toHaveBeenCalledExactlyOnceWith([1, 3]);- expect(db.deleteFileRecordsForCollection).toHaveBeenCalledTimes(3);- expect(db.deleteFileRecordsForCollection).toHaveBeenCalledWith(1);- expect(db.deleteFileRecordsForCollection).toHaveBeenCalledWith(3);- expect(db.deleteFileRecordsForCollection).toHaveBeenCalledWith(4);- expect(db.deleteCollectionSinceTime).toHaveBeenCalledTimes(3);- expect(db.deleteCollectionSinceTime).toHaveBeenCalledWith(1);- expect(db.deleteCollectionSinceTime).toHaveBeenCalledWith(3);- expect(db.deleteCollectionSinceTime).toHaveBeenCalledWith(4);- expect(db.saveCollectionRecords).toHaveBeenCalledExactlyOnceWith([- expect.objectContaining({- id: 4,- encryptedKey: "owned-key",- isDeleted: true,- }),- expect.objectContaining({- id: 5,- encryptedKey: "active-key",- isDeleted: false,- }),- ]);- expect(db.saveCollectionsSinceTime).toHaveBeenCalledExactlyOnceWith(12);- expect(openCollectionKey).not.toHaveBeenCalledWith(- expect.anything(),- expect.anything(),- "legacy-key",- expect.anything(),- );- expect(fetchMock.mock.calls.map(([url]) => url)).toEqual([- "/collections/v2?sinceTime=5",- "/trash/v2/diff?sinceTime=40",- ]);-});-test("failed file pagination does not persist a partial diff or advance its cursor", async () => {fetchMock.mockResolvedValueOnce(response({ collections: [] }))diff --git a/web/apps/photos/src/services/export-collection-state.ts b/web/apps/photos/src/services/export-collection-state.tsdeleted file mode 100644index 9f94e0c88d..0000000000--- a/web/apps/photos/src/services/export-collection-state.ts+++ /dev/null@@ -1,11 +0,0 @@-export const deletedExportedCollectionIDs = (- presentCollectionIDs: Iterable<number>,- collectionExportNames: Readonly<Record<number, string>> | undefined,-) => {- if (!collectionExportNames) return [];-- const presentIDs = new Set(presentCollectionIDs);- return Object.keys(collectionExportNames)- .map(Number)- .filter((collectionID) => !presentIDs.has(collectionID));-};diff --git a/web/apps/photos/src/services/export.ts b/web/apps/photos/src/services/export.tsindex acd451b191..633b54d4dd 100644--- a/web/apps/photos/src/services/export.ts+++ b/web/apps/photos/src/services/export.ts@@ -36,7 +36,6 @@ import { PromiseQueue } from "ente-utils/promise";import { nullToUndefined } from "ente-utils/transform";import i18n from "i18next";import { z } from "zod";-import { deletedExportedCollectionIDs } from "./export-collection-state";const exportStoppedError = () => namedError("export_stopped", "export stopped");@@ -1225,11 +1224,25 @@ const getRenamedExportedCollections = (const getDeletedExportedCollections = (collections: Collection[],exportRecord: ExportRecord,-) =>- deletedExportedCollectionIDs(- collections.map(({ id }) => id),- exportRecord.collectionExportNames,+) => {+ if (!exportRecord?.collectionExportNames) {+ return [];+ }+ const presentCollections = new Set(+ collections.map((collection) => collection.id),);+ const deletedExportedCollections = Object.keys(+ exportRecord?.collectionExportNames,+ )+ .map(Number)+ .filter((collectionID) => {+ if (!presentCollections.has(collectionID)) {+ return true;+ }+ return false;+ });+ return deletedExportedCollections;+};const readOnDiskFileExportRecordIDs = async (files: EnteFile[],diff --git a/web/apps/photos/tests/collection-change.test.ts b/web/apps/photos/tests/collection-change.test.tsdeleted file mode 100644index 219fb97b2a..0000000000--- a/web/apps/photos/tests/collection-change.test.ts+++ /dev/null@@ -1,52 +0,0 @@-import {- RemoteCollectionChange,- RemoteCollectionDeletionTombstone,-} from "ente-media/collection";-import { describe, expect, test } from "vitest";-import { deletedExportedCollectionIDs } from "../src/services/export-collection-state";--describe("collection deletion tombstones", () => {- test("parses without active collection fields", () => {- const parsed = RemoteCollectionChange.parse({- id: 7,- owner: { id: 1, email: "" },- encryptedKey: "compatibility-key",- type: "album",- attributes: {},- updationTime: 9,- isDeleted: true,- name: "must not survive parsing",- magicMetadata: { data: "must not survive parsing" },- });-- expect(parsed).toEqual({- id: 7,- owner: { id: 1 },- updationTime: 9,- isDeleted: true,- });- expect(RemoteCollectionDeletionTombstone.parse(parsed)).toStrictEqual(- parsed,- );- });-- test("keeps active collection fields required", () => {- expect(() =>- RemoteCollectionChange.parse({- id: 7,- owner: { id: 1 },- updationTime: 9,- isDeleted: false,- }),- ).toThrow();- });-- test("desktop export finds removed collections using IDs only", () => {- expect(- deletedExportedCollectionIDs([1], {- 1: "Current album",- 7: "Former shared album",- }),- ).toEqual([7]);- });-});diff --git a/web/packages/media/collection.ts b/web/packages/media/collection.tsindex 334823fd5b..cb4569e722 100644--- a/web/packages/media/collection.ts+++ b/web/packages/media/collection.ts@@ -136,26 +136,6 @@ export const RemoteCollection = z.looseObject({export type RemoteCollection = z.infer<typeof RemoteCollection>;-export const RemoteCollectionDeletionTombstone = z.object({- id: z.number(),- owner: z.object({ id: z.number() }),- updationTime: z.number(),- isDeleted: z.literal(true),-});--export type RemoteCollectionDeletionTombstone = z.infer<- typeof RemoteCollectionDeletionTombstone->;--const RemoteActiveCollection = RemoteCollection.extend({- isDeleted: z.literal(false).nullish().transform(nullToUndefined),-});--export const RemoteCollectionChange = z.union([- RemoteCollectionDeletionTombstone,- RemoteActiveCollection,-]);-export const decryptRemoteCollection = async (collection: RemoteCollection,collectionKey: string,diff --git a/web/packages/new/photos/services/collection.ts b/web/packages/new/photos/services/collection.tsindex ead155c206..edf36f3e08 100644--- a/web/packages/new/photos/services/collection.ts+++ b/web/packages/new/photos/services/collection.ts@@ -12,7 +12,6 @@ import {findUserUncategorizedCollection,maxAlbumDescriptionLength,RemoteCollection,- RemoteCollectionChange,RemotePublicURL,type Collection,type CollectionNewParticipantRole,@@ -157,7 +156,7 @@ export const getCollectionByID = async (};const CollectionsResponse = z.object({- collections: z.array(RemoteCollectionChange),+ collections: z.array(RemoteCollection),});export interface CollectionChange {