rename cloudId to icloudId

# Conflicts:
#	mobile/drift_schemas/main/drift_schema_v10.json
#	mobile/lib/infrastructure/repositories/db.repository.dart
#	mobile/lib/infrastructure/repositories/db.repository.drift.dart
#	mobile/lib/infrastructure/repositories/db.repository.steps.dart
#	mobile/test/drift/main/generated/schema_v10.dart

.github/workflows/merge-translations.yml

@@ -0,0 +1,96 @@
+name: Merge translations
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions: {}
+
+env:
+  WEBLATE_HOST: 'https://hosted.weblate.org'
+  WEBLATE_COMPONENT: 'immich/immich'
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Find translation PR
+        id: find_pr
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+
+          gh pr list --repo $GITHUB_REPOSITORY --author weblate --json number,mergeable | read PR
+          echo "$PR"
+
+          echo "$PR" | jq '
+            if length == 1 then
+              .[0].number
+            else
+              error("Expected exactly 1 entry, got \(length)")
+            end
+          ' 2>&1 | read PR_NUMBER || exit 1
+
+          echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT
+          echo "Selected PR $PR_NUMBER"
+
+          echo "$PR" | jq -e '.[0].mergeable == "MERGEABLE"' || { echo "PR is not mergeable" ; exit 1 }
+
+      - name: Generate a token
+        id: generate_token
+        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        with:
+          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+
+      - name: Lock weblate
+        env:
+          WEBLATE_TOKEN: ${{ secrets.WEBLATE_TOKEN }}
+        run: |
+          curl -X POST -H "Authorization: Token $WEBLATE_TOKEN" "$WEBLATE_HOST/api/components/$WEBLATE_COMPONENT/lock/" -d lock=true
+
+      - name: Commit translations
+        env:
+          WEBLATE_TOKEN: ${{ secrets.WEBLATE_TOKEN }}
+        run: |
+          curl -X POST -H "Authorization: Token $WEBLATE_TOKEN" "$WEBLATE_HOST/api/components/$WEBLATE_COMPONENT/repository/" -d operation=commit
+          curl -X POST -H "Authorization: Token $WEBLATE_TOKEN" "$WEBLATE_HOST/api/components/$WEBLATE_COMPONENT/repository/" -d operation=push
+
+      - name: Merge PR
+        env:
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+          PR_NUMBER: ${{ steps.find_pr.outputs.PR_NUMBER }}
+        run: |
+          gh api -X POST "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews" --field event='APPROVE' --field body='Automatically merging translations PR' \
+            | jq '.id' | read REVIEW_ID
+          echo "REVIEW_ID=$REVIEW_ID" >> $GITHUB_OUTPUT
+          gh pr merge "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --auto --squash
+
+      - name: Wait for PR to merge
+        env:
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+          PR_NUMBER: ${{ steps.find_pr.outputs.PR_NUMBER }}
+          REVIEW_ID: ${{ steps.merge_pr.outputs.REVIEW_ID }}
+        run: |
+          for i in {1..10}; do
+            if gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json merged | jq -e '.merged == true'; then
+              echo "PR merged"
+              exit 0
+            else
+              echo "PR not merged yet, waiting..."
+              sleep 6
+            fi
+          done
+          echo "PR did not merge in time"
+          gh api -X PUT "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews/$REVIEW_ID/dismissals" --field message='Merge attempt timed out' --field event='DISMISS'
+          gh pr merge "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --disable-auto
+          exit 1
+
+      - name: Unlock weblate
+        env:
+          WEBLATE_TOKEN: ${{ secrets.WEBLATE_TOKEN }}
+        run: |
+          curl -X POST -H "Authorization: Token $WEBLATE_TOKEN" "$WEBLATE_HOST/api/components/$WEBLATE_COMPONENT/lock/" -d lock=false

.github/workflows/prepare-release.yml

@@ -24,6 +24,15 @@ concurrency:
 permissions: {}
 
 jobs:
+  merge_translations:
+    uses: ./.github/workflows/merge-translations.yml
+    permissions:
+      pull-requests: write
+    secrets:
+      PUSH_O_MATIC_APP_ID: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+      PUSH_O_MATIC_APP_KEY: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+      WEBLATE_TOKEN: ${{ secrets.WEBLATE_TOKEN }}
+
   bump_version:
     runs-on: ubuntu-latest
     outputs:

.github/workflows/weblate-lock.yml

@@ -1,6 +1,7 @@
 name: Weblate checks
 
 on:
+  pull_request_review:
   pull_request:
     branches: [main]
 
@@ -12,7 +13,7 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.found_paths.outputs.i18n == 'true' && github.head_ref != 'chore/translations'}}
+      should_run: ${{ steps.found_paths.outputs.i18n == 'true' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
@@ -32,19 +33,15 @@ jobs:
     permissions: {}
     if: ${{ needs.pre-job.outputs.should_run == 'true' }}
     steps:
-      - name: Check weblate lock
+      - name: Bot review status
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || github.event.pull_request_review.pull_request.number }}
+          GH_TOKEN: ${{ github.token }}
         run: |
