drift(mobile): drift auth user sync

mobile/lib/providers/infrastructure/action.provider.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
 import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
@@ -62,12 +63,16 @@ class ActionNotifier extends Notifier<void> {
   }
 
   List<String> _getOwnedRemoteIdsForSource(ActionSource source) {
-    final ownerId = ref.read(currentUserProvider)?.id;
-    return _getAssets(source).whereType<RemoteAsset>().ownedAssets(ownerId).toIds().toList(growable: false);
+    User? user;
+    ref.read(currentUserNotifierProvider).whenData((asyncUser) => user = asyncUser);
+    return _getAssets(source).whereType<RemoteAsset>().ownedAssets(user?.id).toIds().toList(growable: false);
   }
 
   List<RemoteAsset> _getOwnedRemoteAssetsForSource(ActionSource source) {
-    final ownerId = ref.read(currentUserProvider)?.id;
+    User? user;
+    ref.read(currentUserNotifierProvider).whenData((asyncUser) => user = asyncUser);
+
+    final ownerId = user?.id;
     return _getIdsForSource<RemoteAsset>(source).ownedAssets(ownerId).toList();
   }
 

mobile/lib/providers/infrastructure/memory.provider.dart

@@ -1,7 +1,8 @@
 import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/memory.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'db.provider.dart';
@@ -15,12 +16,14 @@ final driftMemoryServiceProvider = Provider<DriftMemoryService>(
 );
 
 final driftMemoryFutureProvider = FutureProvider.autoDispose<List<DriftMemory>>((ref) async {
-  final user = ref.watch(currentUserProvider);
+  User? user;
+  ref.watch(currentUserNotifierProvider).whenData((asyncUser) => user = asyncUser);
+
   if (user == null) {
     return [];
   }
 
   final service = ref.watch(driftMemoryServiceProvider);
 
-  return service.getMemoryLane(user.id);
+  return service.getMemoryLane(user!.id);
 });

mobile/lib/providers/infrastructure/partner.provider.dart