-          if [[ "false" = $(curl https://hosted.weblate.org/api/components/immich/immich/lock/ | jq .locked) ]]; then
-            exit 1
-          fi
-      - name: Find Pull Request
-        uses: juliangruber/find-pull-request-action@952b3bb1ddb2dcc0aa3479e98bb1c2d1a922f096 # v1.10.0
-        id: find-pr
-        with:
-          branch: chore/translations
-      - name: Fail if existing weblate PR
-        if: ${{ steps.find-pr.outputs.number }}
-        run: exit 1
+          # Then check for APPROVED by the bot, if absent fail
+          gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviews | jq -e '.reviews | map(select(.author.login == "github-actions[bot]" and .state == "APPROVED")) | length > 0' \
+            || (echo "The push-o-matic bot has not approved this PR yet" && exit 1)
+
   success-check-lock:
     name: Weblate Lock Check Success
     needs: [enforce-lock]

e2e/src/api/specs/partner.e2e-spec.ts

@@ -23,8 +23,8 @@ describe('/partners', () => {
     ]);
 
     await Promise.all([
-      createPartner({ id: user2.userId }, { headers: asBearerAuth(user1.accessToken) }),
-      createPartner({ id: user1.userId }, { headers: asBearerAuth(user2.accessToken) }),
+      createPartner({ partnerCreateDto: { sharedWithId: user2.userId } }, { headers: asBearerAuth(user1.accessToken) }),
+      createPartner({ partnerCreateDto: { sharedWithId: user1.userId } }, { headers: asBearerAuth(user2.accessToken) }),
     ]);
   });
 

e2e/src/utils.ts

@@ -462,7 +462,8 @@ export const utils = {
   updateLibrary: (accessToken: string, id: string, dto: UpdateLibraryDto) =>
     updateLibrary({ id, updateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
 
-  createPartner: (accessToken: string, id: string) => createPartner({ id }, { headers: asBearerAuth(accessToken) }),
+  createPartner: (accessToken: string, id: string) =>
+    createPartner({ partnerCreateDto: { sharedWithId: id } }, { headers: asBearerAuth(accessToken) }),
 
   updateMyPreferences: (accessToken: string, userPreferencesUpdateDto: UserPreferencesUpdateDto) =>
     updateMyPreferences({ userPreferencesUpdateDto }, { headers: asBearerAuth(accessToken) }),

i18n/en.json

@@ -1921,6 +1921,7 @@
   "sync": "Sync",
   "sync_albums": "Sync albums",
   "sync_albums_manual_subtitle": "Sync all uploaded videos and photos to the selected backup albums",
+  "sync_cloud_ids": "Sync Cloud IDs",
   "sync_local": "Sync Local",
   "sync_remote": "Sync Remote",
   "sync_upload_album_setting_subtitle": "Create and upload your photos and videos to the selected albums on Immich",

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -260,6 +260,7 @@ interface NativeSyncApi {
   fun getAssetsCountSince(albumId: String, timestamp: Long): Long
   fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
   fun hashPaths(paths: List<String>): List<ByteArray?>
+  fun getCloudIdForAssetIds(assetIds: List<String>): Map<String, String?>
 
   companion object {
     /** The codec used by NativeSyncApi. */
@@ -418,6 +419,23 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val assetIdsArg = args[0] as List<String>
+            val wrapped: List<Any?> = try {
+              listOf(api.getCloudIdForAssetIds(assetIdsArg))
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -234,4 +234,10 @@ open class NativeSyncApiImplBase(context: Context) {
       }
     }
   }
+
+  // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
+  @Suppress("unused", "UNUSED_PARAMETER")
+  fun getCloudIdForAssetIds(assetIds: List<String>): Map<String, String?> {
+    return emptyMap()
+  }
 }

mobile/ios/Runner/Sync/Messages.g.swift

@@ -324,6 +324,7 @@ protocol NativeSyncApi {
   func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
   func hashPaths(paths: [String]) throws -> [FlutterStandardTypedData?]
+  func getCloudIdForAssetIds(assetIds: [String]) throws -> [String: String?]
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -476,5 +477,20 @@ class NativeSyncApiSetup {
     } else {
       hashPathsChannel.setMessageHandler(nil)
     }
+    let getCloudIdForAssetIdsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      getCloudIdForAssetIdsChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let assetIdsArg = args[0] as! [String]
+        do {
+          let result = try api.getCloudIdForAssetIds(assetIds: assetIdsArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      getCloudIdForAssetIdsChannel.setMessageHandler(nil)
+    }
   }
 }

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -286,4 +286,20 @@ class NativeSyncApiImpl: NativeSyncApi {
           return FlutterStandardTypedData(bytes: Data(digest))
       }
   }
+  
+  func getCloudIdForAssetIds(assetIds: [String]) throws -> [String : String?] {
+    guard #available(iOS 16, *) else {
+      return Dictionary(
+        uniqueKeysWithValues: assetIds.map { ($0, nil as String?) }
+      )
+    }
+    
+    var mappings: [String: String?] = [:]
+    let result = PHPhotoLibrary.shared().cloudIdentifierMappings(forLocalIdentifiers: assetIds)
+    for (key, value) in result {
+      let id = try? value.get().stringValue
+      mappings[key] = id
+    }
+    return mappings;
+  }
 }

mobile/lib/domain/models/asset/asset_metadata.model.dart

@@ -0,0 +1,40 @@
+enum RemoteAssetMetadataKey {
+  mobileApp("mobile-app");
+
+  final String key;
+
+  const RemoteAssetMetadataKey(this.key);
+}
+
+abstract class RemoteAssetMetadataValue {
+  const RemoteAssetMetadataValue();
+
+  Map<String, dynamic> toJson();
+}
+
+class RemoteAssetMetadataItem {
+  final RemoteAssetMetadataKey key;
+  final RemoteAssetMetadataValue value;
+
+  const RemoteAssetMetadataItem({required this.key, required this.value});
+
+  Map<String, Object?> toJson() {
+    return {'key': key.key, 'value': value};
+  }
+}
+
+class RemoteAssetMobileAppMetadata extends RemoteAssetMetadataValue {
+  final String? cloudId;
+
+  const RemoteAssetMobileAppMetadata({this.cloudId});
+
+  @override
+  Map<String, dynamic> toJson() {
+    final map = <String, Object?>{};
+    if (cloudId != null) {
+      map["iCloudId"] = cloudId;
+    }
+
+    return map;
+  }
+}

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -3,11 +3,13 @@ part of 'base_asset.model.dart';
 class LocalAsset extends BaseAsset {
   final String id;
   final String? remoteId;
+  final String? cloudId;
   final int orientation;
 
   const LocalAsset({
     required this.id,
     this.remoteId,
+    this.cloudId,
     required super.name,
     super.checksum,
     required super.type,
@@ -31,6 +33,8 @@ class LocalAsset extends BaseAsset {
   String toString() {
     return '''LocalAsset {
    id: $id,
+   remoteId: ${remoteId ?? "<NA>"},
+   cloudId: ${cloudId ?? "<NA>"},
    name: $name,
    type: $type,
    createdAt: $createdAt,
@@ -49,7 +53,7 @@ class LocalAsset extends BaseAsset {
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
     if (identical(this, other)) return true;
-    return super == other && id == other.id && orientation == other.orientation;
+    return super == other && id == other.id && orientation == other.orientation && cloudId == other.cloudId;
   }
 
   @override
@@ -58,6 +62,7 @@ class LocalAsset extends BaseAsset {
   LocalAsset copyWith({
     String? id,
     String? remoteId,
+    String? cloudId,
     String? name,
     String? checksum,
     AssetType? type,
@@ -72,6 +77,7 @@ class LocalAsset extends BaseAsset {
     return LocalAsset(
       id: id ?? this.id,
       remoteId: remoteId ?? this.remoteId,
+      cloudId: cloudId ?? this.cloudId,
       name: name ?? this.name,
       checksum: checksum ?? this.checksum,
       type: type ?? this.type,

mobile/lib/domain/models/user.model.dart

@@ -1,7 +1,36 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:convert';
+import 'dart:ui';
 
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+enum AvatarColor {
+  // do not change this order or reuse indices for other purposes, adding is OK
+  primary("primary"),
+  pink("pink"),
+  red("red"),
+  yellow("yellow"),
+  blue("blue"),
+  green("green"),
+  purple("purple"),
+  orange("orange"),
+  gray("gray"),
+  amber("amber");
+
+  final String value;
+  const AvatarColor(this.value);
+
+  Color toColor({bool isDarkTheme = false}) => switch (this) {
+    AvatarColor.primary => isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF),
+    AvatarColor.pink => const Color.fromARGB(255, 244, 114, 182),
+    AvatarColor.red => const Color.fromARGB(255, 239, 68, 68),
+    AvatarColor.yellow => const Color.fromARGB(255, 234, 179, 8),
+    AvatarColor.blue => const Color.fromARGB(255, 59, 130, 246),
+    AvatarColor.green => const Color.fromARGB(255, 22, 163, 74),
+    AvatarColor.purple => const Color.fromARGB(255, 147, 51, 234),
+    AvatarColor.orange => const Color.fromARGB(255, 234, 88, 12),
+    AvatarColor.gray => const Color.fromARGB(255, 75, 85, 99),
+    AvatarColor.amber => const Color.fromARGB(255, 217, 119, 6),
+  };
+}
 
 // TODO: Rename to User once Isar is removed
 class UserDto {
@@ -9,7 +38,7 @@ class UserDto {
   final String email;
   final String name;
   final bool isAdmin;
-  final DateTime updatedAt;
+  final DateTime? updatedAt;
 
   final AvatarColor avatarColor;
 
@@ -31,8 +60,8 @@ class UserDto {
     required this.id,
     required this.email,
     required this.name,
-    required this.isAdmin,
-    required this.updatedAt,
+    this.isAdmin = false,
+    this.updatedAt,
     required this.profileChangedAt,
     this.avatarColor = AvatarColor.primary,
     this.memoryEnabled = true,
@@ -99,7 +128,8 @@ profileChangedAt: $profileChangedAt
     if (identical(this, other)) return true;
 
     return other.id == id &&
-        other.updatedAt.isAtSameMomentAs(updatedAt) &&
+        ((updatedAt == null && other.updatedAt == null) ||
+            (updatedAt != null && other.updatedAt != null && other.updatedAt!.isAtSameMomentAs(updatedAt!))) &&
         other.avatarColor == avatarColor &&
         other.email == email &&
         other.name == name &&

mobile/lib/domain/models/user_metadata.model.dart

@@ -1,4 +1,4 @@
-import 'dart:ui';
+import 'package:immich_mobile/domain/models/user.model.dart';
 
 enum UserMetadataKey {
   // do not change this order!
@@ -7,36 +7,6 @@ enum UserMetadataKey {
   license,
 }
 
-enum AvatarColor {
-  // do not change this order or reuse indices for other purposes, adding is OK
-  primary("primary"),
-  pink("pink"),
-  red("red"),
-  yellow("yellow"),
-  blue("blue"),
-  green("green"),
-  purple("purple"),
-  orange("orange"),
-  gray("gray"),
-  amber("amber");
-
-  final String value;
-  const AvatarColor(this.value);
-
-  Color toColor({bool isDarkTheme = false}) => switch (this) {
-    AvatarColor.primary => isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF),
-    AvatarColor.pink => const Color.fromARGB(255, 244, 114, 182),
-    AvatarColor.red => const Color.fromARGB(255, 239, 68, 68),
-    AvatarColor.yellow => const Color.fromARGB(255, 234, 179, 8),
-    AvatarColor.blue => const Color.fromARGB(255, 59, 130, 246),
-    AvatarColor.green => const Color.fromARGB(255, 22, 163, 74),
-    AvatarColor.purple => const Color.fromARGB(255, 147, 51, 234),
-    AvatarColor.orange => const Color.fromARGB(255, 234, 88, 12),
-    AvatarColor.gray => const Color.fromARGB(255, 75, 85, 99),
-    AvatarColor.amber => const Color.fromARGB(255, 217, 119, 6),
-  };
-}
-
 class Onboarding {
   final bool isOnboarded;
 

mobile/lib/domain/services/background_worker.service.dart

@@ -169,15 +169,20 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     try {
       _isCleanedUp = true;
       _logger.info("Cleaning up background worker");
-      await _ref.read(backgroundSyncProvider).cancel();
-      await _ref.read(backgroundSyncProvider).cancelLocal();
+      final cleanupFutures = [
+        _drift.close(),
+        _driftLogger.close(),
+        _ref.read(backgroundSyncProvider).cancel(),
+        _ref.read(backgroundSyncProvider).cancelLocal(),
+      ];
+
       if (_isar.isOpen) {
-        await _isar.close();
+        cleanupFutures.add(_isar.close());
       }
-      await _drift.close();
-      await _driftLogger.close();
       _ref.dispose();
       _lockManager.releaseLock();
+
+      await Future.wait(cleanupFutures);
       _logger.info("Background worker resources cleaned up");
     } catch (error, stack) {
       debugPrint('Failed to cleanup background worker: $error with stack: $stack');
@@ -207,9 +212,10 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   }
 
   Future<void> _syncAssets({Duration? hashTimeout}) async {
-    final futures = <Future<void>>[];
-
-    final localSyncFuture = _ref.read(backgroundSyncProvider).syncLocal().then((_) async {
+    await (
+      _ref.read(backgroundSyncProvider).syncLocal(),
+      _ref.read(backgroundSyncProvider).syncRemote(),
+    ).wait.whenComplete(() async {
       if (_isCleanedUp) {
         return;
       }
@@ -226,11 +232,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
       return hashFuture;
     });
-
-    futures.add(localSyncFuture);
-    futures.add(_ref.read(backgroundSyncProvider).syncRemote());
-
-    await Future.wait(futures);
   }
 }
 

mobile/lib/domain/services/hash.service.dart

@@ -38,6 +38,10 @@ class HashService {
   Future<void> hashAssets() async {
     _log.info("Starting hashing of assets");
     final Stopwatch stopwatch = Stopwatch()..start();
+
+    // Migrate hashes from cloud ID to local ID so we don't have to re-hash them
+    await _migrateHashes();
+
     // Sorted by backupSelection followed by isCloud
     final localAlbums = await _localAlbumRepository.getAll(
       sortBy: {SortLocalAlbumsBy.backupSelection, SortLocalAlbumsBy.isIosSharedAlbum},
@@ -59,6 +63,15 @@ class HashService {
     _log.info("Hashing took - ${stopwatch.elapsedMilliseconds}ms");
   }
 
+  Future<void> _migrateHashes() async {
+    final hashMappings = await _localAssetRepository.getHashMappingFromCloudId();
+    if (hashMappings.isEmpty) {
+      return;
+    }
+
+    await _localAssetRepository.updateHashes(hashMappings);
+  }
+
   /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
   /// with hash for those that were successfully hashed. Hashes are looked up in a table
   /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
@@ -101,7 +114,7 @@ class HashService {
 
     _log.fine("Hashing ${toHash.length} files");
 
-    final hashed = <LocalAsset>[];
+    final hashed = <LocalAssetHashMapping>[];
     final hashes = await _nativeSyncApi.hashPaths(toHash.map((e) => e.path).toList());
     assert(
       hashes.length == toHash.length,
@@ -117,7 +130,7 @@ class HashService {
       final hash = hashes[i];
       final asset = toHash[i].asset;
       if (hash?.length == 20) {
-        hashed.add(asset.copyWith(checksum: base64.encode(hash!)));
+        hashed.add((assetId: asset.id, checksum: base64.encode(hash!)));
       } else {
         _log.warning(
           "Failed to hash file for ${asset.id}: ${asset.name} created at ${asset.createdAt} from album: ${album.name}",

mobile/lib/domain/services/local_sync.service.dart

@@ -44,8 +44,9 @@ class LocalSyncService {
 
       final deviceAlbums = await _nativeSyncApi.getAlbums();
       await _localAlbumRepository.updateAll(deviceAlbums.toLocalAlbums());
+      final newAssets = delta.updates.toLocalAssets();
       await _localAlbumRepository.processDelta(
-        updates: delta.updates.toLocalAssets(),
+        updates: newAssets,
         deletes: delta.deletes,
         assetAlbums: delta.assetAlbums,
       );
@@ -73,6 +74,8 @@ class LocalSyncService {
           }
           await updateAlbum(dbAlbum, album);
         }
+
+        await _mapIosCloudIds(newAssets);
       }
 
       await _nativeSyncApi.checkpointSync();
@@ -112,9 +115,12 @@ class LocalSyncService {
     try {
       _log.fine("Adding device album ${album.name}");
 
-      final assets = album.assetCount > 0 ? await _nativeSyncApi.getAssetsForAlbum(album.id) : <PlatformAsset>[];
+      final assets = album.assetCount > 0
+          ? await _nativeSyncApi.getAssetsForAlbum(album.id).then((a) => a.toLocalAssets())
+          : <LocalAsset>[];
 
-      await _localAlbumRepository.upsert(album, toUpsert: assets.toLocalAssets());
+      await _localAlbumRepository.upsert(album, toUpsert: assets);
+      await _mapIosCloudIds(assets);
       _log.fine("Successfully added device album ${album.name}");
     } catch (e, s) {
       _log.warning("Error while adding device album", e, s);
@@ -184,13 +190,16 @@ class LocalSyncService {
         return false;
       }
 
-      final newAssets = await _nativeSyncApi.getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime);
+      final newAssets = await _nativeSyncApi
+          .getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime)
+          .then((a) => a.toLocalAssets());
 
       await _localAlbumRepository.upsert(
         deviceAlbum.copyWith(backupSelection: dbAlbum.backupSelection),
-        toUpsert: newAssets.toLocalAssets(),
+        toUpsert: newAssets,
       );
 
+      await _mapIosCloudIds(newAssets);
       return true;
     } catch (e, s) {
       _log.warning("Error on fast syncing local album: ${dbAlbum.name}", e, s);
@@ -222,6 +231,7 @@ class LocalSyncService {
       if (dbAlbum.assetCount == 0) {
         _log.fine("Device album ${deviceAlbum.name} is empty. Adding assets to DB.");
         await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsInDevice);
+        await _mapIosCloudIds(assetsInDevice);
         return true;
       }
 
@@ -259,6 +269,7 @@ class LocalSyncService {
       }
 
       await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsToUpsert, toDelete: assetsToDelete);
+      await _mapIosCloudIds(assetsToUpsert);
 
       return true;
     } catch (e, s) {
@@ -267,6 +278,16 @@ class LocalSyncService {
     return true;
   }
 
+  Future<void> _mapIosCloudIds(List<LocalAsset> assets) async {
+    if (!_platform.isIOS || assets.isEmpty) {
+      return;
+    }
+
+    final assetIds = assets.map((a) => a.id).toList();
+    final cloudMapping = await _nativeSyncApi.getCloudIdForAssetIds(assetIds);
+    await _localAlbumRepository.updateCloudMapping(cloudMapping);
+  }
+
   bool _assetsEqual(LocalAsset a, LocalAsset b) {
     return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
         a.createdAt.isAtSameMomentAs(b.createdAt) &&

mobile/lib/domain/services/sync_stream.service.dart

@@ -23,54 +23,17 @@ class SyncStreamService {
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
-  Future<void> sync() {
+  Future<void> sync() async {
     _logger.info("Remote sync request for user");
     // Start the sync stream and handle events
-    return _syncApiRepository.streamChanges(_handleEvents);
-  }
-
-  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
-
-    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV1 events');
-
-    final List<SyncAssetV1> assets = [];
-    final List<SyncAssetExifV1> exifs = [];
-
-    try {
-      for (final data in batchData) {
-        if (data is! Map<String, dynamic>) {
-          continue;
-        }
-
-        final payload = data;
-        final assetData = payload['asset'];
-        final exifData = payload['exif'];
-
-        if (assetData == null || exifData == null) {
-          continue;
-        }
-
-        final asset = SyncAssetV1.fromJson(assetData);
-        final exif = SyncAssetExifV1.fromJson(exifData);
-
-        if (asset != null && exif != null) {
-          assets.add(asset);
-          exifs.add(exif);
-        }
-      }
-
-      if (assets.isNotEmpty && exifs.isNotEmpty) {
-        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-batch');
-        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
-        _logger.info('Successfully processed ${assets.length} assets in batch');
-      }
-    } catch (error, stackTrace) {
-      _logger.severe("Error processing AssetUploadReadyV1 websocket batch events", error, stackTrace);
+    bool shouldReset = false;
+    await _syncApiRepository.streamChanges(_handleEvents, onReset: () => shouldReset = true);
+    if (shouldReset) {
+      await _syncApiRepository.streamChanges(_handleEvents);
     }
   }
 
-  Future<void> _handleEvents(List<SyncEvent> events, Function() abort) async {
+  Future<void> _handleEvents(List<SyncEvent> events, Function() abort, Function() reset) async {
     List<SyncEvent> items = [];
     for (final event in events) {
       if (isCancelled) {
@@ -83,6 +46,10 @@ class SyncStreamService {
         await _processBatch(items);
       }
 
+      if (event.type == SyncEntityType.syncResetV1) {
+        reset();
+      }
+
       items.add(event);
     }
 
@@ -103,6 +70,8 @@ class SyncStreamService {
   Future<void> _handleSyncData(SyncEntityType type, Iterable<Object> data) async {
     _logger.fine("Processing sync data for $type of length ${data.length}");
     switch (type) {
+      case SyncEntityType.authUserV1:
+        return _syncStreamRepository.updateAuthUsersV1(data.cast());
       case SyncEntityType.userV1:
         return _syncStreamRepository.updateUsersV1(data.cast());
       case SyncEntityType.userDeleteV1:
@@ -117,6 +86,10 @@ class SyncStreamService {
         return _syncStreamRepository.deleteAssetsV1(data.cast());
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
+      case SyncEntityType.assetMetadataV1:
+        return _syncStreamRepository.updateAssetsMetadataV1(data.cast());
+      case SyncEntityType.assetMetadataDeleteV1:
+        return _syncStreamRepository.deleteAssetsMetadataV1(data.cast());
       case SyncEntityType.partnerAssetV1:
         return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner');
       case SyncEntityType.partnerAssetBackfillV1:
@@ -159,6 +132,12 @@ class SyncStreamService {
       // to acknowledge that the client has processed all the backfill events
       case SyncEntityType.syncAckV1:
         return;
+      // No-op. SyncCompleteV1 is used to signal the completion of the sync process
+      case SyncEntityType.syncCompleteV1:
+        return;
+      // Request to reset the client state. Clear everything related to remote entities
+      case SyncEntityType.syncResetV1:
+        return _syncStreamRepository.reset();
       case SyncEntityType.memoryV1:
         return _syncStreamRepository.updateMemoriesV1(data.cast());
       case SyncEntityType.memoryDeleteV1:
@@ -193,4 +172,45 @@ class SyncStreamService {
         _logger.warning("Unknown sync data type: $type");
     }
   }
+
+  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
+    if (batchData.isEmpty) return;
+
+    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV1 events');
+
+    final List<SyncAssetV1> assets = [];
+    final List<SyncAssetExifV1> exifs = [];
+
+    try {
+      for (final data in batchData) {
+        if (data is! Map<String, dynamic>) {
+          continue;
+        }
+
+        final payload = data;
+        final assetData = payload['asset'];
+        final exifData = payload['exif'];
+
+        if (assetData == null || exifData == null) {
+          continue;
+        }
+
+        final asset = SyncAssetV1.fromJson(assetData);
+        final exif = SyncAssetExifV1.fromJson(exifData);
+
+        if (asset != null && exif != null) {
+          assets.add(asset);
+          exifs.add(exif);
+        }
+      }
+
+      if (assets.isNotEmpty && exifs.isNotEmpty) {
+        await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-batch');
+        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
+        _logger.info('Successfully processed ${assets.length} assets in batch');
+      }
+    } catch (error, stackTrace) {
+      _logger.severe("Error processing AssetUploadReadyV1 websocket batch events", error, stackTrace);
+    }
+  }
 }

mobile/lib/domain/utils/background_sync.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
@@ -21,8 +22,13 @@ class BackgroundSyncManager {
   final SyncCallback? onHashingComplete;
   final SyncErrorCallback? onHashingError;
 
+  final SyncCallback? onCloudIdSyncStart;
+  final SyncCallback? onCloudIdSyncComplete;
+  final SyncErrorCallback? onCloudIdSyncError;
+
   Cancelable<void>? _syncTask;
   Cancelable<void>? _syncWebsocketTask;
+  Cancelable<void>? _cloudIdSyncTask;
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _linkedAlbumSyncTask;
   Cancelable<void>? _hashTask;
@@ -37,6 +43,9 @@ class BackgroundSyncManager {
     this.onHashingStart,
     this.onHashingComplete,
     this.onHashingError,
+    this.onCloudIdSyncStart,
+    this.onCloudIdSyncComplete,
+    this.onCloudIdSyncError,
   });
 
   Future<void> cancel() async {
@@ -54,6 +63,11 @@ class BackgroundSyncManager {
     _syncWebsocketTask?.cancel();
     _syncWebsocketTask = null;
 
+    if (_cloudIdSyncTask != null) {
+      futures.add(_cloudIdSyncTask!.future);
+    }
+    _cloudIdSyncTask?.cancel();
+
     if (_linkedAlbumSyncTask != null) {
       futures.add(_linkedAlbumSyncTask!.future);
     }
@@ -114,7 +128,6 @@ class BackgroundSyncManager {
         });
   }
 
-  // No need to cancel the task, as it can also be run when the user logs out
   Future<void> hashAssets() {
     if (_hashTask != null) {
       return _hashTask!.future;
@@ -174,6 +187,25 @@ class BackgroundSyncManager {
       _linkedAlbumSyncTask = null;
     });
   }
+
+  Future<void> syncCloudIds() {
+    if (_cloudIdSyncTask != null) {
+      return _cloudIdSyncTask!.future;
+    }
+
+    onCloudIdSyncStart?.call();
+
+    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds);
+    return _cloudIdSyncTask!
+        .whenComplete(() {
+          onCloudIdSyncComplete?.call();
+          _cloudIdSyncTask = null;
+        })
+        .catchError((error) {
+          onCloudIdSyncError?.call(error.toString());
+          _cloudIdSyncTask = null;
+        });
+  }
 }
 
 Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(

mobile/lib/domain/utils/migrate_cloud_ids.dart

@@ -0,0 +1,82 @@
+import 'package:drift/drift.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:logging/logging.dart';
+// ignore: import_rule_openapi
+import 'package:openapi/api.dart';
+
+Future<void> syncCloudIds(ProviderContainer ref) async {
+  final db = ref.read(driftProvider);
+  // Populate cloud IDs for local assets that don't have one yet
+  await _populateCloudIds(db);
+
+  // Wait for remote sync to complete, so we have up-to-date asset metadata entries
+  await ref.read(syncStreamServiceProvider).sync();
+
+  // Fetch the mapping for backed up assets that have a cloud ID locally but do not have a cloud ID on the server
+  final currentUser = ref.read(currentUserProvider);
+  if (currentUser == null) {
+    Logger('migrateCloudIds').warning('Current user is null. Aborting cloudId migration.');
+    return;
+  }
+
+  final mappingsToUpdate = await _fetchCloudIdMappings(db, currentUser.id);
+  final assetApi = ref.read(apiServiceProvider).assetsApi;
+  for (final mapping in mappingsToUpdate) {
+    final mobileMeta = AssetMetadataUpsertItemDto(
+      key: AssetMetadataKey.mobileApp,
+      value: RemoteAssetMobileAppMetadata(cloudId: mapping.cloudId),
+    );
+    try {
+      await assetApi.updateAssetMetadata(mapping.assetId, AssetMetadataUpsertDto(items: [mobileMeta]));
+    } catch (error, stack) {
+      Logger('migrateCloudIds').warning('Failed to update metadata for asset ${mapping.assetId}', error, stack);
+    }
+  }
+}
+
+Future<void> _populateCloudIds(Drift drift) async {
+  final query = drift.localAssetEntity.selectOnly()
+    ..addColumns([drift.localAssetEntity.id])
+    ..where(drift.localAssetEntity.iCloudId.isNull());
+  final ids = await query.map((row) => row.read(drift.localAssetEntity.id)!).get();
+  final cloudMapping = await NativeSyncApi().getCloudIdForAssetIds(ids);
+  await DriftLocalAlbumRepository(drift).updateCloudMapping(cloudMapping);
+}
+
+typedef _CloudIdMapping = ({String assetId, String cloudId});
+
+Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId) async {
+  final query =
+      drift.remoteAssetEntity.selectOnly().join([
+          leftOuterJoin(
+            drift.localAssetEntity,
+            drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
+            useColumns: false,
+          ),
+          leftOuterJoin(
+            drift.remoteAssetCloudIdEntity,
+            drift.localAssetEntity.iCloudId.equalsExp(drift.remoteAssetCloudIdEntity.cloudId),
+            useColumns: false,
+          ),
+        ])
+        ..addColumns([drift.remoteAssetEntity.id, drift.localAssetEntity.iCloudId])
+        ..where(
+          drift.localAssetEntity.id.isNotNull() &
+              drift.localAssetEntity.iCloudId.isNotNull() &
+              drift.remoteAssetEntity.ownerId.equals(userId) &
+              drift.remoteAssetCloudIdEntity.cloudId.isNull(),
+        );
+  return query
+      .map(
+        (row) => (assetId: row.read(drift.remoteAssetEntity.id)!, cloudId: row.read(drift.localAssetEntity.iCloudId)!),
+      )
+      .get();
+}

mobile/lib/infrastructure/entities/auth_user.entity.dart

@@ -0,0 +1,27 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class AuthUserEntity extends Table with DriftDefaultsMixin {
+  const AuthUserEntity();
+
+  TextColumn get id => text()();
+  TextColumn get name => text()();
+  TextColumn get email => text()();
+  BoolColumn get isAdmin => boolean().withDefault(const Constant(false))();
+
+  // Profile image
+  BoolColumn get hasProfileImage => boolean().withDefault(const Constant(false))();
+  DateTimeColumn get profileChangedAt => dateTime().withDefault(currentDateAndTime)();
+  IntColumn get avatarColor => intEnum<AvatarColor>()();
+
+  // Quota
+  IntColumn get quotaSizeInBytes => integer().withDefault(const Constant(0))();
+  IntColumn get quotaUsageInBytes => integer().withDefault(const Constant(0))();
+
+  // Locked Folder
+  TextColumn get pinCode => text().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}

mobile/lib/infrastructure/entities/auth_user.entity.drift.dart

@@ -0,0 +1,933 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/user.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart'
+    as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+
+typedef $$AuthUserEntityTableCreateCompanionBuilder =
+    i1.AuthUserEntityCompanion Function({
+      required String id,
+      required String name,
+      required String email,
+      i0.Value<bool> isAdmin,
+      i0.Value<bool> hasProfileImage,
+      i0.Value<DateTime> profileChangedAt,
+      required i2.AvatarColor avatarColor,
+      i0.Value<int> quotaSizeInBytes,
+      i0.Value<int> quotaUsageInBytes,
+      i0.Value<String?> pinCode,
+    });
+typedef $$AuthUserEntityTableUpdateCompanionBuilder =
+    i1.AuthUserEntityCompanion Function({
+      i0.Value<String> id,
+      i0.Value<String> name,
+      i0.Value<String> email,
+      i0.Value<bool> isAdmin,
+      i0.Value<bool> hasProfileImage,
+      i0.Value<DateTime> profileChangedAt,
+      i0.Value<i2.AvatarColor> avatarColor,
+      i0.Value<int> quotaSizeInBytes,
+      i0.Value<int> quotaUsageInBytes,
+      i0.Value<String?> pinCode,
+    });
+
+class $$AuthUserEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AuthUserEntityTable> {
+  $$AuthUserEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get name => $composableBuilder(
+    column: $table.name,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get email => $composableBuilder(
+    column: $table.email,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<bool> get isAdmin => $composableBuilder(
+    column: $table.isAdmin,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<bool> get hasProfileImage => $composableBuilder(
+    column: $table.hasProfileImage,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get profileChangedAt => $composableBuilder(
+    column: $table.profileChangedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnWithTypeConverterFilters<i2.AvatarColor, i2.AvatarColor, int>
+  get avatarColor => $composableBuilder(
+    column: $table.avatarColor,
+    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
+  );
+
+  i0.ColumnFilters<int> get quotaSizeInBytes => $composableBuilder(
+    column: $table.quotaSizeInBytes,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<int> get quotaUsageInBytes => $composableBuilder(
+    column: $table.quotaUsageInBytes,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get pinCode => $composableBuilder(
+    column: $table.pinCode,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+}
+
+class $$AuthUserEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AuthUserEntityTable> {
+  $$AuthUserEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get name => $composableBuilder(
+    column: $table.name,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get email => $composableBuilder(
+    column: $table.email,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<bool> get isAdmin => $composableBuilder(
+    column: $table.isAdmin,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<bool> get hasProfileImage => $composableBuilder(
+    column: $table.hasProfileImage,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get profileChangedAt => $composableBuilder(
+    column: $table.profileChangedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get avatarColor => $composableBuilder(
+    column: $table.avatarColor,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get quotaSizeInBytes => $composableBuilder(
+    column: $table.quotaSizeInBytes,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get quotaUsageInBytes => $composableBuilder(
+    column: $table.quotaUsageInBytes,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get pinCode => $composableBuilder(
+    column: $table.pinCode,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+}
+
+class $$AuthUserEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AuthUserEntityTable> {
+  $$AuthUserEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get name =>
+      $composableBuilder(column: $table.name, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get email =>
+      $composableBuilder(column: $table.email, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isAdmin =>
+      $composableBuilder(column: $table.isAdmin, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get hasProfileImage => $composableBuilder(
+    column: $table.hasProfileImage,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumn<DateTime> get profileChangedAt => $composableBuilder(
+    column: $table.profileChangedAt,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumnWithTypeConverter<i2.AvatarColor, int> get avatarColor =>
+      $composableBuilder(
+        column: $table.avatarColor,
+        builder: (column) => column,
+      );
+
+  i0.GeneratedColumn<int> get quotaSizeInBytes => $composableBuilder(
+    column: $table.quotaSizeInBytes,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumn<int> get quotaUsageInBytes => $composableBuilder(
+    column: $table.quotaUsageInBytes,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumn<String> get pinCode =>
+      $composableBuilder(column: $table.pinCode, builder: (column) => column);
+}
+
+class $$AuthUserEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$AuthUserEntityTable,
+          i1.AuthUserEntityData,
+          i1.$$AuthUserEntityTableFilterComposer,
+          i1.$$AuthUserEntityTableOrderingComposer,
+          i1.$$AuthUserEntityTableAnnotationComposer,
+          $$AuthUserEntityTableCreateCompanionBuilder,
+          $$AuthUserEntityTableUpdateCompanionBuilder,
+          (
+            i1.AuthUserEntityData,
+            i0.BaseReferences<
+              i0.GeneratedDatabase,
+              i1.$AuthUserEntityTable,
+              i1.AuthUserEntityData
+            >,
+          ),
+          i1.AuthUserEntityData,
+          i0.PrefetchHooks Function()
+        > {
+  $$AuthUserEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$AuthUserEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$AuthUserEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$AuthUserEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () => i1
+              .$$AuthUserEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> id = const i0.Value.absent(),
+                i0.Value<String> name = const i0.Value.absent(),
+                i0.Value<String> email = const i0.Value.absent(),
+                i0.Value<bool> isAdmin = const i0.Value.absent(),
+                i0.Value<bool> hasProfileImage = const i0.Value.absent(),
+                i0.Value<DateTime> profileChangedAt = const i0.Value.absent(),
+                i0.Value<i2.AvatarColor> avatarColor = const i0.Value.absent(),
+                i0.Value<int> quotaSizeInBytes = const i0.Value.absent(),
+                i0.Value<int> quotaUsageInBytes = const i0.Value.absent(),
+                i0.Value<String?> pinCode = const i0.Value.absent(),
+              }) => i1.AuthUserEntityCompanion(
+                id: id,
+                name: name,
+                email: email,
+                isAdmin: isAdmin,
+                hasProfileImage: hasProfileImage,
+                profileChangedAt: profileChangedAt,
+                avatarColor: avatarColor,
+                quotaSizeInBytes: quotaSizeInBytes,
+                quotaUsageInBytes: quotaUsageInBytes,
+                pinCode: pinCode,
+              ),
+          createCompanionCallback:
+              ({
+                required String id,
+                required String name,
+                required String email,
+                i0.Value<bool> isAdmin = const i0.Value.absent(),
+                i0.Value<bool> hasProfileImage = const i0.Value.absent(),
+                i0.Value<DateTime> profileChangedAt = const i0.Value.absent(),
+                required i2.AvatarColor avatarColor,
+                i0.Value<int> quotaSizeInBytes = const i0.Value.absent(),
+                i0.Value<int> quotaUsageInBytes = const i0.Value.absent(),
+                i0.Value<String?> pinCode = const i0.Value.absent(),
+              }) => i1.AuthUserEntityCompanion.insert(
+                id: id,
+                name: name,
+                email: email,
+                isAdmin: isAdmin,
+                hasProfileImage: hasProfileImage,
+                profileChangedAt: profileChangedAt,
+                avatarColor: avatarColor,
+                quotaSizeInBytes: quotaSizeInBytes,
+                quotaUsageInBytes: quotaUsageInBytes,
+                pinCode: pinCode,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$AuthUserEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$AuthUserEntityTable,
+      i1.AuthUserEntityData,
+      i1.$$AuthUserEntityTableFilterComposer,
+      i1.$$AuthUserEntityTableOrderingComposer,
+      i1.$$AuthUserEntityTableAnnotationComposer,
+      $$AuthUserEntityTableCreateCompanionBuilder,
+      $$AuthUserEntityTableUpdateCompanionBuilder,
+      (
+        i1.AuthUserEntityData,
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$AuthUserEntityTable,
+          i1.AuthUserEntityData
+        >,
+      ),
+      i1.AuthUserEntityData,
+      i0.PrefetchHooks Function()
+    >;
+
+class $AuthUserEntityTable extends i3.AuthUserEntity
+    with i0.TableInfo<$AuthUserEntityTable, i1.AuthUserEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $AuthUserEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _nameMeta = const i0.VerificationMeta(
+    'name',
+  );
+  @override
+  late final i0.GeneratedColumn<String> name = i0.GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _emailMeta = const i0.VerificationMeta(
+    'email',
+  );
+  @override
+  late final i0.GeneratedColumn<String> email = i0.GeneratedColumn<String>(
+    'email',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _isAdminMeta = const i0.VerificationMeta(
+    'isAdmin',
+  );
+  @override
+  late final i0.GeneratedColumn<bool> isAdmin = i0.GeneratedColumn<bool>(
+    'is_admin',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_admin" IN (0, 1))',
+    ),
+    defaultValue: const i4.Constant(false),
+  );
+  static const i0.VerificationMeta _hasProfileImageMeta =
+      const i0.VerificationMeta('hasProfileImage');
+  @override
+  late final i0.GeneratedColumn<bool> hasProfileImage =
+      i0.GeneratedColumn<bool>(
+        'has_profile_image',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.bool,
+        requiredDuringInsert: false,
+        defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'CHECK ("has_profile_image" IN (0, 1))',
+        ),
+        defaultValue: const i4.Constant(false),
+      );
+  static const i0.VerificationMeta _profileChangedAtMeta =
+      const i0.VerificationMeta('profileChangedAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> profileChangedAt =
+      i0.GeneratedColumn<DateTime>(
+        'profile_changed_at',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: i4.currentDateAndTime,
+      );
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AvatarColor, int>
+  avatarColor =
+      i0.GeneratedColumn<int>(
+        'avatar_color',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: true,
+      ).withConverter<i2.AvatarColor>(
+        i1.$AuthUserEntityTable.$converteravatarColor,
+      );
+  static const i0.VerificationMeta _quotaSizeInBytesMeta =
+      const i0.VerificationMeta('quotaSizeInBytes');
+  @override
+  late final i0.GeneratedColumn<int> quotaSizeInBytes = i0.GeneratedColumn<int>(
+    'quota_size_in_bytes',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const i4.Constant(0),
+  );
+  static const i0.VerificationMeta _quotaUsageInBytesMeta =
+      const i0.VerificationMeta('quotaUsageInBytes');
+  @override
+  late final i0.GeneratedColumn<int> quotaUsageInBytes =
+      i0.GeneratedColumn<int>(
+        'quota_usage_in_bytes',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: false,
+        defaultValue: const i4.Constant(0),
+      );
+  static const i0.VerificationMeta _pinCodeMeta = const i0.VerificationMeta(
+    'pinCode',
+  );
+  @override
+  late final i0.GeneratedColumn<String> pinCode = i0.GeneratedColumn<String>(
+    'pin_code',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<i0.GeneratedColumn> get $columns => [
+    id,
+    name,
+    email,
+    isAdmin,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+    quotaSizeInBytes,
+    quotaUsageInBytes,
+    pinCode,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'auth_user_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.AuthUserEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('name')) {
+      context.handle(
+        _nameMeta,
+        name.isAcceptableOrUnknown(data['name']!, _nameMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('email')) {
+      context.handle(
+        _emailMeta,
+        email.isAcceptableOrUnknown(data['email']!, _emailMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_emailMeta);
+    }
+    if (data.containsKey('is_admin')) {
+      context.handle(
+        _isAdminMeta,
+        isAdmin.isAcceptableOrUnknown(data['is_admin']!, _isAdminMeta),
+      );
+    }
+    if (data.containsKey('has_profile_image')) {
+      context.handle(
+        _hasProfileImageMeta,
+        hasProfileImage.isAcceptableOrUnknown(
+          data['has_profile_image']!,
+          _hasProfileImageMeta,
+        ),
+      );
+    }
+    if (data.containsKey('profile_changed_at')) {
+      context.handle(
+        _profileChangedAtMeta,
+        profileChangedAt.isAcceptableOrUnknown(
+          data['profile_changed_at']!,
+          _profileChangedAtMeta,
+        ),
+      );
+    }
+    if (data.containsKey('quota_size_in_bytes')) {
+      context.handle(
+        _quotaSizeInBytesMeta,
+        quotaSizeInBytes.isAcceptableOrUnknown(
+          data['quota_size_in_bytes']!,
+          _quotaSizeInBytesMeta,
+        ),
+      );
+    }
+    if (data.containsKey('quota_usage_in_bytes')) {
+      context.handle(
+        _quotaUsageInBytesMeta,
+        quotaUsageInBytes.isAcceptableOrUnknown(
+          data['quota_usage_in_bytes']!,
+          _quotaUsageInBytesMeta,
+        ),
+      );
+    }
+    if (data.containsKey('pin_code')) {
+      context.handle(
+        _pinCodeMeta,
+        pinCode.isAcceptableOrUnknown(data['pin_code']!, _pinCodeMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.AuthUserEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.AuthUserEntityData(
+      id: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      email: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}email'],
+      )!,
+      isAdmin: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.bool,
+        data['${effectivePrefix}is_admin'],
+      )!,
+      hasProfileImage: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.bool,
+        data['${effectivePrefix}has_profile_image'],
+      )!,
+      profileChangedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}profile_changed_at'],
+      )!,
+      avatarColor: i1.$AuthUserEntityTable.$converteravatarColor.fromSql(
+        attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int,
+          data['${effectivePrefix}avatar_color'],
+        )!,
+      ),
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}quota_size_in_bytes'],
+      )!,
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}quota_usage_in_bytes'],
+      )!,
+      pinCode: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}pin_code'],
+      ),
+    );
+  }
+
+  @override
+  $AuthUserEntityTable createAlias(String alias) {
+    return $AuthUserEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AvatarColor, int, int> $converteravatarColor =
+      const i0.EnumIndexConverter<i2.AvatarColor>(i2.AvatarColor.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class AuthUserEntityData extends i0.DataClass
+    implements i0.Insertable<i1.AuthUserEntityData> {
+  final String id;
+  final String name;
+  final String email;
+  final bool isAdmin;
+  final bool hasProfileImage;
+  final DateTime profileChangedAt;
+  final i2.AvatarColor avatarColor;
+  final int quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  final String? pinCode;
+  const AuthUserEntityData({
+    required this.id,
+    required this.name,
+    required this.email,
+    required this.isAdmin,
+    required this.hasProfileImage,
+    required this.profileChangedAt,
+    required this.avatarColor,
+    required this.quotaSizeInBytes,
+    required this.quotaUsageInBytes,
+    this.pinCode,
+  });
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['name'] = i0.Variable<String>(name);
+    map['email'] = i0.Variable<String>(email);
+    map['is_admin'] = i0.Variable<bool>(isAdmin);
+    map['has_profile_image'] = i0.Variable<bool>(hasProfileImage);
+    map['profile_changed_at'] = i0.Variable<DateTime>(profileChangedAt);
+    {
+      map['avatar_color'] = i0.Variable<int>(
+        i1.$AuthUserEntityTable.$converteravatarColor.toSql(avatarColor),
+      );
+    }
+    map['quota_size_in_bytes'] = i0.Variable<int>(quotaSizeInBytes);
+    map['quota_usage_in_bytes'] = i0.Variable<int>(quotaUsageInBytes);
+    if (!nullToAbsent || pinCode != null) {
+      map['pin_code'] = i0.Variable<String>(pinCode);
+    }
+    return map;
+  }
+
+  factory AuthUserEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return AuthUserEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      email: serializer.fromJson<String>(json['email']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      hasProfileImage: serializer.fromJson<bool>(json['hasProfileImage']),
+      profileChangedAt: serializer.fromJson<DateTime>(json['profileChangedAt']),
+      avatarColor: i1.$AuthUserEntityTable.$converteravatarColor.fromJson(
+        serializer.fromJson<int>(json['avatarColor']),
+      ),
+      quotaSizeInBytes: serializer.fromJson<int>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+      pinCode: serializer.fromJson<String?>(json['pinCode']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'email': serializer.toJson<String>(email),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'hasProfileImage': serializer.toJson<bool>(hasProfileImage),
+      'profileChangedAt': serializer.toJson<DateTime>(profileChangedAt),
+      'avatarColor': serializer.toJson<int>(
+        i1.$AuthUserEntityTable.$converteravatarColor.toJson(avatarColor),
+      ),
+      'quotaSizeInBytes': serializer.toJson<int>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+      'pinCode': serializer.toJson<String?>(pinCode),
+    };
+  }
+
+  i1.AuthUserEntityData copyWith({
+    String? id,
+    String? name,
+    String? email,
+    bool? isAdmin,
+    bool? hasProfileImage,
+    DateTime? profileChangedAt,
+    i2.AvatarColor? avatarColor,
+    int? quotaSizeInBytes,
+    int? quotaUsageInBytes,
+    i0.Value<String?> pinCode = const i0.Value.absent(),
+  }) => i1.AuthUserEntityData(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    email: email ?? this.email,
+    isAdmin: isAdmin ?? this.isAdmin,
+    hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+    profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+    avatarColor: avatarColor ?? this.avatarColor,
+    quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+    quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    pinCode: pinCode.present ? pinCode.value : this.pinCode,
+  );
+  AuthUserEntityData copyWithCompanion(i1.AuthUserEntityCompanion data) {
+    return AuthUserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      email: data.email.present ? data.email.value : this.email,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      hasProfileImage: data.hasProfileImage.present
+          ? data.hasProfileImage.value
+          : this.hasProfileImage,
+      profileChangedAt: data.profileChangedAt.present
+          ? data.profileChangedAt.value
+          : this.profileChangedAt,
+      avatarColor: data.avatarColor.present
+          ? data.avatarColor.value
+          : this.avatarColor,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+      pinCode: data.pinCode.present ? data.pinCode.value : this.pinCode,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AuthUserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes, ')
+          ..write('pinCode: $pinCode')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    name,
+    email,
+    isAdmin,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+    quotaSizeInBytes,
+    quotaUsageInBytes,
+    pinCode,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.AuthUserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.email == this.email &&
+          other.isAdmin == this.isAdmin &&
+          other.hasProfileImage == this.hasProfileImage &&
+          other.profileChangedAt == this.profileChangedAt &&
+          other.avatarColor == this.avatarColor &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes &&
+          other.pinCode == this.pinCode);
+}
+
+class AuthUserEntityCompanion
+    extends i0.UpdateCompanion<i1.AuthUserEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<String> name;
+  final i0.Value<String> email;
+  final i0.Value<bool> isAdmin;
+  final i0.Value<bool> hasProfileImage;
+  final i0.Value<DateTime> profileChangedAt;
+  final i0.Value<i2.AvatarColor> avatarColor;
+  final i0.Value<int> quotaSizeInBytes;
+  final i0.Value<int> quotaUsageInBytes;
+  final i0.Value<String?> pinCode;
+  const AuthUserEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.name = const i0.Value.absent(),
+    this.email = const i0.Value.absent(),
+    this.isAdmin = const i0.Value.absent(),
+    this.hasProfileImage = const i0.Value.absent(),
+    this.profileChangedAt = const i0.Value.absent(),
+    this.avatarColor = const i0.Value.absent(),
+    this.quotaSizeInBytes = const i0.Value.absent(),
+    this.quotaUsageInBytes = const i0.Value.absent(),
+    this.pinCode = const i0.Value.absent(),
+  });
+  AuthUserEntityCompanion.insert({
+    required String id,
+    required String name,
+    required String email,
+    this.isAdmin = const i0.Value.absent(),
+    this.hasProfileImage = const i0.Value.absent(),
+    this.profileChangedAt = const i0.Value.absent(),
+    required i2.AvatarColor avatarColor,
+    this.quotaSizeInBytes = const i0.Value.absent(),
+    this.quotaUsageInBytes = const i0.Value.absent(),
+    this.pinCode = const i0.Value.absent(),
+  }) : id = i0.Value(id),
+       name = i0.Value(name),
+       email = i0.Value(email),
+       avatarColor = i0.Value(avatarColor);
+  static i0.Insertable<i1.AuthUserEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<String>? name,
+    i0.Expression<String>? email,
+    i0.Expression<bool>? isAdmin,
+    i0.Expression<bool>? hasProfileImage,
+    i0.Expression<DateTime>? profileChangedAt,
+    i0.Expression<int>? avatarColor,
+    i0.Expression<int>? quotaSizeInBytes,
+    i0.Expression<int>? quotaUsageInBytes,
+    i0.Expression<String>? pinCode,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (email != null) 'email': email,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (hasProfileImage != null) 'has_profile_image': hasProfileImage,
+      if (profileChangedAt != null) 'profile_changed_at': profileChangedAt,
+      if (avatarColor != null) 'avatar_color': avatarColor,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+      if (pinCode != null) 'pin_code': pinCode,
+    });
+  }
+
+  i1.AuthUserEntityCompanion copyWith({
+    i0.Value<String>? id,
+    i0.Value<String>? name,
+    i0.Value<String>? email,
+    i0.Value<bool>? isAdmin,
+    i0.Value<bool>? hasProfileImage,
+    i0.Value<DateTime>? profileChangedAt,
+    i0.Value<i2.AvatarColor>? avatarColor,
+    i0.Value<int>? quotaSizeInBytes,
+    i0.Value<int>? quotaUsageInBytes,
+    i0.Value<String?>? pinCode,
+  }) {
+    return i1.AuthUserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      email: email ?? this.email,
+      isAdmin: isAdmin ?? this.isAdmin,
+      hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+      profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+      avatarColor: avatarColor ?? this.avatarColor,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      pinCode: pinCode ?? this.pinCode,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = i0.Variable<String>(name.value);
+    }
+    if (email.present) {
+      map['email'] = i0.Variable<String>(email.value);
+    }
+    if (isAdmin.present) {
+      map['is_admin'] = i0.Variable<bool>(isAdmin.value);
+    }
+    if (hasProfileImage.present) {
+      map['has_profile_image'] = i0.Variable<bool>(hasProfileImage.value);
+    }
+    if (profileChangedAt.present) {
+      map['profile_changed_at'] = i0.Variable<DateTime>(profileChangedAt.value);
+    }
+    if (avatarColor.present) {
+      map['avatar_color'] = i0.Variable<int>(
+        i1.$AuthUserEntityTable.$converteravatarColor.toSql(avatarColor.value),
+      );
+    }
+    if (quotaSizeInBytes.present) {
+      map['quota_size_in_bytes'] = i0.Variable<int>(quotaSizeInBytes.value);
+    }
+    if (quotaUsageInBytes.present) {
+      map['quota_usage_in_bytes'] = i0.Variable<int>(quotaUsageInBytes.value);
+    }
+    if (pinCode.present) {
+      map['pin_code'] = i0.Variable<String>(pinCode.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AuthUserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes, ')
+          ..write('pinCode: $pinCode')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -5,6 +5,7 @@ import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)')
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)')
 class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
   const LocalAssetEntity();
 
@@ -16,6 +17,8 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
 
   IntColumn get orientation => integer().withDefault(const Constant(0))();
 
+  TextColumn get iCloudId => text().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -34,5 +37,6 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     width: width,
     remoteId: null,
     orientation: orientation,
+    cloudId: iCloudId,
   );
 }

mobile/lib/infrastructure/entities/local_asset.entity.drift.dart

@@ -21,6 +21,7 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
+      i0.Value<String?> iCloudId,
     });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
     i1.LocalAssetEntityCompanion Function({
@@ -35,6 +36,7 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
+      i0.Value<String?> iCloudId,
     });
 
 class $$LocalAssetEntityTableFilterComposer
@@ -101,6 +103,11 @@ class $$LocalAssetEntityTableFilterComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnFilters(column),
   );
+
+  i0.ColumnFilters<String> get iCloudId => $composableBuilder(
+    column: $table.iCloudId,
+    builder: (column) => i0.ColumnFilters(column),
+  );
 }
 
 class $$LocalAssetEntityTableOrderingComposer
@@ -166,6 +173,11 @@ class $$LocalAssetEntityTableOrderingComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnOrderings(column),
   );
+
+  i0.ColumnOrderings<String> get iCloudId => $composableBuilder(
+    column: $table.iCloudId,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
 }
 
 class $$LocalAssetEntityTableAnnotationComposer
@@ -215,6 +227,9 @@ class $$LocalAssetEntityTableAnnotationComposer
     column: $table.orientation,
     builder: (column) => column,
   );
+
+  i0.GeneratedColumn<String> get iCloudId =>
+      $composableBuilder(column: $table.iCloudId, builder: (column) => column);
 }
 
 class $$LocalAssetEntityTableTableManager
@@ -268,6 +283,7 @@ class $$LocalAssetEntityTableTableManager
                 i0.Value<String?> checksum = const i0.Value.absent(),
                 i0.Value<bool> isFavorite = const i0.Value.absent(),
                 i0.Value<int> orientation = const i0.Value.absent(),
+                i0.Value<String?> iCloudId = const i0.Value.absent(),
               }) => i1.LocalAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -280,6 +296,7 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                iCloudId: iCloudId,
               ),
           createCompanionCallback:
               ({
@@ -294,6 +311,7 @@ class $$LocalAssetEntityTableTableManager
                 i0.Value<String?> checksum = const i0.Value.absent(),
                 i0.Value<bool> isFavorite = const i0.Value.absent(),
                 i0.Value<int> orientation = const i0.Value.absent(),
+                i0.Value<String?> iCloudId = const i0.Value.absent(),
               }) => i1.LocalAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -306,6 +324,7 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                iCloudId: iCloudId,
               ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -473,6 +492,17 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
     requiredDuringInsert: false,
     defaultValue: const i4.Constant(0),
   );
+  static const i0.VerificationMeta _iCloudIdMeta = const i0.VerificationMeta(
+    'iCloudId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> iCloudId = i0.GeneratedColumn<String>(
+    'i_cloud_id',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
   @override
   List<i0.GeneratedColumn> get $columns => [
     name,
@@ -486,6 +516,7 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
     checksum,
     isFavorite,
     orientation,
+    iCloudId,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -566,6 +597,12 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         ),
       );
     }
+    if (data.containsKey('i_cloud_id')) {
+      context.handle(
+        _iCloudIdMeta,
+        iCloudId.isAcceptableOrUnknown(data['i_cloud_id']!, _iCloudIdMeta),
+      );
+    }
     return context;
   }
 
@@ -624,6 +661,10 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         i0.DriftSqlType.int,
         data['${effectivePrefix}orientation'],
       )!,
+      iCloudId: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}i_cloud_id'],
+      ),
     );
   }
 
@@ -653,6 +694,7 @@ class LocalAssetEntityData extends i0.DataClass
   final String? checksum;
   final bool isFavorite;
   final int orientation;
+  final String? iCloudId;
   const LocalAssetEntityData({
     required this.name,
     required this.type,
@@ -665,6 +707,7 @@ class LocalAssetEntityData extends i0.DataClass
     this.checksum,
     required this.isFavorite,
     required this.orientation,
+    this.iCloudId,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -692,6 +735,9 @@ class LocalAssetEntityData extends i0.DataClass
     }
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
     map['orientation'] = i0.Variable<int>(orientation);
+    if (!nullToAbsent || iCloudId != null) {
+      map['i_cloud_id'] = i0.Variable<String>(iCloudId);
+    }
     return map;
   }
 
@@ -714,6 +760,7 @@ class LocalAssetEntityData extends i0.DataClass
       checksum: serializer.fromJson<String?>(json['checksum']),
       isFavorite: serializer.fromJson<bool>(json['isFavorite']),
       orientation: serializer.fromJson<int>(json['orientation']),
+      iCloudId: serializer.fromJson<String?>(json['iCloudId']),
     );
   }
   @override
@@ -733,6 +780,7 @@ class LocalAssetEntityData extends i0.DataClass
       'checksum': serializer.toJson<String?>(checksum),
       'isFavorite': serializer.toJson<bool>(isFavorite),
       'orientation': serializer.toJson<int>(orientation),
+      'iCloudId': serializer.toJson<String?>(iCloudId),
     };
   }
 
@@ -748,6 +796,7 @@ class LocalAssetEntityData extends i0.DataClass
     i0.Value<String?> checksum = const i0.Value.absent(),
     bool? isFavorite,
     int? orientation,
+    i0.Value<String?> iCloudId = const i0.Value.absent(),
   }) => i1.LocalAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -762,6 +811,7 @@ class LocalAssetEntityData extends i0.DataClass
     checksum: checksum.present ? checksum.value : this.checksum,
     isFavorite: isFavorite ?? this.isFavorite,
     orientation: orientation ?? this.orientation,
+    iCloudId: iCloudId.present ? iCloudId.value : this.iCloudId,
   );
   LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
     return LocalAssetEntityData(
@@ -782,6 +832,7 @@ class LocalAssetEntityData extends i0.DataClass
       orientation: data.orientation.present
           ? data.orientation.value
           : this.orientation,
+      iCloudId: data.iCloudId.present ? data.iCloudId.value : this.iCloudId,
     );
   }
 
@@ -798,7 +849,8 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('iCloudId: $iCloudId')
           ..write(')'))
         .toString();
   }
@@ -816,6 +868,7 @@ class LocalAssetEntityData extends i0.DataClass
     checksum,
     isFavorite,
     orientation,
+    iCloudId,
   );
   @override
   bool operator ==(Object other) =>
@@ -831,7 +884,8 @@ class LocalAssetEntityData extends i0.DataClass
           other.id == this.id &&
           other.checksum == this.checksum &&
           other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation);
+          other.orientation == this.orientation &&
+          other.iCloudId == this.iCloudId);
 }
 
 class LocalAssetEntityCompanion
@@ -847,6 +901,7 @@ class LocalAssetEntityCompanion
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
   final i0.Value<int> orientation;
+  final i0.Value<String?> iCloudId;
   const LocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -859,6 +914,7 @@ class LocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
+    this.iCloudId = const i0.Value.absent(),
   });
   LocalAssetEntityCompanion.insert({
     required String name,
@@ -872,6 +928,7 @@ class LocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
+    this.iCloudId = const i0.Value.absent(),
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id);
@@ -887,6 +944,7 @@ class LocalAssetEntityCompanion
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
     i0.Expression<int>? orientation,
+    i0.Expression<String>? iCloudId,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -900,6 +958,7 @@ class LocalAssetEntityCompanion
       if (checksum != null) 'checksum': checksum,
       if (isFavorite != null) 'is_favorite': isFavorite,
       if (orientation != null) 'orientation': orientation,
+      if (iCloudId != null) 'i_cloud_id': iCloudId,
     });
   }
 
@@ -915,6 +974,7 @@ class LocalAssetEntityCompanion
     i0.Value<String?>? checksum,
     i0.Value<bool>? isFavorite,
     i0.Value<int>? orientation,
+    i0.Value<String?>? iCloudId,
   }) {
     return i1.LocalAssetEntityCompanion(
       name: name ?? this.name,
@@ -928,6 +988,7 @@ class LocalAssetEntityCompanion
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
+      iCloudId: iCloudId ?? this.iCloudId,
     );
   }
 
@@ -969,6 +1030,9 @@ class LocalAssetEntityCompanion
     if (orientation.present) {
       map['orientation'] = i0.Variable<int>(orientation.value);
     }
+    if (iCloudId.present) {
+      map['i_cloud_id'] = i0.Variable<String>(iCloudId.value);
+    }
     return map;
   }
 
@@ -985,8 +1049,14 @@ class LocalAssetEntityCompanion
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('iCloudId: $iCloudId')
           ..write(')'))
         .toString();
   }
 }
+
+i0.Index get idxLocalAssetCloudId => i0.Index(
+  'idx_local_asset_cloud_id',
+  'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+);

mobile/lib/infrastructure/entities/merged_asset.drift

@@ -21,7 +21,8 @@ SELECT
 	rae.owner_id,
 	rae.live_photo_video_id,
 	0 as orientation,
-	rae.stack_id
+	rae.stack_id,
+	NULL as i_cloud_id
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -53,7 +54,8 @@ SELECT
 	NULL as owner_id,
 	NULL as live_photo_video_id,
 	lae.orientation,
-	NULL as stack_id
+	NULL as stack_id,
+	lae.i_cloud_id
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (

mobile/lib/infrastructure/entities/merged_asset.drift.dart

@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     );
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
       variables: [
         for (var $ in userIds) i0.Variable<String>($),
         ...generatedlimit.introducedVariables,
@@ -62,6 +62,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
         livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
         orientation: row.read<int>('orientation'),
         stackId: row.readNullable<String>('stack_id'),
+        iCloudId: row.readNullable<String>('i_cloud_id'),
       ),
     );
   }
@@ -129,6 +130,7 @@ class MergedAssetResult {
   final String? livePhotoVideoId;
   final int orientation;
   final String? stackId;
+  final String? iCloudId;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -146,6 +148,7 @@ class MergedAssetResult {
     this.livePhotoVideoId,
     required this.orientation,
     this.stackId,
+    this.iCloudId,
   });
 }
 

mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart

@@ -0,0 +1,12 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAssetCloudIdEntity extends Table with DriftDefaultsMixin {
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get cloudId => text().unique().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {assetId};
+}

mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart

@@ -0,0 +1,548 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+
+typedef $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder =
+    i1.RemoteAssetCloudIdEntityCompanion Function({
+      required String assetId,
+      i0.Value<String?> cloudId,
+    });
+typedef $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder =
+    i1.RemoteAssetCloudIdEntityCompanion Function({
+      i0.Value<String> assetId,
+      i0.Value<String?> cloudId,
+    });
+
+final class $$RemoteAssetCloudIdEntityTableReferences
+    extends
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$RemoteAssetCloudIdEntityTable,
+          i1.RemoteAssetCloudIdEntityData
+        > {
+  $$RemoteAssetCloudIdEntityTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(
+            i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAssetCloudIdEntityTable>(
+                    'remote_asset_cloud_id_entity',
+                  )
+                  .assetId,
+              i4.ReadDatabaseContainer(
+                db,
+              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+            ),
+          );
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+          $_db,
+          i4.ReadDatabaseContainer(
+            $_db,
+          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        )
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$RemoteAssetCloudIdEntityTableFilterComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
+  $$RemoteAssetCloudIdEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get cloudId => $composableBuilder(
+    column: $table.cloudId,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.assetId,
+      referencedTable: i4.ReadDatabaseContainer(
+        $db,
+      ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+      getReferencedColumn: (t) => t.id,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => i3.$$RemoteAssetEntityTableFilterComposer(
+            $db: $db,
+            $table: i4.ReadDatabaseContainer(
+              $db,
+            ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$RemoteAssetCloudIdEntityTableOrderingComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
+  $$RemoteAssetCloudIdEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get cloudId => $composableBuilder(
+    column: $table.cloudId,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.assetId,
+          referencedTable: i4.ReadDatabaseContainer(
+            $db,
+          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+          getReferencedColumn: (t) => t.id,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => i3.$$RemoteAssetEntityTableOrderingComposer(
+                $db: $db,
+                $table: i4.ReadDatabaseContainer(
+                  $db,
+                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
+}
+
+class $$RemoteAssetCloudIdEntityTableAnnotationComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
+  $$RemoteAssetCloudIdEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get cloudId =>
+      $composableBuilder(column: $table.cloudId, builder: (column) => column);
+
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.assetId,
+          referencedTable: i4.ReadDatabaseContainer(
+            $db,
+          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+          getReferencedColumn: (t) => t.id,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => i3.$$RemoteAssetEntityTableAnnotationComposer(
+                $db: $db,
+                $table: i4.ReadDatabaseContainer(
+                  $db,
+                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
+}
+
+class $$RemoteAssetCloudIdEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$RemoteAssetCloudIdEntityTable,
+          i1.RemoteAssetCloudIdEntityData,
+          i1.$$RemoteAssetCloudIdEntityTableFilterComposer,
+          i1.$$RemoteAssetCloudIdEntityTableOrderingComposer,
+          i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer,
+          $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder,
+          $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder,
+          (
+            i1.RemoteAssetCloudIdEntityData,
+            i1.$$RemoteAssetCloudIdEntityTableReferences,
+          ),
+          i1.RemoteAssetCloudIdEntityData,
+          i0.PrefetchHooks Function({bool assetId})
+        > {
+  $$RemoteAssetCloudIdEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$RemoteAssetCloudIdEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAssetCloudIdEntityTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              i1.$$RemoteAssetCloudIdEntityTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> assetId = const i0.Value.absent(),
+                i0.Value<String?> cloudId = const i0.Value.absent(),
+              }) => i1.RemoteAssetCloudIdEntityCompanion(
+                assetId: assetId,
+                cloudId: cloudId,
+              ),
+          createCompanionCallback:
+              ({
+                required String assetId,
+                i0.Value<String?> cloudId = const i0.Value.absent(),
+              }) => i1.RemoteAssetCloudIdEntityCompanion.insert(
+                assetId: assetId,
+                cloudId: cloudId,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  i1.$$RemoteAssetCloudIdEntityTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({assetId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (assetId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.assetId,
+                                referencedTable: i1
+                                    .$$RemoteAssetCloudIdEntityTableReferences
+                                    ._assetIdTable(db),
+                                referencedColumn: i1
+                                    .$$RemoteAssetCloudIdEntityTableReferences
+                                    ._assetIdTable(db)
+                                    .id,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$RemoteAssetCloudIdEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$RemoteAssetCloudIdEntityTable,
+      i1.RemoteAssetCloudIdEntityData,
+      i1.$$RemoteAssetCloudIdEntityTableFilterComposer,
+      i1.$$RemoteAssetCloudIdEntityTableOrderingComposer,
+      i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer,
+      $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder,
+      $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder,
+      (
+        i1.RemoteAssetCloudIdEntityData,
+        i1.$$RemoteAssetCloudIdEntityTableReferences,
+      ),
+      i1.RemoteAssetCloudIdEntityData,
+      i0.PrefetchHooks Function({bool assetId})
+    >;
+
+class $RemoteAssetCloudIdEntityTable extends i2.RemoteAssetCloudIdEntity
+    with
+        i0.TableInfo<
+          $RemoteAssetCloudIdEntityTable,
+          i1.RemoteAssetCloudIdEntityData
+        > {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAssetCloudIdEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta = const i0.VerificationMeta(
+    'assetId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  static const i0.VerificationMeta _cloudIdMeta = const i0.VerificationMeta(
+    'cloudId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> cloudId = i0.GeneratedColumn<String>(
+    'cloud_id',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways('UNIQUE'),
+  );
+  @override
+  List<i0.GeneratedColumn> get $columns => [assetId, cloudId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_asset_cloud_id_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.RemoteAssetCloudIdEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('asset_id')) {
+      context.handle(
+        _assetIdMeta,
+        assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('cloud_id')) {
+      context.handle(
+        _cloudIdMeta,
+        cloudId.isAcceptableOrUnknown(data['cloud_id']!, _cloudIdMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {assetId};
+  @override
+  i1.RemoteAssetCloudIdEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAssetCloudIdEntityData(
+      assetId: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      cloudId: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}cloud_id'],
+      ),
+    );
+  }
+
+  @override
+  $RemoteAssetCloudIdEntityTable createAlias(String alias) {
+    return $RemoteAssetCloudIdEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAssetCloudIdEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAssetCloudIdEntityData> {
+  final String assetId;
+  final String? cloudId;
+  const RemoteAssetCloudIdEntityData({required this.assetId, this.cloudId});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['asset_id'] = i0.Variable<String>(assetId);
+    if (!nullToAbsent || cloudId != null) {
+      map['cloud_id'] = i0.Variable<String>(cloudId);
+    }
+    return map;
+  }
+
+  factory RemoteAssetCloudIdEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAssetCloudIdEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      cloudId: serializer.fromJson<String?>(json['cloudId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'cloudId': serializer.toJson<String?>(cloudId),
+    };
+  }
+
+  i1.RemoteAssetCloudIdEntityData copyWith({
+    String? assetId,
+    i0.Value<String?> cloudId = const i0.Value.absent(),
+  }) => i1.RemoteAssetCloudIdEntityData(
+    assetId: assetId ?? this.assetId,
+    cloudId: cloudId.present ? cloudId.value : this.cloudId,
+  );
+  RemoteAssetCloudIdEntityData copyWithCompanion(
+    i1.RemoteAssetCloudIdEntityCompanion data,
+  ) {
+    return RemoteAssetCloudIdEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      cloudId: data.cloudId.present ? data.cloudId.value : this.cloudId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetCloudIdEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('cloudId: $cloudId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, cloudId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.RemoteAssetCloudIdEntityData &&
+          other.assetId == this.assetId &&
+          other.cloudId == this.cloudId);
+}
+
+class RemoteAssetCloudIdEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAssetCloudIdEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String?> cloudId;
+  const RemoteAssetCloudIdEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.cloudId = const i0.Value.absent(),
+  });
+  RemoteAssetCloudIdEntityCompanion.insert({
+    required String assetId,
+    this.cloudId = const i0.Value.absent(),
+  }) : assetId = i0.Value(assetId);
+  static i0.Insertable<i1.RemoteAssetCloudIdEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? cloudId,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (cloudId != null) 'cloud_id': cloudId,
+    });
+  }
+
+  i1.RemoteAssetCloudIdEntityCompanion copyWith({
+    i0.Value<String>? assetId,
+    i0.Value<String?>? cloudId,
+  }) {
+    return i1.RemoteAssetCloudIdEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      cloudId: cloudId ?? this.cloudId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (cloudId.present) {
+      map['cloud_id'] = i0.Variable<String>(cloudId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetCloudIdEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('cloudId: $cloudId')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/user.entity.dart

@@ -1,6 +1,5 @@
 import 'package:drift/drift.dart' hide Index;
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:isar/isar.dart';
@@ -44,7 +43,7 @@ class User {
 
   static User fromDto(UserDto dto) => User(
     id: dto.id,
-    updatedAt: dto.updatedAt,
+    updatedAt: dto.updatedAt ?? DateTime(2025),
     email: dto.email,
     name: dto.name,
     isAdmin: dto.isAdmin,
@@ -81,13 +80,12 @@ class UserEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get id => text()();
   TextColumn get name => text()();
-  BoolColumn get isAdmin => boolean().withDefault(const Constant(false))();
   TextColumn get email => text()();
 
+  // Profile image
   BoolColumn get hasProfileImage => boolean().withDefault(const Constant(false))();
   DateTimeColumn get profileChangedAt => dateTime().withDefault(currentDateAndTime)();
-
-  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+  IntColumn get avatarColor => intEnum<AvatarColor>().withDefault(const Constant(0))();
 
   @override
   Set<Column> get primaryKey => {id};

mobile/lib/infrastructure/entities/user.entity.drift.dart

@@ -3,28 +3,27 @@
 import 'package:drift/drift.dart' as i0;
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
     as i1;
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as i2;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+import 'package:immich_mobile/domain/models/user.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
 
 typedef $$UserEntityTableCreateCompanionBuilder =
     i1.UserEntityCompanion Function({
       required String id,
       required String name,
-      i0.Value<bool> isAdmin,
       required String email,
       i0.Value<bool> hasProfileImage,
       i0.Value<DateTime> profileChangedAt,
-      i0.Value<DateTime> updatedAt,
+      i0.Value<i2.AvatarColor> avatarColor,
     });
 typedef $$UserEntityTableUpdateCompanionBuilder =
     i1.UserEntityCompanion Function({
       i0.Value<String> id,
       i0.Value<String> name,
-      i0.Value<bool> isAdmin,
       i0.Value<String> email,
       i0.Value<bool> hasProfileImage,
       i0.Value<DateTime> profileChangedAt,
-      i0.Value<DateTime> updatedAt,
+      i0.Value<i2.AvatarColor> avatarColor,
     });
 
 class $$UserEntityTableFilterComposer
@@ -46,11 +45,6 @@ class $$UserEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
-  i0.ColumnFilters<bool> get isAdmin => $composableBuilder(
-    column: $table.isAdmin,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
   i0.ColumnFilters<String> get email => $composableBuilder(
     column: $table.email,
     builder: (column) => i0.ColumnFilters(column),
@@ -66,9 +60,10 @@ class $$UserEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
-  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
-    builder: (column) => i0.ColumnFilters(column),
+  i0.ColumnWithTypeConverterFilters<i2.AvatarColor, i2.AvatarColor, int>
+  get avatarColor => $composableBuilder(
+    column: $table.avatarColor,
+    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
   );
 }
 
@@ -91,11 +86,6 @@ class $$UserEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
-  i0.ColumnOrderings<bool> get isAdmin => $composableBuilder(
-    column: $table.isAdmin,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
   i0.ColumnOrderings<String> get email => $composableBuilder(
     column: $table.email,
     builder: (column) => i0.ColumnOrderings(column),
@@ -111,8 +101,8 @@ class $$UserEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
-  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
-    column: $table.updatedAt,
+  i0.ColumnOrderings<int> get avatarColor => $composableBuilder(
+    column: $table.avatarColor,
     builder: (column) => i0.ColumnOrderings(column),
   );
 }
@@ -132,9 +122,6 @@ class $$UserEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get name =>
       $composableBuilder(column: $table.name, builder: (column) => column);
 
-  i0.GeneratedColumn<bool> get isAdmin =>
-      $composableBuilder(column: $table.isAdmin, builder: (column) => column);
-
   i0.GeneratedColumn<String> get email =>
       $composableBuilder(column: $table.email, builder: (column) => column);
 
@@ -148,8 +135,11 @@ class $$UserEntityTableAnnotationComposer
     builder: (column) => column,
   );
 
-  i0.GeneratedColumn<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+  i0.GeneratedColumnWithTypeConverter<i2.AvatarColor, int> get avatarColor =>
+      $composableBuilder(
+        column: $table.avatarColor,
+        builder: (column) => column,
+      );
 }
 
 class $$UserEntityTableTableManager
@@ -191,37 +181,33 @@ class $$UserEntityTableTableManager
               ({
                 i0.Value<String> id = const i0.Value.absent(),
                 i0.Value<String> name = const i0.Value.absent(),
-                i0.Value<bool> isAdmin = const i0.Value.absent(),
                 i0.Value<String> email = const i0.Value.absent(),
                 i0.Value<bool> hasProfileImage = const i0.Value.absent(),
                 i0.Value<DateTime> profileChangedAt = const i0.Value.absent(),
-                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+                i0.Value<i2.AvatarColor> avatarColor = const i0.Value.absent(),
               }) => i1.UserEntityCompanion(
                 id: id,
                 name: name,
-                isAdmin: isAdmin,
                 email: email,
                 hasProfileImage: hasProfileImage,
                 profileChangedAt: profileChangedAt,
-                updatedAt: updatedAt,
+                avatarColor: avatarColor,
               ),
           createCompanionCallback:
               ({
                 required String id,
                 required String name,
-                i0.Value<bool> isAdmin = const i0.Value.absent(),
                 required String email,
                 i0.Value<bool> hasProfileImage = const i0.Value.absent(),
                 i0.Value<DateTime> profileChangedAt = const i0.Value.absent(),
-                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+                i0.Value<i2.AvatarColor> avatarColor = const i0.Value.absent(),
               }) => i1.UserEntityCompanion.insert(
                 id: id,
                 name: name,
-                isAdmin: isAdmin,
                 email: email,
                 hasProfileImage: hasProfileImage,
                 profileChangedAt: profileChangedAt,
-                updatedAt: updatedAt,
+                avatarColor: avatarColor,
               ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -253,7 +239,7 @@ typedef $$UserEntityTableProcessedTableManager =
       i0.PrefetchHooks Function()
     >;
 
-class $UserEntityTable extends i2.UserEntity
+class $UserEntityTable extends i3.UserEntity
     with i0.TableInfo<$UserEntityTable, i1.UserEntityData> {
   @override
   final i0.GeneratedDatabase attachedDatabase;
@@ -279,21 +265,6 @@ class $UserEntityTable extends i2.UserEntity
     type: i0.DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const i0.VerificationMeta _isAdminMeta = const i0.VerificationMeta(
-    'isAdmin',
-  );
-  @override
-  late final i0.GeneratedColumn<bool> isAdmin = i0.GeneratedColumn<bool>(
-    'is_admin',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.bool,
-    requiredDuringInsert: false,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-      'CHECK ("is_admin" IN (0, 1))',
-    ),
-    defaultValue: const i3.Constant(false),
-  );
   static const i0.VerificationMeta _emailMeta = const i0.VerificationMeta(
     'email',
   );
@@ -318,7 +289,7 @@ class $UserEntityTable extends i2.UserEntity
         defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
           'CHECK ("has_profile_image" IN (0, 1))',
         ),
-        defaultValue: const i3.Constant(false),
+        defaultValue: const i4.Constant(false),
       );
   static const i0.VerificationMeta _profileChangedAtMeta =
       const i0.VerificationMeta('profileChangedAt');
@@ -330,30 +301,26 @@ class $UserEntityTable extends i2.UserEntity
         false,
         type: i0.DriftSqlType.dateTime,
         requiredDuringInsert: false,
-        defaultValue: i3.currentDateAndTime,
+        defaultValue: i4.currentDateAndTime,
       );
-  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
-    'updatedAt',
-  );
   @override
-  late final i0.GeneratedColumn<DateTime> updatedAt =
-      i0.GeneratedColumn<DateTime>(
-        'updated_at',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-        defaultValue: i3.currentDateAndTime,
-      );
+  late final i0.GeneratedColumnWithTypeConverter<i2.AvatarColor, int>
+  avatarColor = i0.GeneratedColumn<int>(
+    'avatar_color',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const i4.Constant(0),
+  ).withConverter<i2.AvatarColor>(i1.$UserEntityTable.$converteravatarColor);
   @override
   List<i0.GeneratedColumn> get $columns => [
     id,
     name,
-    isAdmin,
     email,
     hasProfileImage,
     profileChangedAt,
-    updatedAt,
+    avatarColor,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -380,12 +347,6 @@ class $UserEntityTable extends i2.UserEntity
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
-    if (data.containsKey('is_admin')) {
-      context.handle(
-        _isAdminMeta,
-        isAdmin.isAcceptableOrUnknown(data['is_admin']!, _isAdminMeta),
-      );
-    }
     if (data.containsKey('email')) {
       context.handle(
         _emailMeta,
@@ -412,12 +373,6 @@ class $UserEntityTable extends i2.UserEntity
         ),
       );
     }
-    if (data.containsKey('updated_at')) {
-      context.handle(
-        _updatedAtMeta,
-        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
-      );
-    }
     return context;
   }
 
@@ -435,10 +390,6 @@ class $UserEntityTable extends i2.UserEntity
         i0.DriftSqlType.string,
         data['${effectivePrefix}name'],
       )!,
-      isAdmin: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.bool,
-        data['${effectivePrefix}is_admin'],
-      )!,
       email: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.string,
         data['${effectivePrefix}email'],
@@ -451,10 +402,12 @@ class $UserEntityTable extends i2.UserEntity
         i0.DriftSqlType.dateTime,
         data['${effectivePrefix}profile_changed_at'],
       )!,
-      updatedAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}updated_at'],
-      )!,
+      avatarColor: i1.$UserEntityTable.$converteravatarColor.fromSql(
+        attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int,
+          data['${effectivePrefix}avatar_color'],
+        )!,
+      ),
     );
   }
 
@@ -463,6 +416,8 @@ class $UserEntityTable extends i2.UserEntity
     return $UserEntityTable(attachedDatabase, alias);
   }
 
+  static i0.JsonTypeConverter2<i2.AvatarColor, int, int> $converteravatarColor =
+      const i0.EnumIndexConverter<i2.AvatarColor>(i2.AvatarColor.values);
   @override
   bool get withoutRowId => true;
   @override
@@ -473,30 +428,31 @@ class UserEntityData extends i0.DataClass
     implements i0.Insertable<i1.UserEntityData> {
   final String id;
   final String name;
-  final bool isAdmin;
   final String email;
   final bool hasProfileImage;
   final DateTime profileChangedAt;
-  final DateTime updatedAt;
+  final i2.AvatarColor avatarColor;
   const UserEntityData({
     required this.id,
     required this.name,
-    required this.isAdmin,
     required this.email,
     required this.hasProfileImage,
     required this.profileChangedAt,
-    required this.updatedAt,
+    required this.avatarColor,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
     map['id'] = i0.Variable<String>(id);
     map['name'] = i0.Variable<String>(name);
-    map['is_admin'] = i0.Variable<bool>(isAdmin);
     map['email'] = i0.Variable<String>(email);
     map['has_profile_image'] = i0.Variable<bool>(hasProfileImage);
     map['profile_changed_at'] = i0.Variable<DateTime>(profileChangedAt);
-    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    {
+      map['avatar_color'] = i0.Variable<int>(
+        i1.$UserEntityTable.$converteravatarColor.toSql(avatarColor),
+      );
+    }
     return map;
   }
 
@@ -508,11 +464,12 @@ class UserEntityData extends i0.DataClass
     return UserEntityData(
       id: serializer.fromJson<String>(json['id']),
       name: serializer.fromJson<String>(json['name']),
-      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
       email: serializer.fromJson<String>(json['email']),
       hasProfileImage: serializer.fromJson<bool>(json['hasProfileImage']),
       profileChangedAt: serializer.fromJson<DateTime>(json['profileChangedAt']),
-      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      avatarColor: i1.$UserEntityTable.$converteravatarColor.fromJson(
+        serializer.fromJson<int>(json['avatarColor']),
+      ),
     );
   }
   @override
@@ -521,36 +478,34 @@ class UserEntityData extends i0.DataClass
     return <String, dynamic>{
       'id': serializer.toJson<String>(id),
       'name': serializer.toJson<String>(name),
-      'isAdmin': serializer.toJson<bool>(isAdmin),
       'email': serializer.toJson<String>(email),
       'hasProfileImage': serializer.toJson<bool>(hasProfileImage),
       'profileChangedAt': serializer.toJson<DateTime>(profileChangedAt),
-      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'avatarColor': serializer.toJson<int>(
+        i1.$UserEntityTable.$converteravatarColor.toJson(avatarColor),
+      ),
     };
   }
 
   i1.UserEntityData copyWith({
     String? id,
     String? name,
-    bool? isAdmin,
     String? email,
     bool? hasProfileImage,
     DateTime? profileChangedAt,
-    DateTime? updatedAt,
+    i2.AvatarColor? avatarColor,
   }) => i1.UserEntityData(
     id: id ?? this.id,
     name: name ?? this.name,
-    isAdmin: isAdmin ?? this.isAdmin,
     email: email ?? this.email,
     hasProfileImage: hasProfileImage ?? this.hasProfileImage,
     profileChangedAt: profileChangedAt ?? this.profileChangedAt,
-    updatedAt: updatedAt ?? this.updatedAt,
+    avatarColor: avatarColor ?? this.avatarColor,
   );
   UserEntityData copyWithCompanion(i1.UserEntityCompanion data) {
     return UserEntityData(
       id: data.id.present ? data.id.value : this.id,
       name: data.name.present ? data.name.value : this.name,
-      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
       email: data.email.present ? data.email.value : this.email,
       hasProfileImage: data.hasProfileImage.present
           ? data.hasProfileImage.value
@@ -558,7 +513,9 @@ class UserEntityData extends i0.DataClass
       profileChangedAt: data.profileChangedAt.present
           ? data.profileChangedAt.value
           : this.profileChangedAt,
-      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      avatarColor: data.avatarColor.present
+          ? data.avatarColor.value
+          : this.avatarColor,
     );
   }
 
@@ -567,11 +524,10 @@ class UserEntityData extends i0.DataClass
     return (StringBuffer('UserEntityData(')
           ..write('id: $id, ')
           ..write('name: $name, ')
-          ..write('isAdmin: $isAdmin, ')
           ..write('email: $email, ')
           ..write('hasProfileImage: $hasProfileImage, ')
           ..write('profileChangedAt: $profileChangedAt, ')
-          ..write('updatedAt: $updatedAt')
+          ..write('avatarColor: $avatarColor')
           ..write(')'))
         .toString();
   }
@@ -580,11 +536,10 @@ class UserEntityData extends i0.DataClass
   int get hashCode => Object.hash(
     id,
     name,
-    isAdmin,
     email,
     hasProfileImage,
     profileChangedAt,
-    updatedAt,
+    avatarColor,
   );
   @override
   bool operator ==(Object other) =>
@@ -592,78 +547,70 @@ class UserEntityData extends i0.DataClass
       (other is i1.UserEntityData &&
           other.id == this.id &&
           other.name == this.name &&
-          other.isAdmin == this.isAdmin &&
           other.email == this.email &&
           other.hasProfileImage == this.hasProfileImage &&
           other.profileChangedAt == this.profileChangedAt &&
-          other.updatedAt == this.updatedAt);
+          other.avatarColor == this.avatarColor);
 }
 
 class UserEntityCompanion extends i0.UpdateCompanion<i1.UserEntityData> {
   final i0.Value<String> id;
   final i0.Value<String> name;
-  final i0.Value<bool> isAdmin;
   final i0.Value<String> email;
   final i0.Value<bool> hasProfileImage;
   final i0.Value<DateTime> profileChangedAt;
-  final i0.Value<DateTime> updatedAt;
+  final i0.Value<i2.AvatarColor> avatarColor;
   const UserEntityCompanion({
     this.id = const i0.Value.absent(),
     this.name = const i0.Value.absent(),
-    this.isAdmin = const i0.Value.absent(),
     this.email = const i0.Value.absent(),
     this.hasProfileImage = const i0.Value.absent(),
     this.profileChangedAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
+    this.avatarColor = const i0.Value.absent(),
   });
   UserEntityCompanion.insert({
     required String id,
     required String name,
-    this.isAdmin = const i0.Value.absent(),
     required String email,
     this.hasProfileImage = const i0.Value.absent(),
     this.profileChangedAt = const i0.Value.absent(),
-    this.updatedAt = const i0.Value.absent(),
+    this.avatarColor = const i0.Value.absent(),
   }) : id = i0.Value(id),
        name = i0.Value(name),
        email = i0.Value(email);
   static i0.Insertable<i1.UserEntityData> custom({
     i0.Expression<String>? id,
     i0.Expression<String>? name,
-    i0.Expression<bool>? isAdmin,
     i0.Expression<String>? email,
     i0.Expression<bool>? hasProfileImage,
     i0.Expression<DateTime>? profileChangedAt,
-    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<int>? avatarColor,
   }) {
     return i0.RawValuesInsertable({
       if (id != null) 'id': id,
       if (name != null) 'name': name,
-      if (isAdmin != null) 'is_admin': isAdmin,
       if (email != null) 'email': email,
       if (hasProfileImage != null) 'has_profile_image': hasProfileImage,
       if (profileChangedAt != null) 'profile_changed_at': profileChangedAt,
-      if (updatedAt != null) 'updated_at': updatedAt,
+      if (avatarColor != null) 'avatar_color': avatarColor,
     });
   }
 
   i1.UserEntityCompanion copyWith({
     i0.Value<String>? id,
     i0.Value<String>? name,
-    i0.Value<bool>? isAdmin,
     i0.Value<String>? email,
     i0.Value<bool>? hasProfileImage,
     i0.Value<DateTime>? profileChangedAt,
-    i0.Value<DateTime>? updatedAt,
+    i0.Value<i2.AvatarColor>? avatarColor,
   }) {
     return i1.UserEntityCompanion(
       id: id ?? this.id,
       name: name ?? this.name,
-      isAdmin: isAdmin ?? this.isAdmin,
       email: email ?? this.email,
       hasProfileImage: hasProfileImage ?? this.hasProfileImage,
       profileChangedAt: profileChangedAt ?? this.profileChangedAt,
-      updatedAt: updatedAt ?? this.updatedAt,
+      avatarColor: avatarColor ?? this.avatarColor,
     );
   }
 
@@ -676,9 +623,6 @@ class UserEntityCompanion extends i0.UpdateCompanion<i1.UserEntityData> {
     if (name.present) {
       map['name'] = i0.Variable<String>(name.value);
     }
-    if (isAdmin.present) {
-      map['is_admin'] = i0.Variable<bool>(isAdmin.value);
-    }
     if (email.present) {
       map['email'] = i0.Variable<String>(email.value);
     }
@@ -688,8 +632,10 @@ class UserEntityCompanion extends i0.UpdateCompanion<i1.UserEntityData> {
     if (profileChangedAt.present) {
       map['profile_changed_at'] = i0.Variable<DateTime>(profileChangedAt.value);
     }
-    if (updatedAt.present) {
-      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    if (avatarColor.present) {
+      map['avatar_color'] = i0.Variable<int>(
+        i1.$UserEntityTable.$converteravatarColor.toSql(avatarColor.value),
+      );
     }
     return map;
   }
@@ -699,11 +645,10 @@ class UserEntityCompanion extends i0.UpdateCompanion<i1.UserEntityData> {
     return (StringBuffer('UserEntityCompanion(')
           ..write('id: $id, ')
           ..write('name: $name, ')
-          ..write('isAdmin: $isAdmin, ')
           ..write('email: $email, ')
           ..write('hasProfileImage: $hasProfileImage, ')
           ..write('profileChangedAt: $profileChangedAt, ')
-          ..write('updatedAt: $updatedAt')
+          ..write('avatarColor: $avatarColor')
           ..write(')'))
         .toString();
   }

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -5,6 +5,7 @@ import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
@@ -17,6 +18,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
@@ -43,6 +45,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
 
 @DriftDatabase(
   tables: [
+    AuthUserEntity,
     UserEntity,
     UserMetadataEntity,
     PartnerEntity,
@@ -54,6 +57,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumEntity,
     RemoteAlbumAssetEntity,
     RemoteAlbumUserEntity,
+    RemoteAssetCloudIdEntity,
     MemoryEntity,
     MemoryAssetEntity,
     StackEntity,
@@ -68,7 +72,7 @@ class Drift extends $Drift implements IDatabaseRepository {
     : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
 
   @override
-  int get schemaVersion => 9;
+  int get schemaVersion => 11;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -126,6 +130,17 @@ class Drift extends $Drift implements IDatabaseRepository {
           from8To9: (m, v9) async {
             await m.addColumn(v9.localAlbumEntity, v9.localAlbumEntity.linkedRemoteAlbumId);
           },
+          from9To10: (m, v10) async {
+            await m.createTable(v10.authUserEntity);
+            await m.addColumn(v10.userEntity, v10.userEntity.avatarColor);
+            await m.alterTable(TableMigration(v10.userEntity));
+          },
+          from10To11: (m, v11) async {
+            // Add i_cloud_id to local and remote asset tables
+            await m.addColumn(v11.localAssetEntity, v11.localAssetEntity.iCloudId);
+            await m.createIndex(v11.idxLocalAssetCloudId);
+            await m.createTable(v11.remoteAssetCloudIdEntity);
+          },
         ),
       );
 
@@ -141,7 +156,7 @@ class Drift extends $Drift implements IDatabaseRepository {
       await customStatement('PRAGMA foreign_keys = ON');
       await customStatement('PRAGMA synchronous = NORMAL');
       await customStatement('PRAGMA journal_mode = WAL');
-      await customStatement('PRAGMA busy_timeout = 500');
+      await customStatement('PRAGMA busy_timeout = 30000');
     },
   );
 }

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -15,29 +15,33 @@ import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.d
     as i6;
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
     as i7;
-import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart'
     as i8;
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
     as i9;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
     as i10;
-import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
     as i11;
-import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
     as i12;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
     as i13;
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart'
     as i14;
-import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
     as i15;
-import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
     as i16;
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
     as i17;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
     as i18;
-import 'package:drift/internal/modular.dart' as i19;
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
+    as i19;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i20;
+import 'package:drift/internal/modular.dart' as i21;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -54,27 +58,32 @@ abstract class $Drift extends i0.GeneratedDatabase {
       .$LocalAlbumEntityTable(this);
   late final i7.$LocalAlbumAssetEntityTable localAlbumAssetEntity = i7
       .$LocalAlbumAssetEntityTable(this);
-  late final i8.$UserMetadataEntityTable userMetadataEntity = i8
-      .$UserMetadataEntityTable(this);
-  late final i9.$PartnerEntityTable partnerEntity = i9.$PartnerEntityTable(
+  late final i8.$AuthUserEntityTable authUserEntity = i8.$AuthUserEntityTable(
     this,
   );
-  late final i10.$RemoteExifEntityTable remoteExifEntity = i10
-      .$RemoteExifEntityTable(this);
-  late final i11.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity = i11
-      .$RemoteAlbumAssetEntityTable(this);
-  late final i12.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i12
-      .$RemoteAlbumUserEntityTable(this);
-  late final i13.$MemoryEntityTable memoryEntity = i13.$MemoryEntityTable(this);
-  late final i14.$MemoryAssetEntityTable memoryAssetEntity = i14
-      .$MemoryAssetEntityTable(this);
-  late final i15.$PersonEntityTable personEntity = i15.$PersonEntityTable(this);
-  late final i16.$AssetFaceEntityTable assetFaceEntity = i16
-      .$AssetFaceEntityTable(this);
-  late final i17.$StoreEntityTable storeEntity = i17.$StoreEntityTable(this);
-  i18.MergedAssetDrift get mergedAssetDrift => i19.ReadDatabaseContainer(
+  late final i9.$UserMetadataEntityTable userMetadataEntity = i9
+      .$UserMetadataEntityTable(this);
+  late final i10.$PartnerEntityTable partnerEntity = i10.$PartnerEntityTable(
     this,
-  ).accessor<i18.MergedAssetDrift>(i18.MergedAssetDrift.new);
+  );
+  late final i11.$RemoteExifEntityTable remoteExifEntity = i11
+      .$RemoteExifEntityTable(this);
+  late final i12.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity = i12
+      .$RemoteAlbumAssetEntityTable(this);
+  late final i13.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i13
+      .$RemoteAlbumUserEntityTable(this);
+  late final i14.$RemoteAssetCloudIdEntityTable remoteAssetCloudIdEntity = i14
+      .$RemoteAssetCloudIdEntityTable(this);
+  late final i15.$MemoryEntityTable memoryEntity = i15.$MemoryEntityTable(this);
+  late final i16.$MemoryAssetEntityTable memoryAssetEntity = i16
+      .$MemoryAssetEntityTable(this);
+  late final i17.$PersonEntityTable personEntity = i17.$PersonEntityTable(this);
+  late final i18.$AssetFaceEntityTable assetFaceEntity = i18
+      .$AssetFaceEntityTable(this);
+  late final i19.$StoreEntityTable storeEntity = i19.$StoreEntityTable(this);
+  i20.MergedAssetDrift get mergedAssetDrift => i21.ReadDatabaseContainer(
+    this,
+  ).accessor<i20.MergedAssetDrift>(i20.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -88,21 +97,24 @@ abstract class $Drift extends i0.GeneratedDatabase {
     localAlbumEntity,
     localAlbumAssetEntity,
     i4.idxLocalAssetChecksum,
+    i4.idxLocalAssetCloudId,
     i2.idxRemoteAssetOwnerChecksum,
     i2.uQRemoteAssetsOwnerChecksum,
     i2.uQRemoteAssetsOwnerLibraryChecksum,
     i2.idxRemoteAssetChecksum,
+    authUserEntity,
     userMetadataEntity,
     partnerEntity,
     remoteExifEntity,
     remoteAlbumAssetEntity,
     remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
     memoryEntity,
     memoryAssetEntity,
     personEntity,
     assetFaceEntity,
     storeEntity,
-    i10.idxLatLng,
+    i11.idxLatLng,
   ];
   @override
   i0.StreamQueryUpdateRules
@@ -236,6 +248,18 @@ abstract class $Drift extends i0.GeneratedDatabase {
         i0.TableUpdate('remote_album_user_entity', kind: i0.UpdateKind.delete),
       ],
     ),
+    i0.WritePropagation(
+      on: i0.TableUpdateQuery.onTableName(
+        'remote_asset_entity',
+        limitUpdateKind: i0.UpdateKind.delete,
+      ),
+      result: [
+        i0.TableUpdate(
+          'remote_asset_cloud_id_entity',
+          kind: i0.UpdateKind.delete,
+        ),
+      ],
+    ),
     i0.WritePropagation(
       on: i0.TableUpdateQuery.onTableName(
         'user_entity',
@@ -305,27 +329,35 @@ class $DriftManager {
       i6.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
   i7.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i7
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
-  i8.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i8.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i9.$$PartnerEntityTableTableManager get partnerEntity =>
-      i9.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i10.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
-      i10.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
-  i11.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
-      i11.$$RemoteAlbumAssetEntityTableTableManager(
+  i8.$$AuthUserEntityTableTableManager get authUserEntity =>
+      i8.$$AuthUserEntityTableTableManager(_db, _db.authUserEntity);
+  i9.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+      i9.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+  i10.$$PartnerEntityTableTableManager get partnerEntity =>
+      i10.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
+  i11.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
+      i11.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+  i12.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
+      i12.$$RemoteAlbumAssetEntityTableTableManager(
         _db,
         _db.remoteAlbumAssetEntity,
       );
-  i12.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i12
+  i13.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i13
       .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
-  i13.$$MemoryEntityTableTableManager get memoryEntity =>
-      i13.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
-  i14.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
-      i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
-  i15.$$PersonEntityTableTableManager get personEntity =>
-      i15.$$PersonEntityTableTableManager(_db, _db.personEntity);
-  i16.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
-      i16.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
-  i17.$$StoreEntityTableTableManager get storeEntity =>
-      i17.$$StoreEntityTableTableManager(_db, _db.storeEntity);
+  i14.$$RemoteAssetCloudIdEntityTableTableManager
+  get remoteAssetCloudIdEntity =>
+      i14.$$RemoteAssetCloudIdEntityTableTableManager(
+        _db,
+        _db.remoteAssetCloudIdEntity,
+      );
+  i15.$$MemoryEntityTableTableManager get memoryEntity =>
+      i15.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
+  i16.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
+      i16.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
+  i17.$$PersonEntityTableTableManager get personEntity =>
+      i17.$$PersonEntityTableTableManager(_db, _db.personEntity);
+  i18.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
+      i18.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
+  i19.$$StoreEntityTableTableManager get storeEntity =>
+      i19.$$StoreEntityTableTableManager(_db, _db.storeEntity);
 }

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -3820,6 +3820,905 @@ i1.GeneratedColumn<String> _column_90(String aliasedName) =>
         'REFERENCES remote_album_entity (id) ON DELETE SET NULL',
       ),
     );
+
+final class Schema10 extends i0.VersionedSchema {
+  Schema10({required super.database}) : super(version: 10);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    idxLatLng,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape17 remoteAssetEntity = Shape17(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape2 localAssetEntity = Shape2(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 localAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+}
+
+class Shape20 extends i0.VersionedTable {
+  Shape20({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get email =>
+      columnsByName['email']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get hasProfileImage =>
+      columnsByName['has_profile_image']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<DateTime> get profileChangedAt =>
+      columnsByName['profile_changed_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get avatarColor =>
+      columnsByName['avatar_color']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_91(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'avatar_color',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      defaultValue: const CustomExpression('0'),
+    );
+
+class Shape21 extends i0.VersionedTable {
+  Shape21({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get email =>
+      columnsByName['email']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isAdmin =>
+      columnsByName['is_admin']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get hasProfileImage =>
+      columnsByName['has_profile_image']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<DateTime> get profileChangedAt =>
+      columnsByName['profile_changed_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get avatarColor =>
+      columnsByName['avatar_color']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get quotaSizeInBytes =>
+      columnsByName['quota_size_in_bytes']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get quotaUsageInBytes =>
+      columnsByName['quota_usage_in_bytes']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get pinCode =>
+      columnsByName['pin_code']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<int> _column_92(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'avatar_color',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+    );
+i1.GeneratedColumn<int> _column_93(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'quota_size_in_bytes',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      defaultValue: const CustomExpression('0'),
+    );
+i1.GeneratedColumn<String> _column_94(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'pin_code',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+    );
+
+final class Schema11 extends i0.VersionedSchema {
+  Schema11({required super.database}) : super(version: 11);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    idxLatLng,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape17 remoteAssetEntity = Shape17(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape22 localAssetEntity = Shape22(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_95,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 localAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape23 remoteAssetCloudIdEntity = Shape23(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [_column_36, _column_96],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+}
+
+class Shape22 extends i0.VersionedTable {
+  Shape22({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationInSeconds =>
+      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get orientation =>
+      columnsByName['orientation']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get iCloudId =>
+      columnsByName['i_cloud_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_95(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'i_cloud_id',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+    );
+
+class Shape23 extends i0.VersionedTable {
+  Shape23({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get cloudId =>
+      columnsByName['cloud_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_96(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'cloud_id',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      defaultConstraints: i1.GeneratedColumn.constraintIsAlways('UNIQUE'),
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -3829,6 +4728,8 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
   required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
   required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
+  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
+  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -3872,6 +4773,16 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from8To9(migrator, schema);
         return 9;
+      case 9:
+        final schema = Schema10(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from9To10(migrator, schema);
+        return 10;
+      case 10:
+        final schema = Schema11(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from10To11(migrator, schema);
+        return 11;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -3887,6 +4798,8 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
   required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
   required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
+  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
+  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -3897,5 +4810,7 @@ i1.OnUpgrade stepByStep({
     from6To7: from6To7,
     from7To8: from7To8,
     from8To9: from8To9,
+    from9To10: from9To10,
+    from10To11: from10To11,
   ),
 );

mobile/lib/infrastructure/repositories/local_album.repository.dart

@@ -231,6 +231,25 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
   }
 
+  Future<void> updateCloudMapping(Map<String, String?> cloudMapping) {
+    if (cloudMapping.isEmpty) {
+      return Future.value();
+    }
+
+    return _db.batch((batch) {
+      for (final entry in cloudMapping.entries) {
+        final assetId = entry.key;
+        final cloudId = entry.value;
+
+        batch.update(
+          _db.localAssetEntity,
+          LocalAssetEntityCompanion(iCloudId: Value(cloudId)),
+          where: (f) => f.id.equals(assetId),
+        );
+      }
+    });
+  }
+
   Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
     if (localAssets.isEmpty) {
       return Future.value();

mobile/lib/infrastructure/repositories/local_asset.repository.dart

@@ -5,6 +5,8 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
+typedef LocalAssetHashMapping = ({String assetId, String checksum});
+
 class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftLocalAssetRepository(this._db) : super(_db);
@@ -28,17 +30,17 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
 
   Stream<LocalAsset?> watch(String id) => _assetSelectable(id).watchSingleOrNull();
 
-  Future<void> updateHashes(Iterable<LocalAsset> hashes) {
+  Future<void> updateHashes(Iterable<LocalAssetHashMapping> hashes) {
     if (hashes.isEmpty) {
       return Future.value();
     }
 
     return _db.batch((batch) async {
-      for (final asset in hashes) {
+      for (final mapping in hashes) {
         batch.update(
           _db.localAssetEntity,
-          LocalAssetEntityCompanion(checksum: Value(asset.checksum)),
-          where: (e) => e.id.equals(asset.id),
+          LocalAssetEntityCompanion(checksum: Value(mapping.checksum)),
+          where: (e) => e.id.equals(mapping.assetId),
         );
       }
     });
@@ -69,4 +71,27 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   Future<int> getHashedCount() {
     return _db.managers.localAssetEntity.filter((e) => e.checksum.isNull().not()).count();
   }
+
+  Future<List<LocalAssetHashMapping>> getHashMappingFromCloudId() async {
+    final query =
+        _db.localAssetEntity.selectOnly().join([
+            leftOuterJoin(
+              _db.remoteAssetCloudIdEntity,
+              _db.localAssetEntity.iCloudId.equalsExp(_db.remoteAssetCloudIdEntity.cloudId),
+              useColumns: false,
+            ),
+            leftOuterJoin(
+              _db.remoteAssetEntity,
+              _db.remoteAssetCloudIdEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+              useColumns: false,
+            ),
+          ])
+          ..addColumns([_db.localAssetEntity.id, _db.remoteAssetEntity.checksum])
+          ..where(_db.remoteAssetCloudIdEntity.cloudId.isNotNull() & _db.localAssetEntity.checksum.isNull());
+    return query
+        .map(
+          (row) => (assetId: row.read(_db.localAssetEntity.id)!, checksum: row.read(_db.remoteAssetEntity.checksum)!),
+        )
+        .get();
+  }
 }

mobile/lib/infrastructure/repositories/remote_album.repository.dart

@@ -202,14 +202,13 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
             id: user.id,
             email: user.email,
             name: user.name,
-            isAdmin: user.isAdmin,
-            updatedAt: user.updatedAt,
             memoryEnabled: true,
             inTimeline: false,
             isPartnerSharedBy: false,
             isPartnerSharedWith: false,
             profileChangedAt: user.profileChangedAt,
             hasProfileImage: user.hasProfileImage,
+            avatarColor: user.avatarColor,
           ),
         )
         .get();

mobile/lib/infrastructure/repositories/store.repository.dart

@@ -173,7 +173,7 @@ class DriftStoreRepository extends DriftDatabaseRepository implements IStoreRepo
             const (bool) => entity.intValue == 1,
             const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
             const (UserDto) =>
-              entity.stringValue == null ? null : await DriftUserRepository(_db).get(entity.stringValue!),
+              entity.stringValue == null ? null : await DriftAuthUserRepository(_db).get(entity.stringValue!),
             _ => null,
           }
           as T?;
@@ -184,7 +184,7 @@ class DriftStoreRepository extends DriftDatabaseRepository implements IStoreRepo
       const (String) => (null, value as String),
       const (bool) => ((value as bool) ? 1 : 0, null),
       const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
-      const (UserDto) => (null, (await DriftUserRepository(_db).upsert(value as UserDto)).id),
+      const (UserDto) => (null, (await DriftAuthUserRepository(_db).upsert(value as UserDto)).id),
       _ => throw UnsupportedError("Unsupported primitive type: ${key.type} for key: ${key.name}"),
     };
     return StoreEntityCompanion(id: Value(key.id), intValue: Value(intValue), stringValue: Value(strValue));

mobile/lib/infrastructure/repositories/sync_api.repository.dart

@@ -18,7 +18,8 @@ class SyncApiRepository {
   }
 
   Future<void> streamChanges(
-    Function(List<SyncEvent>, Function() abort) onData, {
+    Future<void> Function(List<SyncEvent>, Function() abort, Function() reset) onData, {
+    Function()? onReset,
     int batchSize = kSyncEventBatchSize,
     http.Client? httpClient,
   }) async {
@@ -37,9 +38,11 @@ class SyncApiRepository {
     request.body = jsonEncode(
       SyncStreamDto(
         types: [
+          SyncRequestType.authUsersV1,
           SyncRequestType.usersV1,
           SyncRequestType.assetsV1,
           SyncRequestType.assetExifsV1,
+          SyncRequestType.assetMetadataV1,
           SyncRequestType.partnersV1,
           SyncRequestType.partnerAssetsV1,
           SyncRequestType.partnerAssetExifsV1,
@@ -69,6 +72,8 @@ class SyncApiRepository {
       shouldAbort = true;
     }
 
+    final reset = onReset ?? () {};
+
     try {
       final response = await client.send(request);
 
@@ -91,12 +96,12 @@ class SyncApiRepository {
           continue;
         }
 
-        await onData(_parseLines(lines), abort);
+        await onData(_parseLines(lines), abort, reset);
         lines.clear();
       }
 
       if (lines.isNotEmpty && !shouldAbort) {
-        await onData(_parseLines(lines), abort);
+        await onData(_parseLines(lines), abort, reset);
       }
     } catch (error, stack) {
       _logger.severe("Error processing stream", error, stack);
@@ -130,6 +135,7 @@ class SyncApiRepository {
 }
 
 const _kResponseMap = <SyncEntityType, Function(Object)>{
+  SyncEntityType.authUserV1: SyncAuthUserV1.fromJson,
   SyncEntityType.userV1: SyncUserV1.fromJson,
   SyncEntityType.userDeleteV1: SyncUserDeleteV1.fromJson,
   SyncEntityType.partnerV1: SyncPartnerV1.fromJson,
@@ -137,6 +143,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetV1: SyncAssetV1.fromJson,
   SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
+  SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
   SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
   SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
   SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
@@ -156,7 +164,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.albumToAssetV1: SyncAlbumToAssetV1.fromJson,
   SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
   SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
-  SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
+  SyncEntityType.syncAckV1: _SyncEmptyDto.fromJson,
+  SyncEntityType.syncResetV1: _SyncEmptyDto.fromJson,
   SyncEntityType.memoryV1: SyncMemoryV1.fromJson,
   SyncEntityType.memoryDeleteV1: SyncMemoryDeleteV1.fromJson,
   SyncEntityType.memoryToAssetV1: SyncMemoryAssetV1.fromJson,
@@ -172,8 +181,9 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.personDeleteV1: SyncPersonDeleteV1.fromJson,
   SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
   SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
+  SyncEntityType.syncCompleteV1: _SyncEmptyDto.fromJson,
 };
 
-class _SyncAckV1 {
-  static _SyncAckV1? fromJson(dynamic _) => _SyncAckV1();
+class _SyncEmptyDto {
+  static _SyncEmptyDto? fromJson(dynamic _) => _SyncEmptyDto();
 }

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -1,11 +1,14 @@
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
@@ -15,6 +18,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
@@ -29,6 +33,65 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
   SyncStreamRepository(super.db) : _db = db;
 
+  Future<void> reset() async {
+    _logger.fine("SyncResetV1 received. Resetting remote entities");
+    try {
+      await _db.exclusively(() async {
+        // foreign_keys PRAGMA is no-op within transactions
+        // https://www.sqlite.org/pragma.html#pragma_foreign_keys
+        await _db.customStatement('PRAGMA foreign_keys = OFF');
+        await transaction(() async {
+          await _db.assetFaceEntity.deleteAll();
+          await _db.memoryAssetEntity.deleteAll();
+          await _db.memoryEntity.deleteAll();
+          await _db.partnerEntity.deleteAll();
+          await _db.personEntity.deleteAll();
+          await _db.remoteAlbumAssetEntity.deleteAll();
+          await _db.remoteAlbumEntity.deleteAll();
+          await _db.remoteAlbumUserEntity.deleteAll();
+          await _db.remoteAssetEntity.deleteAll();
+          await _db.remoteExifEntity.deleteAll();
+          await _db.stackEntity.deleteAll();
+          await _db.userEntity.deleteAll();
+          await _db.userMetadataEntity.deleteAll();
+        });
+        await _db.customStatement('PRAGMA foreign_keys = ON');
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: SyncResetV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAuthUsersV1(Iterable<SyncAuthUserV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final user in data) {
+          final companion = AuthUserEntityCompanion(
+            name: Value(user.name),
+            email: Value(user.email),
+            hasProfileImage: Value(user.hasProfileImage),
+            profileChangedAt: Value(user.profileChangedAt),
+            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
+            isAdmin: Value(user.isAdmin),
+            pinCode: Value(user.pinCode),
+            quotaSizeInBytes: Value(user.quotaSizeInBytes ?? 0),
+            quotaUsageInBytes: Value(user.quotaUsageInBytes),
+          );
+
+          batch.insert(
+            _db.authUserEntity,
+            companion.copyWith(id: Value(user.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: SyncAuthUserV1', error, stack);
+      rethrow;
+    }
+  }
+
   Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
     try {
       await _db.userEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
@@ -47,6 +110,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             email: Value(user.email),
             hasProfileImage: Value(user.hasProfileImage),
             profileChangedAt: Value(user.profileChangedAt),
+            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
           );
 
           batch.insert(_db.userEntity, companion.copyWith(id: Value(user.id)), onConflict: DoUpdate((_) => companion));
@@ -178,6 +242,42 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
+  Future<void> deleteAssetsMetadataV1(Iterable<SyncAssetMetadataDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final metadata in data) {
+          if (metadata.key == AssetMetadataKey.mobileApp) {
+            batch.deleteWhere(_db.remoteAssetCloudIdEntity, (row) => row.assetId.equals(metadata.assetId));
+          }
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAssetsMetadataV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAssetsMetadataV1(Iterable<SyncAssetMetadataV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final metadata in data) {
+          if (metadata.key == AssetMetadataKey.mobileApp) {
+            final map = metadata.value as Map<String, Object?>;
+            final companion = RemoteAssetCloudIdEntityCompanion(cloudId: Value(map['iCloudId']?.toString()));
+            batch.insert(
+              _db.remoteAssetCloudIdEntity,
+              companion.copyWith(assetId: Value(metadata.assetId)),
+              onConflict: DoUpdate((_) => companion),
+            );
+          }
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetsMetadataV1', error, stack);
+      rethrow;
+    }
+  }
+
   Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
     try {
       await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
@@ -573,3 +673,7 @@ extension on String {
     }
   }
 }
+
+extension on UserAvatarColor {
+  AvatarColor? toAvatarColor() => AvatarColor.values.firstWhereOrNull((c) => c.name == value);
+}

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -87,6 +87,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   isFavorite: row.isFavorite,
                   durationInSeconds: row.durationInSeconds,
                   orientation: row.orientation,
+                  cloudId: row.iCloudId,
                 ),
         )
         .get();

mobile/lib/infrastructure/repositories/user.repository.dart

@@ -2,8 +2,8 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
 import 'package:isar/isar.dart';
@@ -68,12 +68,12 @@ class IsarUserRepository extends IsarDatabaseRepository {
   }
 }
 
-class DriftUserRepository extends DriftDatabaseRepository {
+class DriftAuthUserRepository extends DriftDatabaseRepository {
   final Drift _db;
-  const DriftUserRepository(super.db) : _db = db;
+  const DriftAuthUserRepository(super.db) : _db = db;
 
   Future<UserDto?> get(String id) async {
-    final user = await _db.managers.userEntity.filter((user) => user.id.equals(id)).getSingleOrNull();
+    final user = await _db.managers.authUserEntity.filter((user) => user.id.equals(id)).getSingleOrNull();
 
     if (user == null) return null;
 
@@ -84,43 +84,30 @@ class DriftUserRepository extends DriftDatabaseRepository {
   }
 
   Future<UserDto> upsert(UserDto user) async {
-    await _db.userEntity.insertOnConflictUpdate(
-      UserEntityCompanion(
+    await _db.authUserEntity.insertOnConflictUpdate(
+      AuthUserEntityCompanion(
         id: Value(user.id),
-        isAdmin: Value(user.isAdmin),
-        updatedAt: Value(user.updatedAt),
         name: Value(user.name),
         email: Value(user.email),
         hasProfileImage: Value(user.hasProfileImage),
         profileChangedAt: Value(user.profileChangedAt),
+        isAdmin: Value(user.isAdmin),
+        quotaSizeInBytes: Value(user.quotaSizeInBytes),
+        quotaUsageInBytes: Value(user.quotaUsageInBytes),
+        avatarColor: Value(user.avatarColor),
       ),
     );
     return user;
   }
-
-  Future<List<UserDto>> getAll() async {
-    final users = await _db.userEntity.select().get();
-    final List<UserDto> result = [];
-
-    for (final user in users) {
-      final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(user.id));
-      final metadata = await query.map((row) => row.toDto()).get();
-      result.add(user.toDto(metadata));
-    }
-
-    return result;
-  }
 }
 
-extension on UserEntityData {
+extension on AuthUserEntityData {
   UserDto toDto([List<UserMetadata>? metadata]) {
-    AvatarColor avatarColor = AvatarColor.primary;
     bool memoryEnabled = true;
 
     if (metadata != null) {
       for (final meta in metadata) {
         if (meta.key == UserMetadataKey.preferences && meta.preferences != null) {
-          avatarColor = meta.preferences?.userAvatarColor ?? AvatarColor.primary;
           memoryEnabled = meta.preferences?.memoriesEnabled ?? true;
         }
       }
@@ -130,12 +117,13 @@ extension on UserEntityData {
       id: id,
       email: email,
       name: name,
-      isAdmin: isAdmin,
-      updatedAt: updatedAt,
       profileChangedAt: profileChangedAt,
       hasProfileImage: hasProfileImage,
       avatarColor: avatarColor,
       memoryEnabled: memoryEnabled,
+      isAdmin: isAdmin,
+      quotaSizeInBytes: quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes,
     );
   }
 }

mobile/lib/infrastructure/utils/user.converter.dart

@@ -1,5 +1,4 @@
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:openapi/api.dart';
 
 // TODO: Move to repository once all classes are refactored

mobile/lib/platform/native_sync_api.g.dart

@@ -495,4 +495,32 @@ class NativeSyncApi {
       return (pigeonVar_replyList[0] as List<Object?>?)!.cast<Uint8List?>();
     }
   }
+
+  Future<Map<String, String?>> getCloudIdForAssetIds(List<String> assetIds) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetIds]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, String?>();
+    }
+  }
 }

mobile/lib/presentation/pages/drift_user_selection.page.dart

@@ -3,9 +3,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -26,11 +25,9 @@ final driftUsersProvider = FutureProvider.autoDispose<List<UserDto>>((ref) async
           id: entity.id,
           name: entity.name,
           email: entity.email,
-          isAdmin: entity.isAdmin,
-          updatedAt: entity.updatedAt,
           isPartnerSharedBy: false,
           isPartnerSharedWith: false,
-          avatarColor: AvatarColor.primary,
+          avatarColor: entity.avatarColor,
           memoryEnabled: true,
           inTimeline: true,
           profileChangedAt: entity.profileChangedAt,

mobile/lib/providers/app_life_cycle.provider.dart

@@ -161,15 +161,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         }
       }
 
-      // Check if app is still active before hashing
-      if (_shouldContinueOperation()) {
-        try {
-          await backgroundManager.hashAssets();
-        } catch (e, stackTrace) {
-          _log.warning("Failed hashAssets: $e", e, stackTrace);
-        }
-      }
-
       // Check if app is still active before remote sync
       if (_shouldContinueOperation()) {
         try {
@@ -187,6 +178,15 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         }
       }
 
+      // Check if app is still active before hashing
+      if (_shouldContinueOperation()) {
+        try {
+          await backgroundManager.hashAssets();
+        } catch (e, stackTrace) {
+          _log.warning("Failed hashAssets: $e", e, stackTrace);
+        }
+      }
+
       // Handle backup resume only if still active
       if (_shouldContinueOperation()) {
         final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);

mobile/lib/providers/background_sync.provider.dart

@@ -15,6 +15,9 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
     onHashingStart: syncStatusNotifier.startHashJob,
     onHashingComplete: syncStatusNotifier.completeHashJob,
     onHashingError: syncStatusNotifier.errorHashJob,
+    onCloudIdSyncStart: syncStatusNotifier.startCloudIdSync,
+    onCloudIdSyncComplete: syncStatusNotifier.completeCloudIdSync,
+    onCloudIdSyncError: syncStatusNotifier.errorCloudIdSync,
   );
   ref.onDispose(manager.cancel);
   return manager;

mobile/lib/providers/sync_status.provider.dart

@@ -21,6 +21,7 @@ class SyncStatusState {
   final SyncStatus remoteSyncStatus;
   final SyncStatus localSyncStatus;
   final SyncStatus hashJobStatus;
+  final SyncStatus cloudIdSyncStatus;
 
   final String? errorMessage;
 
@@ -28,6 +29,7 @@ class SyncStatusState {
     this.remoteSyncStatus = SyncStatus.idle,
     this.localSyncStatus = SyncStatus.idle,
     this.hashJobStatus = SyncStatus.idle,
+    this.cloudIdSyncStatus = SyncStatus.idle,
     this.errorMessage,
   });
 
@@ -35,12 +37,14 @@ class SyncStatusState {
     SyncStatus? remoteSyncStatus,
     SyncStatus? localSyncStatus,
     SyncStatus? hashJobStatus,
+    SyncStatus? cloudIdSyncStatus,
     String? errorMessage,
   }) {
     return SyncStatusState(
       remoteSyncStatus: remoteSyncStatus ?? this.remoteSyncStatus,
       localSyncStatus: localSyncStatus ?? this.localSyncStatus,
       hashJobStatus: hashJobStatus ?? this.hashJobStatus,
+      cloudIdSyncStatus: cloudIdSyncStatus ?? this.cloudIdSyncStatus,
       errorMessage: errorMessage ?? this.errorMessage,
     );
   }
@@ -48,6 +52,7 @@ class SyncStatusState {
   bool get isRemoteSyncing => remoteSyncStatus == SyncStatus.syncing;
   bool get isLocalSyncing => localSyncStatus == SyncStatus.syncing;
   bool get isHashing => hashJobStatus == SyncStatus.syncing;
+  bool get isCloudIdSyncing => cloudIdSyncStatus == SyncStatus.syncing;
 
   @override
   bool operator ==(Object other) {
@@ -56,11 +61,12 @@ class SyncStatusState {
         other.remoteSyncStatus == remoteSyncStatus &&
         other.localSyncStatus == localSyncStatus &&
         other.hashJobStatus == hashJobStatus &&
+        other.cloudIdSyncStatus == cloudIdSyncStatus &&
         other.errorMessage == errorMessage;
   }
 
   @override
-  int get hashCode => Object.hash(remoteSyncStatus, localSyncStatus, hashJobStatus, errorMessage);
+  int get hashCode => Object.hash(remoteSyncStatus, localSyncStatus, hashJobStatus, cloudIdSyncStatus, errorMessage);
 }
 
 class SyncStatusNotifier extends Notifier<SyncStatusState> {
@@ -71,6 +77,7 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
       remoteSyncStatus: SyncStatus.idle,
       localSyncStatus: SyncStatus.idle,
       hashJobStatus: SyncStatus.idle,
+      cloudIdSyncStatus: SyncStatus.idle,
     );
   }
 
@@ -109,6 +116,18 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
   void startHashJob() => setHashJobStatus(SyncStatus.syncing);
   void completeHashJob() => setHashJobStatus(SyncStatus.success);
   void errorHashJob(String error) => setHashJobStatus(SyncStatus.error, error);
+
+  ///
+  /// Cloud ID Sync Job
+  ///
+
+  void setCloudIdSyncStatus(SyncStatus status, [String? errorMessage]) {
+    state = state.copyWith(cloudIdSyncStatus: status, errorMessage: status == SyncStatus.error ? errorMessage : null);
+  }
+
+  void startCloudIdSync() => setCloudIdSyncStatus(SyncStatus.syncing);
+  void completeCloudIdSync() => setCloudIdSyncStatus(SyncStatus.success);
+  void errorCloudIdSync(String error) => setCloudIdSyncStatus(SyncStatus.error, error);
 }
 
 final syncStatusProvider = NotifierProvider<SyncStatusNotifier, SyncStatusState>(SyncStatusNotifier.new);

mobile/lib/repositories/auth.repository.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
@@ -10,6 +9,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -25,25 +25,7 @@ class AuthRepository extends DatabaseRepository {
   const AuthRepository(super.db, this._drift);
 
   Future<void> clearLocalData() async {
-    // Drift deletions - child entities first (those with foreign keys)
-    await Future.wait([
-      _drift.memoryAssetEntity.deleteAll(),
-      _drift.remoteAlbumAssetEntity.deleteAll(),
-      _drift.remoteAlbumUserEntity.deleteAll(),
-      _drift.remoteExifEntity.deleteAll(),
-      _drift.userMetadataEntity.deleteAll(),
-      _drift.partnerEntity.deleteAll(),
-      _drift.stackEntity.deleteAll(),
-      _drift.assetFaceEntity.deleteAll(),
-    ]);
-    // Drift deletions - parent entities
-    await Future.wait([
-      _drift.memoryEntity.deleteAll(),
-      _drift.personEntity.deleteAll(),
-      _drift.remoteAlbumEntity.deleteAll(),
-      _drift.remoteAssetEntity.deleteAll(),
-      _drift.userEntity.deleteAll(),
-    ]);
+    await SyncStreamRepository(_drift).reset();
 
     return db.writeTxn(() {
       return Future.wait([

mobile/lib/repositories/partner_api.repository.dart

@@ -22,14 +22,14 @@ class PartnerApiRepository extends ApiRepository {
   }
 
   Future<UserDto> create(String id) async {
-    final dto = await checkNull(_api.createPartner(id));
+    final dto = await checkNull(_api.createPartnerDeprecated(id));
     return UserConverter.fromPartnerDto(dto);
   }
 
   Future<void> delete(String id) => _api.removePartner(id);
 
   Future<UserDto> update(String id, {required bool inTimeline}) async {
-    final dto = await checkNull(_api.updatePartner(id, UpdatePartnerDto(inTimeline: inTimeline)));
+    final dto = await checkNull(_api.updatePartner(id, PartnerUpdateDto(inTimeline: inTimeline)));
     return UserConverter.fromPartnerDto(dto);
   }
 }

mobile/lib/services/sync.service.dart

@@ -147,7 +147,9 @@ class SyncService {
       dbUsers,
       compare: (UserDto a, UserDto b) => a.id.compareTo(b.id),
       both: (UserDto a, UserDto b) {
-        if (!a.updatedAt.isAtSameMomentAs(b.updatedAt) ||
+        if ((a.updatedAt == null && b.updatedAt != null) ||
+            (a.updatedAt != null && b.updatedAt == null) ||
+            (a.updatedAt != null && b.updatedAt != null && !a.updatedAt!.isAtSameMomentAs(b.updatedAt!)) ||
             a.isPartnerSharedBy != b.isPartnerSharedBy ||
             a.isPartnerSharedWith != b.isPartnerSharedWith ||
             a.inTimeline != b.inTimeline) {

mobile/lib/services/upload.service.dart

@@ -6,6 +6,7 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -291,6 +292,7 @@ class UploadService {
       priority: priority,
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
+      cloudId: asset.cloudId,
     );
   }
 
@@ -320,6 +322,7 @@ class UploadService {
       priority: 0, // Highest priority to get upload immediately
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
+      cloudId: asset.cloudId,
     );
   }
 
@@ -346,6 +349,7 @@ class UploadService {
     String? metadata,
     int? priority,
     bool? isFavorite,
+    String? cloudId,
     bool requiresWiFi = true,
   }) async {
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
@@ -361,6 +365,12 @@ class UploadService {
       'fileModifiedAt': modifiedAt.toUtc().toIso8601String(),
       'isFavorite': isFavorite?.toString() ?? 'false',
       'duration': '0',
+      'metadata': jsonEncode([
+        RemoteAssetMetadataItem(
+          key: RemoteAssetMetadataKey.mobileApp,
+          value: RemoteAssetMobileAppMetadata(cloudId: cloudId),
+        ),
+      ]),
       if (fields != null) ...fields,
     };
 

mobile/lib/utils/migration.dart

@@ -29,7 +29,6 @@ import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:isar/isar.dart';
-import 'package:logging/logging.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
@@ -266,21 +265,16 @@ class _DeviceAsset {
   const _DeviceAsset({required this.assetId, this.hash, this.dateTime});
 }
 
-Future<List<void>> runNewSync(WidgetRef ref, {bool full = false}) {
+Future<void> runNewSync(WidgetRef ref, {bool full = false}) {
   ref.read(backupProvider.notifier).cancelBackup();
 
   final backgroundManager = ref.read(backgroundSyncProvider);
   final isAlbumLinkedSyncEnable = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
 
-  return Future.wait([
-    backgroundManager.syncLocal(full: full).then((_) {
-      Logger("runNewSync").fine("Hashing assets after syncLocal");
-      return backgroundManager.hashAssets();
-    }),
-    backgroundManager.syncRemote().then((_) {
-      if (isAlbumLinkedSyncEnable) {
-        return backgroundManager.syncLinkedAlbum();
-      }
-    }),
-  ]);
+  return (backgroundManager.syncLocal(full: full), backgroundManager.syncRemote()).wait.whenComplete(() async {
+    await backgroundManager.hashAssets();
+    if (isAlbumLinkedSyncEnable) {
+      await backgroundManager.syncLinkedAlbum();
+    }
+  });
 }

mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart

@@ -6,8 +6,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
@@ -301,6 +301,17 @@ class BetaSyncSettings extends HookConsumerWidget {
                   ref.read(backgroundSyncProvider).hashAssets();
                 },
               ),
+              if (Platform.isIOS)
+                ListTile(
+                  title: Text(
+                    "sync_cloud_ids".t(context: context),
+                    style: const TextStyle(fontWeight: FontWeight.w500),
+                  ),
+                  leading: const Icon(Icons.keyboard_command_key_rounded),
+                  subtitle: Text("tap_to_run_job".t(context: context)),
+                  trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).cloudIdSyncStatus),
+                  onTap: ref.read(backgroundSyncProvider).syncCloudIds,
+                ),
               const Divider(height: 1, indent: 16, endIndent: 16),
               const SizedBox(height: 24),
               _SectionHeaderText(text: "actions".t(context: context)),
@@ -347,7 +358,7 @@ class _SyncStatusIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return switch (status) {
-      SyncStatus.idle => const Icon(Icons.pause_circle_outline_rounded),
+      SyncStatus.idle => const SizedBox.shrink(),
       SyncStatus.syncing => const SizedBox(height: 24, width: 24, child: CircularProgressIndicator(strokeWidth: 2)),
       SyncStatus.success => const Icon(Icons.check_circle_outline, color: Colors.green),
       SyncStatus.error => Icon(Icons.error_outline, color: context.colorScheme.error),

mobile/openapi/README.md

@@ -126,6 +126,7 @@ Class | Method | HTTP request | Description
 *AuthenticationApi* | [**signUpAdmin**](doc//AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | 
 *AuthenticationApi* | [**unlockAuthSession**](doc//AuthenticationApi.md#unlockauthsession) | **POST** /auth/session/unlock | 
 *AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | 
+*DeprecatedApi* | [**createPartnerDeprecated**](doc//DeprecatedApi.md#createpartnerdeprecated) | **POST** /partners/{id} | 
 *DeprecatedApi* | [**getRandom**](doc//DeprecatedApi.md#getrandom) | **GET** /assets/random | 
 *DownloadApi* | [**downloadArchive**](doc//DownloadApi.md#downloadarchive) | **POST** /download/archive | 
 *DownloadApi* | [**getDownloadInfo**](doc//DownloadApi.md#getdownloadinfo) | **POST** /download/info | 
@@ -171,7 +172,8 @@ Class | Method | HTTP request | Description
 *OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
 *OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | 
 *OAuthApi* | [**unlinkOAuthAccount**](doc//OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | 
-*PartnersApi* | [**createPartner**](doc//PartnersApi.md#createpartner) | **POST** /partners/{id} | 
+*PartnersApi* | [**createPartner**](doc//PartnersApi.md#createpartner) | **POST** /partners | 
+*PartnersApi* | [**createPartnerDeprecated**](doc//PartnersApi.md#createpartnerdeprecated) | **POST** /partners/{id} | 
 *PartnersApi* | [**getPartners**](doc//PartnersApi.md#getpartners) | **GET** /partners | 
 *PartnersApi* | [**removePartner**](doc//PartnersApi.md#removepartner) | **DELETE** /partners/{id} | 
 *PartnersApi* | [**updatePartner**](doc//PartnersApi.md#updatepartner) | **PUT** /partners/{id} | 
@@ -416,8 +418,10 @@ Class | Method | HTTP request | Description
  - [OnThisDayDto](doc//OnThisDayDto.md)
  - [OnboardingDto](doc//OnboardingDto.md)
  - [OnboardingResponseDto](doc//OnboardingResponseDto.md)
+ - [PartnerCreateDto](doc//PartnerCreateDto.md)
  - [PartnerDirection](doc//PartnerDirection.md)
  - [PartnerResponseDto](doc//PartnerResponseDto.md)
+ - [PartnerUpdateDto](doc//PartnerUpdateDto.md)
  - [PeopleResponse](doc//PeopleResponse.md)
  - [PeopleResponseDto](doc//PeopleResponseDto.md)
  - [PeopleUpdate](doc//PeopleUpdate.md)
@@ -566,7 +570,6 @@ Class | Method | HTTP request | Description
  - [UpdateAlbumUserDto](doc//UpdateAlbumUserDto.md)
  - [UpdateAssetDto](doc//UpdateAssetDto.md)
  - [UpdateLibraryDto](doc//UpdateLibraryDto.md)
- - [UpdatePartnerDto](doc//UpdatePartnerDto.md)
  - [UsageByUserDto](doc//UsageByUserDto.md)
  - [UserAdminCreateDto](doc//UserAdminCreateDto.md)
  - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md)

mobile/openapi/lib/api.dart

@@ -190,8 +190,10 @@ part 'model/o_auth_token_endpoint_auth_method.dart';
 part 'model/on_this_day_dto.dart';
 part 'model/onboarding_dto.dart';
 part 'model/onboarding_response_dto.dart';
+part 'model/partner_create_dto.dart';
 part 'model/partner_direction.dart';
 part 'model/partner_response_dto.dart';
+part 'model/partner_update_dto.dart';
 part 'model/people_response.dart';
 part 'model/people_response_dto.dart';
 part 'model/people_update.dart';
@@ -340,7 +342,6 @@ part 'model/update_album_dto.dart';
 part 'model/update_album_user_dto.dart';
 part 'model/update_asset_dto.dart';
 part 'model/update_library_dto.dart';
-part 'model/update_partner_dto.dart';
 part 'model/usage_by_user_dto.dart';
 part 'model/user_admin_create_dto.dart';
 part 'model/user_admin_delete_dto.dart';

mobile/openapi/lib/api/deprecated_api.dart

@@ -16,6 +16,59 @@ class DeprecatedApi {
 
   final ApiClient apiClient;
 
+  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<Response> createPartnerDeprecatedWithHttpInfo(String id,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/partners/{id}'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<PartnerResponseDto?> createPartnerDeprecated(String id,) async {
+    final response = await createPartnerDeprecatedWithHttpInfo(id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PartnerResponseDto',) as PartnerResponseDto;
+    
+    }
+    return null;
+  }
+
   /// This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
   ///
   /// Note: This method returns the HTTP [Response].

mobile/openapi/lib/api/partners_api.dart

@@ -22,8 +22,60 @@ class PartnersApi {
   ///
   /// Parameters:
   ///
+  /// * [PartnerCreateDto] partnerCreateDto (required):
+  Future<Response> createPartnerWithHttpInfo(PartnerCreateDto partnerCreateDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/partners';
+
+    // ignore: prefer_final_locals
+    Object? postBody = partnerCreateDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// This endpoint requires the `partner.create` permission.
+  ///
+  /// Parameters:
+  ///
+  /// * [PartnerCreateDto] partnerCreateDto (required):
+  Future<PartnerResponseDto?> createPartner(PartnerCreateDto partnerCreateDto,) async {
+    final response = await createPartnerWithHttpInfo(partnerCreateDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PartnerResponseDto',) as PartnerResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
   /// * [String] id (required):
-  Future<Response> createPartnerWithHttpInfo(String id,) async {
+  Future<Response> createPartnerDeprecatedWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/partners/{id}'
       .replaceAll('{id}', id);
@@ -49,13 +101,13 @@ class PartnersApi {
     );
   }
 
-  /// This endpoint requires the `partner.create` permission.
+  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
   ///
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<PartnerResponseDto?> createPartner(String id,) async {
-    final response = await createPartnerWithHttpInfo(id,);
+  Future<PartnerResponseDto?> createPartnerDeprecated(String id,) async {
+    final response = await createPartnerDeprecatedWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -179,14 +231,14 @@ class PartnersApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [UpdatePartnerDto] updatePartnerDto (required):
-  Future<Response> updatePartnerWithHttpInfo(String id, UpdatePartnerDto updatePartnerDto,) async {
+  /// * [PartnerUpdateDto] partnerUpdateDto (required):
+  Future<Response> updatePartnerWithHttpInfo(String id, PartnerUpdateDto partnerUpdateDto,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/partners/{id}'
       .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
-    Object? postBody = updatePartnerDto;
+    Object? postBody = partnerUpdateDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -212,9 +264,9 @@ class PartnersApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [UpdatePartnerDto] updatePartnerDto (required):
-  Future<PartnerResponseDto?> updatePartner(String id, UpdatePartnerDto updatePartnerDto,) async {
-    final response = await updatePartnerWithHttpInfo(id, updatePartnerDto,);
+  /// * [PartnerUpdateDto] partnerUpdateDto (required):
+  Future<PartnerResponseDto?> updatePartner(String id, PartnerUpdateDto partnerUpdateDto,) async {
+    final response = await updatePartnerWithHttpInfo(id, partnerUpdateDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api_client.dart

@@ -434,10 +434,14 @@ class ApiClient {
           return OnboardingDto.fromJson(value);
         case 'OnboardingResponseDto':
           return OnboardingResponseDto.fromJson(value);
+        case 'PartnerCreateDto':
+          return PartnerCreateDto.fromJson(value);
         case 'PartnerDirection':
           return PartnerDirectionTypeTransformer().decode(value);
         case 'PartnerResponseDto':
           return PartnerResponseDto.fromJson(value);
+        case 'PartnerUpdateDto':
+          return PartnerUpdateDto.fromJson(value);
         case 'PeopleResponse':
           return PeopleResponse.fromJson(value);
         case 'PeopleResponseDto':
@@ -734,8 +738,6 @@ class ApiClient {
           return UpdateAssetDto.fromJson(value);
         case 'UpdateLibraryDto':
           return UpdateLibraryDto.fromJson(value);
-        case 'UpdatePartnerDto':
-          return UpdatePartnerDto.fromJson(value);
         case 'UsageByUserDto':
           return UsageByUserDto.fromJson(value);
         case 'UserAdminCreateDto':

mobile/openapi/lib/model/partner_create_dto.dart

@@ -0,0 +1,99 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class PartnerCreateDto {
+  /// Returns a new [PartnerCreateDto] instance.
+  PartnerCreateDto({
+    required this.sharedWithId,
+  });
+
+  String sharedWithId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is PartnerCreateDto &&
+    other.sharedWithId == sharedWithId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (sharedWithId.hashCode);
+
+  @override
+  String toString() => 'PartnerCreateDto[sharedWithId=$sharedWithId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'sharedWithId'] = this.sharedWithId;
+    return json;
+  }
+
+  /// Returns a new [PartnerCreateDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static PartnerCreateDto? fromJson(dynamic value) {
+    upgradeDto(value, "PartnerCreateDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return PartnerCreateDto(
+        sharedWithId: mapValueOfType<String>(json, r'sharedWithId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<PartnerCreateDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <PartnerCreateDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = PartnerCreateDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, PartnerCreateDto> mapFromJson(dynamic json) {
+    final map = <String, PartnerCreateDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = PartnerCreateDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of PartnerCreateDto-objects as value to a dart map
+  static Map<String, List<PartnerCreateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<PartnerCreateDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = PartnerCreateDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'sharedWithId',
+  };
+}
+

mobile/openapi/lib/model/partner_update_dto.dart

@@ -10,16 +10,16 @@
 
 part of openapi.api;
 
-class UpdatePartnerDto {
-  /// Returns a new [UpdatePartnerDto] instance.
-  UpdatePartnerDto({
+class PartnerUpdateDto {
+  /// Returns a new [PartnerUpdateDto] instance.
+  PartnerUpdateDto({
     required this.inTimeline,
   });
 
   bool inTimeline;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is UpdatePartnerDto &&
+  bool operator ==(Object other) => identical(this, other) || other is PartnerUpdateDto &&
     other.inTimeline == inTimeline;
 
   @override
@@ -28,7 +28,7 @@ class UpdatePartnerDto {
     (inTimeline.hashCode);
 
   @override
-  String toString() => 'UpdatePartnerDto[inTimeline=$inTimeline]';
+  String toString() => 'PartnerUpdateDto[inTimeline=$inTimeline]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -36,26 +36,26 @@ class UpdatePartnerDto {
     return json;
   }
 
-  /// Returns a new [UpdatePartnerDto] instance and imports its values from
+  /// Returns a new [PartnerUpdateDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static UpdatePartnerDto? fromJson(dynamic value) {
-    upgradeDto(value, "UpdatePartnerDto");
+  static PartnerUpdateDto? fromJson(dynamic value) {
+    upgradeDto(value, "PartnerUpdateDto");
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return UpdatePartnerDto(
+      return PartnerUpdateDto(
         inTimeline: mapValueOfType<bool>(json, r'inTimeline')!,
       );
     }
     return null;
   }
 
-  static List<UpdatePartnerDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UpdatePartnerDto>[];
+  static List<PartnerUpdateDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <PartnerUpdateDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = UpdatePartnerDto.fromJson(row);
+        final value = PartnerUpdateDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -64,12 +64,12 @@ class UpdatePartnerDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, UpdatePartnerDto> mapFromJson(dynamic json) {
-    final map = <String, UpdatePartnerDto>{};
+  static Map<String, PartnerUpdateDto> mapFromJson(dynamic json) {
+    final map = <String, PartnerUpdateDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = UpdatePartnerDto.fromJson(entry.value);
+        final value = PartnerUpdateDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -78,14 +78,14 @@ class UpdatePartnerDto {
     return map;
   }
 
-  // maps a json object with a list of UpdatePartnerDto-objects as value to a dart map
-  static Map<String, List<UpdatePartnerDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UpdatePartnerDto>>{};
+  // maps a json object with a list of PartnerUpdateDto-objects as value to a dart map
+  static Map<String, List<PartnerUpdateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<PartnerUpdateDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = UpdatePartnerDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = PartnerUpdateDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/pigeon/native_sync_api.dart

@@ -96,4 +96,6 @@ abstract class NativeSyncApi {
 
   @TaskQueue(type: TaskQueueType.serialBackgroundThread)
   List<Uint8List?> hashPaths(List<String> paths);
+
+  Map<String, String?> getCloudIdForAssetIds(List<String> assetIds);
 }

mobile/test/domain/services/hash_service_test.dart

@@ -3,9 +3,9 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/hash.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 import '../../fixtures/album.stub.dart';
@@ -39,6 +39,7 @@ void main() {
     registerFallbackValue(LocalAlbumStub.recent);
     registerFallbackValue(LocalAssetStub.image1);
 
+    when(() => mockAssetRepo.getHashMappingFromCloudId()).thenAnswer((_) async => []);
     when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
     when(() => mockStorageRepo.clearCache()).thenAnswer((_) async => {});
   });
@@ -87,7 +88,8 @@ void main() {
       await sut.hashAssets();
 
       verify(() => mockNativeApi.hashPaths(['image-path'])).called(1);
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
+      final captured =
+          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
       expect(captured.length, 1);
       expect(captured[0].checksum, base64.encode(hash));
     });
@@ -107,7 +109,8 @@ void main() {
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
+      final captured =
+          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
       expect(captured.length, 0);
     });
 
@@ -128,7 +131,8 @@ void main() {
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
+      final captured =
+          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
       expect(captured.length, 0);
     });
 
@@ -224,9 +228,10 @@ void main() {
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
+      final captured =
+          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
       expect(captured.length, 1);
-      expect(captured.first.id, asset1.id);
+      expect(captured.first.assetId, asset1.id);
     });
   });
 }

mobile/test/domain/services/sync_stream_service_test.dart

@@ -30,8 +30,9 @@ void main() {
   late SyncStreamService sut;
   late SyncStreamRepository mockSyncStreamRepo;
   late SyncApiRepository mockSyncApiRepo;
-  late Function(List<SyncEvent>, Function()) handleEventsCallback;
+  late Future<void> Function(List<SyncEvent>, Function(), Function()) handleEventsCallback;
   late _MockAbortCallbackWrapper mockAbortCallbackWrapper;
+  late _MockAbortCallbackWrapper mockResetCallbackWrapper;
 
   successHandler(Invocation _) async => true;
 
@@ -39,6 +40,7 @@ void main() {
     mockSyncStreamRepo = MockSyncStreamRepository();
     mockSyncApiRepo = MockSyncApiRepository();
     mockAbortCallbackWrapper = _MockAbortCallbackWrapper();
+    mockResetCallbackWrapper = _MockAbortCallbackWrapper();
 
     when(() => mockAbortCallbackWrapper()).thenReturn(false);
 
@@ -46,6 +48,10 @@ void main() {
       handleEventsCallback = invocation.positionalArguments.first;
     });
 
+    when(() => mockSyncApiRepo.streamChanges(any(), onReset: any(named: 'onReset'))).thenAnswer((invocation) async {
+      handleEventsCallback = invocation.positionalArguments.first;
+    });
+
     when(() => mockSyncApiRepo.ack(any())).thenAnswer((_) async => {});
 
     when(() => mockSyncStreamRepo.updateUsersV1(any())).thenAnswer(successHandler);
@@ -86,7 +92,7 @@ void main() {
 
   Future<void> simulateEvents(List<SyncEvent> events) async {
     await sut.sync();
-    await handleEventsCallback(events, mockAbortCallbackWrapper.call);
+    await handleEventsCallback(events, mockAbortCallbackWrapper.call, mockResetCallbackWrapper.call);
   }
 
   group("SyncStreamService - _handleEvents", () {
@@ -156,7 +162,7 @@ void main() {
         when(() => cancellationChecker()).thenReturn(true);
       });
 
-      await handleEventsCallback(events, mockAbortCallbackWrapper.call);
+      await handleEventsCallback(events, mockAbortCallbackWrapper.call, mockResetCallbackWrapper.call);
 
       verify(() => mockSyncStreamRepo.deleteUsersV1(any())).called(1);
       verifyNever(() => mockSyncStreamRepo.updateUsersV1(any()));
@@ -188,7 +194,11 @@ void main() {
 
       final events = [SyncStreamStub.userDeleteV1, SyncStreamStub.userV1Admin, SyncStreamStub.partnerDeleteV1];
 
-      final processingFuture = handleEventsCallback(events, mockAbortCallbackWrapper.call);
+      final processingFuture = handleEventsCallback(
+        events,
+        mockAbortCallbackWrapper.call,
+        mockResetCallbackWrapper.call,
+      );
       await pumpEventQueue();
 
       expect(handler1Started, isTrue);

mobile/test/drift/main/generated/schema.dart

@@ -12,6 +12,8 @@ import 'schema_v6.dart' as v6;
 import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
 import 'schema_v9.dart' as v9;
+import 'schema_v10.dart' as v10;
+import 'schema_v11.dart' as v11;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -35,10 +37,14 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v8.DatabaseAtV8(db);
       case 9:
         return v9.DatabaseAtV9(db);
+      case 10:
+        return v10.DatabaseAtV10(db);
+      case 11:
+        return v11.DatabaseAtV11(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
 }

mobile/test/fixtures/user.stub.dart

@@ -1,5 +1,4 @@
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 
 abstract final class UserStub {
   const UserStub._();

mobile/test/infrastructure/repositories/sync_api_repository_test.dart

@@ -63,7 +63,9 @@ void main() {
     }
   });
 
-  Future<void> streamChanges(Function(List<SyncEvent>, Function() abort) onDataCallback) {
+  Future<void> streamChanges(
+    Future<void> Function(List<SyncEvent>, Function() abort, Function() reset) onDataCallback,
+  ) {
     return sut.streamChanges(onDataCallback, batchSize: testBatchSize, httpClient: mockHttpClient);
   }
 
@@ -72,7 +74,7 @@ void main() {
     bool abortWasCalledInCallback = false;
     List<SyncEvent> receivedEventsBatch1 = [];
 
-    onDataCallback(List<SyncEvent> events, Function() abort) {
+    Future<void> onDataCallback(List<SyncEvent> events, Function() abort, Function() _) async {
       onDataCallCount++;
       if (onDataCallCount == 1) {
         receivedEventsBatch1 = events;
@@ -116,7 +118,7 @@ void main() {
     int onDataCallCount = 0;
     bool abortWasCalledInCallback = false;
 
-    onDataCallback(List<SyncEvent> events, Function() abort) {
+    Future<void> onDataCallback(List<SyncEvent> events, Function() abort, Function() _) async {
       onDataCallCount++;
       if (onDataCallCount == 1) {
         abort();
@@ -158,7 +160,7 @@ void main() {
     List<SyncEvent> receivedEventsBatch1 = [];
     List<SyncEvent> receivedEventsBatch2 = [];
 
-    onDataCallback(List<SyncEvent> events, Function() _) {
+    Future<void> onDataCallback(List<SyncEvent> events, Function() _, Function() __) async {
       onDataCallCount++;
       if (onDataCallCount == 1) {
         receivedEventsBatch1 = events;
@@ -202,7 +204,7 @@ void main() {
     final streamError = Exception("Network Error");
     int onDataCallCount = 0;
 
-    onDataCallback(List<SyncEvent> events, Function() _) {
+    Future<void> onDataCallback(List<SyncEvent> events, Function() _, Function() __) async {
       onDataCallCount++;
     }
 
@@ -229,8 +231,7 @@ void main() {
     when(() => mockStreamedResponse.stream).thenAnswer((_) => http.ByteStream(errorBodyController.stream));
 
     int onDataCallCount = 0;
-
-    onDataCallback(List<SyncEvent> events, Function() _) {
+    Future<void> onDataCallback(List<SyncEvent> events, Function() _, Function() __) async {
       onDataCallCount++;
     }
 

open-api/immich-openapi-specs.json

@@ -4994,6 +4994,48 @@
         ],
         "x-immich-permission": "partner.read",
         "description": "This endpoint requires the `partner.read` permission."
+      },
+      "post": {
+        "operationId": "createPartner",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PartnerCreateDto"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PartnerResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Partners"
+        ],
+        "x-immich-permission": "partner.create",
+        "description": "This endpoint requires the `partner.create` permission."
       }
     },
     "/partners/{id}": {
@@ -5033,7 +5075,9 @@
         "description": "This endpoint requires the `partner.delete` permission."
       },
       "post": {
-        "operationId": "createPartner",
+        "deprecated": true,
+        "description": "This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.",
+        "operationId": "createPartnerDeprecated",
         "parameters": [
           {
             "name": "id",
@@ -5069,10 +5113,13 @@
           }
         ],
         "tags": [
-          "Partners"
+          "Partners",
+          "Deprecated"
         ],
-        "x-immich-permission": "partner.create",
-        "description": "This endpoint requires the `partner.create` permission."
+        "x-immich-lifecycle": {
+          "deprecatedAt": "v1.141.0"
+        },
+        "x-immich-permission": "partner.create"
       },
       "put": {
         "operationId": "updatePartner",
@@ -5091,7 +5138,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UpdatePartnerDto"
+                "$ref": "#/components/schemas/PartnerUpdateDto"
               }
             }
           },
@@ -12853,6 +12900,18 @@
         ],
         "type": "object"
       },
+      "PartnerCreateDto": {
+        "properties": {
+          "sharedWithId": {
+            "format": "uuid",
+            "type": "string"
+          }
+        },
+        "required": [
+          "sharedWithId"
+        ],
+        "type": "object"
+      },
       "PartnerDirection": {
         "enum": [
           "shared-by",
@@ -12899,6 +12958,17 @@
         ],
         "type": "object"
       },
+      "PartnerUpdateDto": {
+        "properties": {
+          "inTimeline": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "inTimeline"
+        ],
+        "type": "object"
+      },
       "PeopleResponse": {
         "properties": {
           "enabled": {
@@ -17241,17 +17311,6 @@
         },
         "type": "object"
       },
-      "UpdatePartnerDto": {
-        "properties": {
-          "inTimeline": {
-            "type": "boolean"
-          }
-        },
-        "required": [
-          "inTimeline"
-        ],
-        "type": "object"
-      },
       "UsageByUserDto": {
         "properties": {
           "photos": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -811,7 +811,10 @@ export type PartnerResponseDto = {
     profileChangedAt: string;
     profileImagePath: string;
 };
-export type UpdatePartnerDto = {
+export type PartnerCreateDto = {
+    sharedWithId: string;
+};
+export type PartnerUpdateDto = {
     inTimeline: boolean;
 };
 export type PeopleResponseDto = {
@@ -3122,6 +3125,21 @@ export function getPartners({ direction }: {
         ...opts
     }));
 }
+/**
+ * This endpoint requires the `partner.create` permission.
+ */
+export function createPartner({ partnerCreateDto }: {
+    partnerCreateDto: PartnerCreateDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 201;
+        data: PartnerResponseDto;
+    }>("/partners", oazapfts.json({
+        ...opts,
+        method: "POST",
+        body: partnerCreateDto
+    })));
+}
 /**
  * This endpoint requires the `partner.delete` permission.
  */
@@ -3134,9 +3152,9 @@ export function removePartner({ id }: {
     }));
 }
 /**
- * This endpoint requires the `partner.create` permission.
+ * This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
  */
-export function createPartner({ id }: {
+export function createPartnerDeprecated({ id }: {
     id: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3150,9 +3168,9 @@ export function createPartner({ id }: {
 /**
  * This endpoint requires the `partner.update` permission.
  */
-export function updatePartner({ id, updatePartnerDto }: {
+export function updatePartner({ id, partnerUpdateDto }: {
     id: string;
-    updatePartnerDto: UpdatePartnerDto;
+    partnerUpdateDto: PartnerUpdateDto;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3160,7 +3178,7 @@ export function updatePartner({ id, updatePartnerDto }: {
     }>(`/partners/${encodeURIComponent(id)}`, oazapfts.json({
         ...opts,
         method: "PUT",
-        body: updatePartnerDto
+        body: partnerUpdateDto
     })));
 }
 /**

server/src/config.ts

@@ -191,7 +191,7 @@ export const defaults = Object.freeze<SystemConfig>({
     targetVideoCodec: VideoCodec.H264,
     acceptedVideoCodecs: [VideoCodec.H264],
     targetAudioCodec: AudioCodec.Aac,
-    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus, AudioCodec.PcmS16le],
+    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus],
     acceptedContainers: [VideoContainer.Mov, VideoContainer.Ogg, VideoContainer.Webm],
     targetResolution: '720',
     maxBitrate: '0',

server/src/controllers/partner.controller.spec.ts

@@ -0,0 +1,101 @@
+import { PartnerController } from 'src/controllers/partner.controller';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { PartnerService } from 'src/services/partner.service';
+import request from 'supertest';
+import { errorDto } from 'test/medium/responses';
+import { factory } from 'test/small.factory';
+import { automock, ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
+
+describe(PartnerController.name, () => {
+  let ctx: ControllerContext;
+  const service = mockBaseService(PartnerService);
+
+  beforeAll(async () => {
+    ctx = await controllerSetup(PartnerController, [
+      { provide: PartnerService, useValue: service },
+      { provide: LoggingRepository, useValue: automock(LoggingRepository, { strict: false }) },
+    ]);
+    return () => ctx.close();
+  });
+
+  beforeEach(() => {
+    service.resetAllMocks();
+    ctx.reset();
+  });
+
+  describe('GET /partners', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/partners');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it(`should require a direction`, async () => {
+      const { status, body } = await request(ctx.getHttpServer()).get(`/partners`).set('Authorization', `Bearer token`);
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest([
+          'direction should not be empty',
+          expect.stringContaining('direction must be one of the following values:'),
+        ]),
+      );
+    });
+
+    it(`should require direction to be an enum`, async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .get(`/partners`)
+        .query({ direction: 'invalid' })
+        .set('Authorization', `Bearer token`);
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest([expect.stringContaining('direction must be one of the following values:')]),
+      );
+    });
+  });
+
+  describe('POST /partners', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).post('/partners');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it(`should require sharedWithId to be a uuid`, async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .post(`/partners`)
+        .send({ sharedWithId: 'invalid' })
+        .set('Authorization', `Bearer token`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest([expect.stringContaining('must be a UUID')]));
+    });
+  });
+
+  describe('PUT /partners/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).put(`/partners/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it(`should require id to be a uuid`, async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .put(`/partners/invalid`)
+        .send({ inTimeline: true })
+        .set('Authorization', `Bearer token`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest([expect.stringContaining('must be a UUID')]));
+    });
+  });
+
+  describe('DELETE /partners/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete(`/partners/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it(`should require id to be a uuid`, async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .delete(`/partners/invalid`)
+        .set('Authorization', `Bearer token`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest([expect.stringContaining('must be a UUID')]));
+    });
+  });
+});

server/src/controllers/partner.controller.ts

@@ -1,7 +1,8 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
+import { EndpointLifecycle } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { PartnerResponseDto, PartnerSearchDto, UpdatePartnerDto } from 'src/dtos/partner.dto';
+import { PartnerCreateDto, PartnerResponseDto, PartnerSearchDto, PartnerUpdateDto } from 'src/dtos/partner.dto';
 import { Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { PartnerService } from 'src/services/partner.service';
@@ -18,10 +19,17 @@ export class PartnerController {
     return this.service.search(auth, dto);
   }
 
-  @Post(':id')
+  @Post()
   @Authenticated({ permission: Permission.PartnerCreate })
-  createPartner(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PartnerResponseDto> {
-    return this.service.create(auth, id);
+  createPartner(@Auth() auth: AuthDto, @Body() dto: PartnerCreateDto): Promise<PartnerResponseDto> {
+    return this.service.create(auth, dto);
+  }
+
+  @Post(':id')
+  @EndpointLifecycle({ deprecatedAt: 'v1.141.0' })
+  @Authenticated({ permission: Permission.PartnerCreate })
+  createPartnerDeprecated(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PartnerResponseDto> {
+    return this.service.create(auth, { sharedWithId: id });
   }
 
   @Put(':id')
@@ -29,7 +37,7 @@ export class PartnerController {
   updatePartner(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
-    @Body() dto: UpdatePartnerDto,
+    @Body() dto: PartnerUpdateDto,
   ): Promise<PartnerResponseDto> {
     return this.service.update(auth, id, dto);
   }

server/src/dtos/partner.dto.ts

@@ -1,9 +1,14 @@
 import { IsNotEmpty } from 'class-validator';
 import { UserResponseDto } from 'src/dtos/user.dto';
 import { PartnerDirection } from 'src/repositories/partner.repository';
-import { ValidateEnum } from 'src/validation';
+import { ValidateEnum, ValidateUUID } from 'src/validation';
 
-export class UpdatePartnerDto {
+export class PartnerCreateDto {
+  @ValidateUUID()
+  sharedWithId!: string;
+}
+
+export class PartnerUpdateDto {
   @IsNotEmpty()
   inTimeline!: boolean;
 }

server/src/queries/sync.repository.sql

@@ -591,6 +591,7 @@ from
 where
   "user"."updateId" < $1
   and "user"."updateId" > $2
+  and "id" = $3
 order by
   "user"."updateId" asc
 

server/src/repositories/sync.repository.ts

@@ -412,6 +412,7 @@ class AuthUserSync extends BaseSync {
     return this.upsertQuery('user', options)
       .select(columns.syncUser)
       .select(['isAdmin', 'pinCode', 'oauthId', 'storageLabel', 'quotaSizeInBytes', 'quotaUsageInBytes'])
+      .where('id', '=', options.userId)
       .stream();
   }
 }

server/src/services/backup.service.ts

@@ -118,7 +118,7 @@ export class BackupService extends BaseService {
           {
             env: {
               PATH: process.env.PATH,
-              PGPASSWORD: isUrlConnection ? undefined : config.password,
+              PGPASSWORD: isUrlConnection ? new URL(config.url).password : config.password,
             },
           },
         );

server/src/services/partner.service.spec.ts

@@ -53,7 +53,7 @@ describe(PartnerService.name, () => {
       mocks.partner.get.mockResolvedValue(void 0);
       mocks.partner.create.mockResolvedValue(partner);
 
-      await expect(sut.create(auth, user2.id)).resolves.toBeDefined();
+      await expect(sut.create(auth, { sharedWithId: user2.id })).resolves.toBeDefined();
 
       expect(mocks.partner.create).toHaveBeenCalledWith({
         sharedById: partner.sharedById,
@@ -69,7 +69,7 @@ describe(PartnerService.name, () => {
 
       mocks.partner.get.mockResolvedValue(partner);
 
-      await expect(sut.create(auth, user2.id)).rejects.toBeInstanceOf(BadRequestException);
+      await expect(sut.create(auth, { sharedWithId: user2.id })).rejects.toBeInstanceOf(BadRequestException);
 
       expect(mocks.partner.create).not.toHaveBeenCalled();
     });

server/src/services/partner.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { Partner } from 'src/database';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { PartnerResponseDto, PartnerSearchDto, UpdatePartnerDto } from 'src/dtos/partner.dto';
+import { PartnerCreateDto, PartnerResponseDto, PartnerSearchDto, PartnerUpdateDto } from 'src/dtos/partner.dto';
 import { mapUser } from 'src/dtos/user.dto';
 import { Permission } from 'src/enum';
 import { PartnerDirection, PartnerIds } from 'src/repositories/partner.repository';
@@ -9,7 +9,7 @@ import { BaseService } from 'src/services/base.service';
 
 @Injectable()
 export class PartnerService extends BaseService {
-  async create(auth: AuthDto, sharedWithId: string): Promise<PartnerResponseDto> {
+  async create(auth: AuthDto, { sharedWithId }: PartnerCreateDto): Promise<PartnerResponseDto> {
     const partnerId: PartnerIds = { sharedById: auth.user.id, sharedWithId };
     const exists = await this.partnerRepository.get(partnerId);
     if (exists) {
@@ -39,7 +39,7 @@ export class PartnerService extends BaseService {
       .map((partner) => this.mapPartner(partner, direction));
   }
 
-  async update(auth: AuthDto, sharedById: string, dto: UpdatePartnerDto): Promise<PartnerResponseDto> {
+  async update(auth: AuthDto, sharedById: string, dto: PartnerUpdateDto): Promise<PartnerResponseDto> {
     await this.requireAccess({ auth, permission: Permission.PartnerUpdate, ids: [sharedById] });
     const partnerId: PartnerIds = { sharedById, sharedWithId: auth.user.id };
 

server/src/services/system-config.service.spec.ts

@@ -52,7 +52,7 @@ const updatedConfig = Object.freeze<SystemConfig>({
     threads: 0,
     preset: 'ultrafast',
     targetAudioCodec: AudioCodec.Aac,
-    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus, AudioCodec.PcmS16le],
+    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus],
     targetResolution: '720',
     targetVideoCodec: VideoCodec.H264,
     acceptedVideoCodecs: [VideoCodec.H264],

server/test/medium/specs/sync/sync-auth-user.spec.ts

@@ -84,4 +84,23 @@ describe(SyncEntityType.AuthUserV1, () => {
       expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
     ]);
   });
+
+  it('should only sync the auth user', async () => {
+    const { auth, user, ctx } = await setup(await getKyselyDB());
+
+    await ctx.newUser();
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AuthUsersV1]);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: user.id,
+          isAdmin: false,
+        }),
+        type: 'AuthUserV1',
+      },
+      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
+    ]);
+  });
 });

web/src/lib/components/user-settings-page/partner-settings.svelte

@@ -104,7 +104,7 @@
 
     try {
       for (const user of users) {
-        await createPartner({ id: user.id });
+        await createPartner({ partnerCreateDto: { sharedWithId: user.id } });
       }
 
       await refreshPartners();
@@ -115,7 +115,7 @@
 
   const handleShowOnTimelineChanged = async (partner: PartnerSharing, inTimeline: boolean) => {
     try {
-      await updatePartner({ id: partner.user.id, updatePartnerDto: { inTimeline } });
+      await updatePartner({ id: partner.user.id, partnerUpdateDto: { inTimeline } });
 
       partner.inTimeline = inTimeline;
     } catch (error) {