@@ -1,29 +1,30 @@
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/partner.service.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-class PartnerNotifier extends Notifier<List<PartnerUserDto>> {
+class PartnerNotifier extends Notifier<List<PartnerUser>> {
   late DriftPartnerService _driftPartnerService;
 
   @override
-  List<PartnerUserDto> build() {
+  List<PartnerUser> build() {
     _driftPartnerService = ref.read(driftPartnerServiceProvider);
     return [];
   }
 
   Future<void> _loadPartners() async {
-    final currentUser = ref.read(currentUserProvider);
+    User? currentUser;
+    ref.read(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
     if (currentUser == null) {
       return;
     }
 
-    state = await _driftPartnerService.getSharedWith(currentUser.id);
+    state = await _driftPartnerService.getSharedWith(currentUser!.id);
   }
 
-  Future<List<PartnerUserDto>> getPartners(String userId) async {
+  Future<List<PartnerUser>> getPartners(String userId) async {
     final partners = await _driftPartnerService.getSharedWith(userId);
     state = partners;
     return partners;
@@ -34,54 +35,64 @@ class PartnerNotifier extends Notifier<List<PartnerUserDto>> {
     await _loadPartners();
   }
 
-  Future<void> addPartner(PartnerUserDto partner) async {
-    final currentUser = ref.read(currentUserProvider);
+  Future<void> addPartner(PartnerUser partner) async {
+    User? currentUser;
+    ref.read(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
     if (currentUser == null) {
       return;
     }
 
-    await _driftPartnerService.addPartner(partner.id, currentUser.id);
+    await _driftPartnerService.addPartner(partner.id, currentUser!.id);
     await _loadPartners();
     ref.invalidate(driftAvailablePartnerProvider);
     ref.invalidate(driftSharedByPartnerProvider);
   }
 
-  Future<void> removePartner(PartnerUserDto partner) async {
-    final currentUser = ref.read(currentUserProvider);
+  Future<void> removePartner(PartnerUser partner) async {
+    User? currentUser;
+    ref.read(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
     if (currentUser == null) {
       return;
     }
 
-    await _driftPartnerService.removePartner(partner.id, currentUser.id);
+    await _driftPartnerService.removePartner(partner.id, currentUser!.id);
     await _loadPartners();
     ref.invalidate(driftAvailablePartnerProvider);
     ref.invalidate(driftSharedByPartnerProvider);
   }
 }
 
-final driftAvailablePartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
-  final currentUser = ref.watch(currentUserProvider);
+final driftAvailablePartnerProvider = FutureProvider.autoDispose<List<PartnerUser>>((ref) {
+  User? currentUser;
+  ref.watch(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
   if (currentUser == null) {
     return [];
   }
 
-  return ref.watch(driftPartnerServiceProvider).getAvailablePartners(currentUser.id);
+  return ref.watch(driftPartnerServiceProvider).getAvailablePartners(currentUser!.id);
 });
 
-final driftSharedByPartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
-  final currentUser = ref.watch(currentUserProvider);
+final driftSharedByPartnerProvider = FutureProvider.autoDispose<List<PartnerUser>>((ref) {
+  User? currentUser;
+  ref.watch(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
   if (currentUser == null) {
     return [];
   }
 
-  return ref.watch(driftPartnerServiceProvider).getSharedBy(currentUser.id);
+  return ref.watch(driftPartnerServiceProvider).getSharedBy(currentUser!.id);
 });
 
-final driftSharedWithPartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
-  final currentUser = ref.watch(currentUserProvider);
+final driftSharedWithPartnerProvider = FutureProvider.autoDispose<List<PartnerUser>>((ref) {
+  User? currentUser;
+  ref.watch(currentUserNotifierProvider).whenData((asyncUser) => currentUser = asyncUser);
+
   if (currentUser == null) {
     return [];
   }
 
-  return ref.watch(driftPartnerServiceProvider).getSharedWith(currentUser.id);
+  return ref.watch(driftPartnerServiceProvider).getSharedWith(currentUser!.id);
 });

mobile/lib/providers/infrastructure/remote_album.provider.dart

@@ -211,7 +211,7 @@ final remoteAlbumDateRangeProvider = FutureProvider.family<(DateTime, DateTime),
   },
 );
 
-final remoteAlbumSharedUsersProvider = FutureProvider.autoDispose.family<List<UserDto>, String>(
+final remoteAlbumSharedUsersProvider = FutureProvider.autoDispose.family<List<User>, String>(
   (ref, albumId) async {
     final link = ref.keepAlive();
     ref.onDispose(() => link.close());

mobile/lib/providers/infrastructure/timeline.provider.dart

@@ -1,10 +1,11 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 
 final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
   (ref) => DriftTimelineRepository(ref.watch(driftProvider)),
@@ -35,7 +36,10 @@ final timelineFactoryProvider = Provider<TimelineFactory>(
 
 final timelineUsersProvider = StreamProvider<List<String>>(
   (ref) {
-    final currentUserId = ref.watch(currentUserProvider.select((u) => u?.id));
+    User? user;
+    ref.watch(currentUserNotifierProvider).whenData((asyncUser) => user = asyncUser);
+
+    final currentUserId = user?.id;
     if (currentUserId == null) {
       return Stream.value([]);
     }

mobile/lib/providers/infrastructure/user.provider.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/infrastructure/repositories/user_api.repository.da
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -27,7 +28,28 @@ UserService userService(Ref ref) => UserService(
       storeService: ref.watch(storeServiceProvider),
     );
 
-/// Drifts
+class CurrentUserNotifier extends AsyncNotifier<User?> {
+  @override
+  Future<User?> build() async {
+    return await ref.watch(driftUserServiceProvider).getMyUser();
+  }
+}
+
+final currentUserNotifierProvider = AsyncNotifierProvider<CurrentUserNotifier, User?>(
+  CurrentUserNotifier.new,
+);
+
+final driftUserRepositoryProvider = Provider<DriftUserRepository>(
+  (ref) => DriftUserRepository(ref.watch(driftProvider)),
+);
+
+final driftUserServiceProvider = Provider<DriftUserService>(
+  (ref) => DriftUserService(
+    ref.watch(driftUserRepositoryProvider),
+    ref.watch(settingsProvider),
+  ),
+);
+
 final driftPartnerRepositoryProvider = Provider<DriftPartnerRepository>(
   (ref) => DriftPartnerRepository(ref.watch(driftProvider)),
 );
@@ -39,6 +61,6 @@ final driftPartnerServiceProvider = Provider<DriftPartnerService>(
   ),
 );
 
-final partnerUsersProvider = NotifierProvider<PartnerNotifier, List<PartnerUserDto>>(
+final partnerUsersProvider = NotifierProvider<PartnerNotifier, List<PartnerUser>>(
   PartnerNotifier.new,
 );