refactor: migrate advance config from store

# Conflicts:
#	mobile/lib/domain/models/settings_key.dart

mobile/integration_test/background_sync_teardown_test.dart

@@ -40,7 +40,7 @@ void main() {
   tearDown(() async {
     await workerManagerPatch.dispose();
     await server.close();
-    await Store.delete(StoreKey.serverEndpoint);
+    await Store.delete(StoreKey.legacyServerEndpoint);
     await Store.delete(StoreKey.syncMigrationStatus);
   });
 
@@ -119,7 +119,9 @@ void main() {
     final releaseTxn = Completer<void>();
     final txnHeld = Completer<void>();
     final txn = drift.transaction(() async {
-      await drift.into(drift.userEntity).insert(
+      await drift
+          .into(drift.userEntity)
+          .insert(
             UserEntityCompanion.insert(
               id: 'holder',
               name: 'holder',

mobile/lib/domain/models/config/advanced_config.dart

@@ -0,0 +1,33 @@
+class AdvancedConfig {
+  final bool troubleshooting;
+  final bool enableHapticFeedback;
+  final bool readonlyModeEnabled;
+
+  const AdvancedConfig({
+    this.troubleshooting = false,
+    this.enableHapticFeedback = true,
+    this.readonlyModeEnabled = false,
+  });
+
+  AdvancedConfig copyWith({bool? troubleshooting, bool? enableHapticFeedback, bool? readonlyModeEnabled}) =>
+      AdvancedConfig(
+        troubleshooting: troubleshooting ?? this.troubleshooting,
+        enableHapticFeedback: enableHapticFeedback ?? this.enableHapticFeedback,
+        readonlyModeEnabled: readonlyModeEnabled ?? this.readonlyModeEnabled,
+      );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is AdvancedConfig &&
+          other.troubleshooting == troubleshooting &&
+          other.enableHapticFeedback == enableHapticFeedback &&
+          other.readonlyModeEnabled == readonlyModeEnabled);
+
+  @override
+  int get hashCode => Object.hash(troubleshooting, enableHapticFeedback, readonlyModeEnabled);
+
+  @override
+  String toString() =>
+      'AdvancedConfig(troubleshooting: $troubleshooting, enableHapticFeedback: $enableHapticFeedback, readonlyModeEnabled: $readonlyModeEnabled)';
+}

mobile/lib/domain/models/config/app_config.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/advanced_config.dart';
 import 'package:immich_mobile/domain/models/config/album_config.dart';
 import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
@@ -32,6 +33,7 @@ class AppConfig {
   final BackupConfig backup;
   final NetworkConfig network;
   final ShareConfig share;
+  final AdvancedConfig advanced;
 
   const AppConfig({
     this.logLevel = .info,
@@ -46,6 +48,7 @@ class AppConfig {
     this.backup = const .new(),
     this.network = const .new(),
     this.share = const .new(),
+    this.advanced = const .new(),
   });
 
   AppConfig copyWith({
@@ -61,6 +64,7 @@ class AppConfig {
     BackupConfig? backup,
     NetworkConfig? network,
     ShareConfig? share,
+    AdvancedConfig? advanced,
   }) => .new(
     logLevel: logLevel ?? this.logLevel,
     theme: theme ?? this.theme,
@@ -74,6 +78,7 @@ class AppConfig {
     backup: backup ?? this.backup,
     network: network ?? this.network,
     share: share ?? this.share,
+    advanced: advanced ?? this.advanced,
   );
 
   @override
@@ -91,17 +96,31 @@ class AppConfig {
           other.album == album &&
           other.backup == backup &&
           other.network == network &&
-          other.share == share);
+          other.share == share &&
+          other.advanced == advanced);
 
   @override
-  int get hashCode =>
-      Object.hash(logLevel, theme, cleanup, map, timeline, image, viewer, slideshow, album, backup, network, share);
+  int get hashCode => Object.hash(
+    logLevel,
+    theme,
+    cleanup,
+    map,
+    timeline,
+    image,
+    viewer,
+    slideshow,
+    album,
+    backup,
+    network,
+    share,
+    advanced,
+  );
 
   @override
   String toString() =>
-      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network, share: $share)';
+      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network, share: $share, advanced: $advanced)';
 
-  T read<T extends Object>(SettingsKey<T> key) =>
+  T read<T>(SettingsKey<T> key) =>
       (switch (key) {
             .logLevel => logLevel,
             .themePrimaryColor => theme.primaryColor,
@@ -147,13 +166,16 @@ class AppConfig {
             .slideshowDuration => slideshow.duration,
             .slideshowLook => slideshow.look,
             .slideshowDirection => slideshow.direction,
+            .advancedTroubleshooting => advanced.troubleshooting,
+            .advancedEnableHapticFeedback => advanced.enableHapticFeedback,
+            .advancedReadonlyModeEnabled => advanced.readonlyModeEnabled,
           })
           as T;
 
-  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
+  factory AppConfig.fromEntries(Map<SettingsKey, Object?> overrides) =>
       overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));
 
-  AppConfig write<T extends Object>(SettingsKey<T> key, T value) {
+  AppConfig write<T, U extends T>(SettingsKey<T> key, U value) {
     return switch (key) {
       .logLevel => copyWith(logLevel: value as LogLevel),
       .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
@@ -167,8 +189,10 @@ class AppConfig {
       .viewerAutoPlayVideo => copyWith(viewer: viewer.copyWith(autoPlayVideo: value as bool)),
       .viewerTapToNavigate => copyWith(viewer: viewer.copyWith(tapToNavigate: value as bool)),
       .networkAutoEndpointSwitching => copyWith(network: network.copyWith(autoEndpointSwitching: value as bool)),
-      .networkPreferredWifiName => copyWith(network: network.copyWith(preferredWifiName: (value as String))),
-      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: (value as String))),
+      .networkPreferredWifiName => copyWith(
+        network: network.copyWith(preferredWifiName: .fromNullable((value as String?))),
+      ),
+      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: .fromNullable((value as String?)))),
       .networkExternalEndpointList => copyWith(network: network.copyWith(externalEndpointList: value as List<String>)),
       .networkCustomHeaders => copyWith(network: network.copyWith(customHeaders: value as Map<String, String>)),
       .albumSortMode => copyWith(album: album.copyWith(sortMode: value as AlbumSortMode)),
@@ -199,6 +223,9 @@ class AppConfig {
       .slideshowDuration => copyWith(slideshow: slideshow.copyWith(duration: value as int)),
       .slideshowLook => copyWith(slideshow: slideshow.copyWith(look: value as SlideshowLook)),
       .slideshowDirection => copyWith(slideshow: slideshow.copyWith(direction: value as SlideshowDirection)),
+      .advancedTroubleshooting => copyWith(advanced: advanced.copyWith(troubleshooting: value as bool)),
+      .advancedEnableHapticFeedback => copyWith(advanced: advanced.copyWith(enableHapticFeedback: value as bool)),
+      .advancedReadonlyModeEnabled => copyWith(advanced: advanced.copyWith(readonlyModeEnabled: value as bool)),
     };
   }
 }

mobile/lib/domain/models/config/network_config.dart

@@ -1,30 +1,31 @@
 import 'package:flutter/foundation.dart';
+import 'package:immich_mobile/utils/option.dart';
 
 class NetworkConfig {
   final bool autoEndpointSwitching;
-  final String preferredWifiName;
-  final String localEndpoint;
+  final String? preferredWifiName;
+  final String? localEndpoint;
   final List<String> externalEndpointList;
   final Map<String, String> customHeaders;
 
   const NetworkConfig({
     this.autoEndpointSwitching = false,
-    this.preferredWifiName = '',
-    this.localEndpoint = '',
+    this.preferredWifiName,
+    this.localEndpoint,
     this.externalEndpointList = const [],
     this.customHeaders = const {},
   });
 
   NetworkConfig copyWith({
     bool? autoEndpointSwitching,
-    String? preferredWifiName,
-    String? localEndpoint,
+    Option<String>? preferredWifiName,
+    Option<String>? localEndpoint,
     List<String>? externalEndpointList,
     Map<String, String>? customHeaders,
   }) => NetworkConfig(
     autoEndpointSwitching: autoEndpointSwitching ?? this.autoEndpointSwitching,
-    preferredWifiName: preferredWifiName ?? this.preferredWifiName,
-    localEndpoint: localEndpoint ?? this.localEndpoint,
+    preferredWifiName: preferredWifiName.patch(this.preferredWifiName),
+    localEndpoint: localEndpoint.patch(this.localEndpoint),
     externalEndpointList: externalEndpointList ?? this.externalEndpointList,
     customHeaders: customHeaders ?? this.customHeaders,
   );

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

@@ -0,0 +1,63 @@
+import 'package:immich_mobile/domain/models/value_codec.dart';
+import 'package:immich_mobile/utils/option.dart';
+
+enum SessionKey<T> {
+  serverUrl<String?>(),
+  accessToken<String?>(),
+  serverEndpoint<String?>();
+
+  ValueCodec<T> get _codec => ValueCodec.forType(T);
+
+  String encode(T value) => _codec.encode(value);
+
+  T decode(String raw) => _codec.decode(raw);
+}
+
+const defaultSession = Session();
+
+class Session {
+  final String? serverUrl;
+  final String? accessToken;
+  final String? serverEndpoint;
+
+  const Session({this.serverUrl, this.accessToken, this.serverEndpoint});
+
+  Session copyWith({Option<String>? serverUrl, Option<String>? accessToken, Option<String>? serverEndpoint}) => .new(
+    serverUrl: serverUrl.patch(this.serverUrl),
+    accessToken: accessToken.patch(this.accessToken),
+    serverEndpoint: serverEndpoint.patch(this.serverEndpoint),
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is Session &&
+          other.serverUrl == serverUrl &&
+          other.accessToken == accessToken &&
+          other.serverEndpoint == serverEndpoint);
+
+  @override
+  int get hashCode => Object.hash(serverUrl, accessToken, serverEndpoint);
+
+  @override
+  String toString() => 'Session(serverUrl: $serverUrl, accessToken: $accessToken, serverEndpoint: $serverEndpoint)';
+
+  T read<T>(SessionKey<T> key) =>
+      (switch (key) {
+            .serverUrl => serverUrl,
+            .accessToken => accessToken,
+            .serverEndpoint => serverEndpoint,
+          })
+          as T;
+
+  factory Session.fromEntries(Map<SessionKey, Object?> overrides) =>
+      overrides.entries.fold(const Session(), (session, entry) => session.write(entry.key, entry.value));
+
+  Session write<T, U extends T>(SessionKey<T> key, U value) {
+    return switch (key) {
+      .serverUrl => copyWith(serverUrl: .fromNullable(value as String?)),
+      .accessToken => copyWith(accessToken: .fromNullable(value as String?)),
+      .serverEndpoint => copyWith(serverEndpoint: .fromNullable(value as String?)),
+    };
+  }
+}

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

@@ -1,10 +0,0 @@
-import 'package:immich_mobile/domain/models/store.model.dart';
-
-enum Setting<T> {
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false);
-
-  const Setting(this.storeKey, this.defaultValue);
-
-  final StoreKey<T> storeKey;
-  final T defaultValue;
-}

mobile/lib/domain/models/settings_key.dart

@@ -1,16 +1,15 @@
-import 'dart:convert';
-
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/models/value_codec.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-enum SettingsKey<T extends Object> {
+enum SettingsKey<T> {
   // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
+  themePrimaryColor<ImmichColorPreset>(codec: EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
   themeDynamic<bool>(),
   themeColorfulInterface<bool>(),
 
@@ -26,13 +25,13 @@ enum SettingsKey<T extends Object> {
 
   // Network
   networkAutoEndpointSwitching<bool>(),
-  networkPreferredWifiName<String>(),
-  networkLocalEndpoint<String>(),
-  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
+  networkExternalEndpointList<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(codec: MapCodec(PrimitiveCodec.string, PrimitiveCodec.string)),
+  networkPreferredWifiName<String?>(),
+  networkLocalEndpoint<String?>(),
 
   // Album
-  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
+  albumSortMode<AlbumSortMode>(codec: EnumCodec(AlbumSortMode.values)),
   albumIsReverse<bool>(),
   albumIsGrid<bool>(),
 
@@ -46,175 +45,48 @@ enum SettingsKey<T extends Object> {
 
   // Timeline
   timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: EnumCodec(GroupAssetsBy.values)),
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(codec: EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
   mapRelativeDate<int>(),
   mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
+  mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
   mapWithPartners<bool>(),
 
   // Cleanup
   cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  cleanupKeepMediaType<AssetKeepType>(codec: EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
   cleanupCutoffDaysAgo<int>(),
   cleanupDefaultsInitialized<bool>(),
 
   // Share
-  shareFileType<ShareAssetType>(codec: _EnumCodec(ShareAssetType.values)),
+  shareFileType<ShareAssetType>(codec: EnumCodec(ShareAssetType.values)),
 
   // Slideshow
   slideshowTransition<bool>(),
   slideshowRepeat<bool>(),
   slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
+  slideshowLook<SlideshowLook>(codec: EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: EnumCodec(SlideshowDirection.values)),
 
-  final _SettingsCodec<T>? _codecOverride;
+  // Advanced
+  advancedTroubleshooting<bool>(),
+  advancedEnableHapticFeedback<bool>(),
+  advancedReadonlyModeEnabled<bool>();
 
-  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
+  final ValueCodec<T>? _codecOverride;
 
-  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
+  const SettingsKey({ValueCodec<T>? codec}) : _codecOverride = codec;
+
+  ValueCodec<T> get _codec => _codecOverride ?? ValueCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
-
-sealed class _SettingsCodec<T extends Object> {
-  const _SettingsCodec();
-
-  String encode(T value);
-  T decode(String raw);
-
-  static const Map<Type, _SettingsCodec<Object>> _primitives = {
-    int: _PrimitiveCodec.integer,
-    double: _PrimitiveCodec.real,
-    bool: _PrimitiveCodec.boolean,
-    String: _PrimitiveCodec.string,
-    DateTime: _DateTimeCodec(),
-  };
-
-  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
-    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
-    }
-    return codec as _SettingsCodec<T>;
-  }
-}
-
-final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
-  final List<T> values;
-
-  const _EnumCodec(this.values);
-
-  @override
-  String encode(T value) => value.name;
-
-  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
-}
-
-final class _DateTimeCodec extends _SettingsCodec<DateTime> {
-  const _DateTimeCodec();
-
-  @override
-  String encode(DateTime value) => value.toIso8601String();
-
-  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
-}
-
-final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
-  final _SettingsCodec<K> _keyCodec;
-  final _SettingsCodec<V> _valueCodec;
-
-  const _MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return {};
-      }
-      final result = <K, V>{};
-      for (final entry in decoded.entries) {
-        final rawKey = entry.key;
-        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) {
-          return {};
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return {};
-    }
-  }
-}
-
-final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
-  final _SettingsCodec<T> _elementCodec;
-
-  const _ListCodec(this._elementCodec);
-
-  @override
-  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
-
-  @override
-  List<T> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! List) {
-        return [];
-      }
-      final result = <T>[];
-      for (final item in decoded) {
-        if (item is! String) {
-          return [];
-        }
-        final element = _elementCodec.decode(item);
-        result.add(element);
-      }
-      return result;
-    } on FormatException {
-      return [];
-    }
-  }
-}
-
-final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
-  final T Function(String) _parse;
-
-  const _PrimitiveCodec._(this._parse);
-
-  @override
-  String encode(T value) => value.toString();
-
-  @override
-  T decode(String raw) => _parse(raw);
-
-  static const integer = _PrimitiveCodec<int>._(int.parse);
-  static const real = _PrimitiveCodec<double>._(double.parse);
-  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
-  static const string = _PrimitiveCodec<String>._(_identity);
-
-  static String _identity(String s) => s;
-}

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

@@ -1,24 +1,20 @@
-import 'package:immich_mobile/domain/models/user.model.dart';
-
 /// Key for each possible value in the `Store`.
 /// Defines the data type for each value
 enum StoreKey<T> {
   version<int>._(0),
-  currentUser<UserDto>._(2),
   deviceId<String>._(4),
-  serverUrl<String>._(10),
-  accessToken<String>._(11),
-  serverEndpoint<String>._(12),
-  advancedTroubleshooting<bool>._(114),
-  enableHapticFeedback<bool>._(126),
 
   manageLocalMediaAndroid<bool>._(137),
-  // Read-only Mode settings
-  readonlyModeEnabled<bool>._(138),
 
   syncMigrationStatus<String>._(1013),
 
   // Legacy keys that have been migrated to the new metadata store
+  legacyAdvancedTroubleshooting<bool>._(114),
+  legacyEnableHapticFeedback<bool>._(126),
+  legacyReadonlyModeEnabled<bool>._(138),
+  legacyServerUrl<String>._(10),
+  legacyAccessToken<String>._(11),
+  legacyServerEndpoint<String>._(12),
   legacyBackupRequireCharging<bool>._(7),
   legacyBackupTriggerDelay<int>._(8),
   legacySyncAlbums<bool>._(131),

mobile/lib/domain/models/value_codec.dart

@@ -0,0 +1,141 @@
+import 'dart:convert';
+
+sealed class ValueCodec<T> {
+  const ValueCodec();
+
+  String encode(T value);
+  T decode(String raw);
+
+  static final Map<Type, ValueCodec<Object>> _primitives = {
+    ..._register<int>(PrimitiveCodec.integer),
+    ..._register<double>(PrimitiveCodec.real),
+    ..._register<bool>(PrimitiveCodec.boolean),
+    ..._register<String>(PrimitiveCodec.string),
+    ..._register<DateTime>(const DateTimeCodec()),
+  };
+
+  static Map<Type, ValueCodec<Object>> _register<T>(ValueCodec<Object> codec) => {
+    T: codec,
+    // Reifies the nullable type T so it can be used as a key in the _primitives map
+    _typeOf<T?>(): codec,
+  };
+
+  static Type _typeOf<T>() => T;
+
+  static ValueCodec<T> forType<T>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
+    if (codec == null) {
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the key.');
+    }
+    return codec as ValueCodec<T>;
+  }
+}
+
+final class EnumCodec<T extends Enum> extends ValueCodec<T> {
+  final List<T> values;
+
+  const EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+}
+
+final class DateTimeCodec extends ValueCodec<DateTime> {
+  const DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime decode(String raw) => DateTime.parse(raw);
+}
+
+final class MapCodec<K extends Object, V extends Object> extends ValueCodec<Map<K, V>> {
+  final ValueCodec<K> _keyCodec;
+  final ValueCodec<V> _valueCodec;
+
+  const MapCodec(this._keyCodec, this._valueCodec);
+
+  @override
+  String encode(Map<K, V> value) {
+    final entries = <String, String>{};
+    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
+    return jsonEncode(entries);
+  }
+
+  @override
+  Map<K, V> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) {
+        return {};
+      }
+      final result = <K, V>{};
+      for (final entry in decoded.entries) {
+        final rawKey = entry.key;
+        final rawValue = entry.value;
+        if (rawKey is! String || rawValue is! String) {
+          continue;
+        }
+        final k = _keyCodec.decode(rawKey);
+        final v = _valueCodec.decode(rawValue);
+        result[k] = v;
+      }
+      return result;
+    } on FormatException {
+      return {};
+    }
+  }
+}
+
+final class ListCodec<T extends Object> extends ValueCodec<List<T>> {
+  final ValueCodec<T> _elementCodec;
+
+  const ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) {
+        return [];
+      }
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) {
+          return [];
+        }
+        final element = _elementCodec.decode(item);
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return [];
+    }
+  }
+}
+
+final class PrimitiveCodec<T extends Object> extends ValueCodec<T> {
+  final T Function(String) _parse;
+
+  const PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  T decode(String raw) => _parse(raw);
+
+  static const integer = PrimitiveCodec<int>._(int.parse);
+  static const real = PrimitiveCodec<double>._(double.parse);
+  static const boolean = PrimitiveCodec<bool>._(bool.parse);
+  static const string = PrimitiveCodec<String>._(_identity);
+
+  static String _identity(String s) => s;
+}

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

@@ -1,19 +0,0 @@
-import 'package:immich_mobile/domain/models/setting.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
-
-// Singleton instance of SettingsService, to use in places
-// where reactivity is not required
-// ignore: non_constant_identifier_names
-final AppSetting = SettingsService(storeService: StoreService.I);
-
-class SettingsService {
-  final StoreService _storeService;
-
-  const SettingsService({required this._storeService});
-
-  T get<T>(Setting<T> setting) => _storeService.get(setting.storeKey, setting.defaultValue);
-
-  Future<void> set<T>(Setting<T> setting, T value) => _storeService.put(setting.storeKey, value);
-
-  Stream<T> watch<T>(Setting<T> setting) => _storeService.watch(setting.storeKey).map((v) => v ?? setting.defaultValue);
-}

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

@@ -2,13 +2,12 @@ import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
@@ -18,7 +17,7 @@ final syncLinkedAlbumServiceProvider = Provider(
     ref.watch(localAlbumRepository),
     ref.watch(remoteAlbumRepository),
     ref.watch(driftAlbumApiRepositoryProvider),
-    ref.watch(storeServiceProvider),
+    ref.watch(authUserRepositoryProvider),
     cancellation: ref.watch(cancellationProvider),
   ),
 );
@@ -27,14 +26,14 @@ class SyncLinkedAlbumService {
   final DriftLocalAlbumRepository _localAlbumRepository;
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
   final DriftAlbumApiRepository _albumApiRepository;
-  final StoreService _storeService;
+  final DriftAuthUserRepository _authUserRepository;
   final Completer<void>? _cancellation;
 
   SyncLinkedAlbumService(
     this._localAlbumRepository,
     this._remoteAlbumRepository,
     this._albumApiRepository,
-    this._storeService, {
+    this._authUserRepository, {
     this._cancellation,
   });
 
@@ -123,11 +122,12 @@ class SyncLinkedAlbumService {
   /// Creates a new remote album and links it to the local album
   Future<void> _createAndLinkNewRemoteAlbum(LocalAlbum localAlbum) async {
     dPrint(() => "Creating new remote album for local album: ${localAlbum.name}");
-    final newRemoteAlbum = await _albumApiRepository.createDriftAlbum(
-      localAlbum.name,
-      _storeService.get(StoreKey.currentUser),
-      assetIds: [],
-    );
+    final currentUser = await _authUserRepository.get();
+    if (currentUser == null) {
+      _log.warning("No user logged in, skipping remote album creation for local album: ${localAlbum.name}");
+      return;
+    }
+    final newRemoteAlbum = await _albumApiRepository.createDriftAlbum(localAlbum.name, currentUser, assetIds: []);
     await _remoteAlbumRepository.create(newRemoteAlbum, []);
     return _localAlbumRepository.linkRemoteAlbum(localAlbum.id, newRemoteAlbum.id);
   }

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

@@ -1,29 +1,24 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:logging/logging.dart';
 
 class UserService {
   final Logger _log = Logger("UserService");
   final UserApiRepository _userApiRepository;
-  final StoreService _storeService;
+  final DriftAuthUserRepository _authUserRepository;
 
-  UserService({required this._userApiRepository, required this._storeService});
+  UserService({required this._userApiRepository, required this._authUserRepository});
 
-  UserDto getMyUser() {
-    return _storeService.get(StoreKey.currentUser);
-  }
-
-  UserDto? tryGetMyUser() {
-    return _storeService.tryGet(StoreKey.currentUser);
+  Future<UserDto?> tryGetMyUser() {
+    return _authUserRepository.get();
   }
 
   Stream<UserDto?> watchMyUser() {
-    return _storeService.watch(StoreKey.currentUser);
+    return _authUserRepository.watch();
   }
 
   Future<UserDto?> refreshMyUser() async {
@@ -31,15 +26,17 @@ class UserService {
     if (user == null) {
       return null;
     }
-    await _storeService.put(StoreKey.currentUser, user);
+    await _authUserRepository.upsert(user);
     return user;
   }
 
   Future<String?> createProfileImage(String name, Uint8List image) async {
     try {
       final path = await _userApiRepository.createProfileImage(name: name, data: image);
-      final updatedUser = getMyUser();
-      await _storeService.put(StoreKey.currentUser, updatedUser);
+      final updatedUser = await tryGetMyUser();
+      if (updatedUser != null) {
+        await _authUserRepository.upsert(updatedUser);
+      }
       return path;
     } catch (e) {
       _log.warning("Failed to upload profile image", e);

mobile/lib/domain/utils/sync_linked_album.dart

@@ -1,14 +1,13 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:logging/logging.dart';
 
-Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
-  final user = Store.tryGet(StoreKey.currentUser);
+Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) async {
+  final user = await ref.read(authUserRepositoryProvider).get();
   if (user == null) {
     Logger("SyncLinkedAlbum").warning("No user logged in, skipping linked album sync");
-    return Future.value();
+    return;
   }
   return ref.read(syncLinkedAlbumServiceProvider).syncLinkedAlbums(user.id);
 }

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

@@ -0,0 +1,18 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class SessionEntity extends Table with DriftDefaultsMixin {
+  const SessionEntity();
+
+  TextColumn get key => text()();
+
+  TextColumn get value => text().nullable()();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {key};
+
+  @override
+  String get tableName => "session";
+}

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

@@ -0,0 +1,427 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/session.entity.dart'
+    as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+
+typedef $$SessionEntityTableCreateCompanionBuilder =
+    i1.SessionEntityCompanion Function({
+      required String key,
+      i0.Value<String?> value,
+      i0.Value<DateTime> updatedAt,
+    });
+typedef $$SessionEntityTableUpdateCompanionBuilder =
+    i1.SessionEntityCompanion Function({
+      i0.Value<String> key,
+      i0.Value<String?> value,
+      i0.Value<DateTime> updatedAt,
+    });
+
+class $$SessionEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+}
+
+class $$SessionEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+}
+
+class $$SessionEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$SessionEntityTable> {
+  $$SessionEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get key =>
+      $composableBuilder(column: $table.key, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get value =>
+      $composableBuilder(column: $table.value, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+}
+
+class $$SessionEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$SessionEntityTable,
+          i1.SessionEntityData,
+          i1.$$SessionEntityTableFilterComposer,
+          i1.$$SessionEntityTableOrderingComposer,
+          i1.$$SessionEntityTableAnnotationComposer,
+          $$SessionEntityTableCreateCompanionBuilder,
+          $$SessionEntityTableUpdateCompanionBuilder,
+          (
+            i1.SessionEntityData,
+            i0.BaseReferences<
+              i0.GeneratedDatabase,
+              i1.$SessionEntityTable,
+              i1.SessionEntityData
+            >,
+          ),
+          i1.SessionEntityData,
+          i0.PrefetchHooks Function()
+        > {
+  $$SessionEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$SessionEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$SessionEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$SessionEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$SessionEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> key = const i0.Value.absent(),
+                i0.Value<String?> value = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.SessionEntityCompanion(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          createCompanionCallback:
+              ({
+                required String key,
+                i0.Value<String?> value = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.SessionEntityCompanion.insert(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$SessionEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$SessionEntityTable,
+      i1.SessionEntityData,
+      i1.$$SessionEntityTableFilterComposer,
+      i1.$$SessionEntityTableOrderingComposer,
+      i1.$$SessionEntityTableAnnotationComposer,
+      $$SessionEntityTableCreateCompanionBuilder,
+      $$SessionEntityTableUpdateCompanionBuilder,
+      (
+        i1.SessionEntityData,
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$SessionEntityTable,
+          i1.SessionEntityData
+        >,
+      ),
+      i1.SessionEntityData,
+      i0.PrefetchHooks Function()
+    >;
+
+class $SessionEntityTable extends i2.SessionEntity
+    with i0.TableInfo<$SessionEntityTable, i1.SessionEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $SessionEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
+  @override
+  late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
+    'key',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _valueMeta = const i0.VerificationMeta(
+    'value',
+  );
+  @override
+  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
+    'value',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  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,
+      );
+  @override
+  List<i0.GeneratedColumn> get $columns => [key, value, updatedAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'session';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.SessionEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('key')) {
+      context.handle(
+        _keyMeta,
+        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_keyMeta);
+    }
+    if (data.containsKey('value')) {
+      context.handle(
+        _valueMeta,
+        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
+      );
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {key};
+  @override
+  i1.SessionEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.SessionEntityData(
+      key: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}key'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}value'],
+      ),
+      updatedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+    );
+  }
+
+  @override
+  $SessionEntityTable createAlias(String alias) {
+    return $SessionEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class SessionEntityData extends i0.DataClass
+    implements i0.Insertable<i1.SessionEntityData> {
+  final String key;
+  final String? value;
+  final DateTime updatedAt;
+  const SessionEntityData({
+    required this.key,
+    this.value,
+    required this.updatedAt,
+  });
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['key'] = i0.Variable<String>(key);
+    if (!nullToAbsent || value != null) {
+      map['value'] = i0.Variable<String>(value);
+    }
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    return map;
+  }
+
+  factory SessionEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return SessionEntityData(
+      key: serializer.fromJson<String>(json['key']),
+      value: serializer.fromJson<String?>(json['value']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'key': serializer.toJson<String>(key),
+      'value': serializer.toJson<String?>(value),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+    };
+  }
+
+  i1.SessionEntityData copyWith({
+    String? key,
+    i0.Value<String?> value = const i0.Value.absent(),
+    DateTime? updatedAt,
+  }) => i1.SessionEntityData(
+    key: key ?? this.key,
+    value: value.present ? value.value : this.value,
+    updatedAt: updatedAt ?? this.updatedAt,
+  );
+  SessionEntityData copyWithCompanion(i1.SessionEntityCompanion data) {
+    return SessionEntityData(
+      key: data.key.present ? data.key.value : this.key,
+      value: data.value.present ? data.value.value : this.value,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SessionEntityData(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(key, value, updatedAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.SessionEntityData &&
+          other.key == this.key &&
+          other.value == this.value &&
+          other.updatedAt == this.updatedAt);
+}
+
+class SessionEntityCompanion extends i0.UpdateCompanion<i1.SessionEntityData> {
+  final i0.Value<String> key;
+  final i0.Value<String?> value;
+  final i0.Value<DateTime> updatedAt;
+  const SessionEntityCompanion({
+    this.key = const i0.Value.absent(),
+    this.value = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+  });
+  SessionEntityCompanion.insert({
+    required String key,
+    this.value = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+  }) : key = i0.Value(key);
+  static i0.Insertable<i1.SessionEntityData> custom({
+    i0.Expression<String>? key,
+    i0.Expression<String>? value,
+    i0.Expression<DateTime>? updatedAt,
+  }) {
+    return i0.RawValuesInsertable({
+      if (key != null) 'key': key,
+      if (value != null) 'value': value,
+      if (updatedAt != null) 'updated_at': updatedAt,
+    });
+  }
+
+  i1.SessionEntityCompanion copyWith({
+    i0.Value<String>? key,
+    i0.Value<String?>? value,
+    i0.Value<DateTime>? updatedAt,
+  }) {
+    return i1.SessionEntityCompanion(
+      key: key ?? this.key,
+      value: value ?? this.value,
+      updatedAt: updatedAt ?? this.updatedAt,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (key.present) {
+      map['key'] = i0.Variable<String>(key.value);
+    }
+    if (value.present) {
+      map['value'] = i0.Variable<String>(value.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SessionEntityCompanion(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+}

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

@@ -6,7 +6,7 @@ class SettingsEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get key => text()();
 
-  TextColumn get value => text()();
+  TextColumn get value => text().nullable()();
 
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
 

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

@@ -10,13 +10,13 @@ import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 typedef $$SettingsEntityTableCreateCompanionBuilder =
     i1.SettingsEntityCompanion Function({
       required String key,
-      required String value,
+      i0.Value<String?> value,
       i0.Value<DateTime> updatedAt,
     });
 typedef $$SettingsEntityTableUpdateCompanionBuilder =
     i1.SettingsEntityCompanion Function({
       i0.Value<String> key,
-      i0.Value<String> value,
+      i0.Value<String?> value,
       i0.Value<DateTime> updatedAt,
     });
 
@@ -127,7 +127,7 @@ class $$SettingsEntityTableTableManager
           updateCompanionCallback:
               ({
                 i0.Value<String> key = const i0.Value.absent(),
-                i0.Value<String> value = const i0.Value.absent(),
+                i0.Value<String?> value = const i0.Value.absent(),
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
               }) => i1.SettingsEntityCompanion(
                 key: key,
@@ -137,7 +137,7 @@ class $$SettingsEntityTableTableManager
           createCompanionCallback:
               ({
                 required String key,
-                required String value,
+                i0.Value<String?> value = const i0.Value.absent(),
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
               }) => i1.SettingsEntityCompanion.insert(
                 key: key,
@@ -196,9 +196,9 @@ class $SettingsEntityTable extends i2.SettingsEntity
   late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
     'value',
     aliasedName,
-    false,
+    true,
     type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
+    requiredDuringInsert: false,
   );
   static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
     'updatedAt',
@@ -240,8 +240,6 @@ class $SettingsEntityTable extends i2.SettingsEntity
         _valueMeta,
         value.isAcceptableOrUnknown(data['value']!, _valueMeta),
       );
-    } else if (isInserting) {
-      context.missing(_valueMeta);
     }
     if (data.containsKey('updated_at')) {
       context.handle(
@@ -265,7 +263,7 @@ class $SettingsEntityTable extends i2.SettingsEntity
       value: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.string,
         data['${effectivePrefix}value'],
-      )!,
+      ),
       updatedAt: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.dateTime,
         data['${effectivePrefix}updated_at'],
@@ -287,18 +285,20 @@ class $SettingsEntityTable extends i2.SettingsEntity
 class SettingsEntityData extends i0.DataClass
     implements i0.Insertable<i1.SettingsEntityData> {
   final String key;
-  final String value;
+  final String? value;
   final DateTime updatedAt;
   const SettingsEntityData({
     required this.key,
-    required this.value,
+    this.value,
     required this.updatedAt,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
     map['key'] = i0.Variable<String>(key);
-    map['value'] = i0.Variable<String>(value);
+    if (!nullToAbsent || value != null) {
+      map['value'] = i0.Variable<String>(value);
+    }
     map['updated_at'] = i0.Variable<DateTime>(updatedAt);
     return map;
   }
@@ -310,7 +310,7 @@ class SettingsEntityData extends i0.DataClass
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
     return SettingsEntityData(
       key: serializer.fromJson<String>(json['key']),
-      value: serializer.fromJson<String>(json['value']),
+      value: serializer.fromJson<String?>(json['value']),
       updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
     );
   }
@@ -319,18 +319,18 @@ class SettingsEntityData extends i0.DataClass
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'key': serializer.toJson<String>(key),
-      'value': serializer.toJson<String>(value),
+      'value': serializer.toJson<String?>(value),
       'updatedAt': serializer.toJson<DateTime>(updatedAt),
     };
   }
 
   i1.SettingsEntityData copyWith({
     String? key,
-    String? value,
+    i0.Value<String?> value = const i0.Value.absent(),
     DateTime? updatedAt,
   }) => i1.SettingsEntityData(
     key: key ?? this.key,
-    value: value ?? this.value,
+    value: value.present ? value.value : this.value,
     updatedAt: updatedAt ?? this.updatedAt,
   );
   SettingsEntityData copyWithCompanion(i1.SettingsEntityCompanion data) {
@@ -365,7 +365,7 @@ class SettingsEntityData extends i0.DataClass
 class SettingsEntityCompanion
     extends i0.UpdateCompanion<i1.SettingsEntityData> {
   final i0.Value<String> key;
-  final i0.Value<String> value;
+  final i0.Value<String?> value;
   final i0.Value<DateTime> updatedAt;
   const SettingsEntityCompanion({
     this.key = const i0.Value.absent(),
@@ -374,10 +374,9 @@ class SettingsEntityCompanion
   });
   SettingsEntityCompanion.insert({
     required String key,
-    required String value,
+    this.value = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
-  }) : key = i0.Value(key),
-       value = i0.Value(value);
+  }) : key = i0.Value(key);
   static i0.Insertable<i1.SettingsEntityData> custom({
     i0.Expression<String>? key,
     i0.Expression<String>? value,
@@ -392,7 +391,7 @@ class SettingsEntityCompanion
 
   i1.SettingsEntityCompanion copyWith({
     i0.Value<String>? key,
-    i0.Value<String>? value,
+    i0.Value<String?>? value,
     i0.Value<DateTime>? updatedAt,
   }) {
     return i1.SettingsEntityCompanion(

mobile/lib/infrastructure/repositories/cached_key_value_repository.dart

@@ -0,0 +1,42 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+// ignore: depend_on_referenced_packages
+import 'package:meta/meta.dart';
+
+abstract class CachedKeyValueRepository<K extends Enum, S> {
+  CachedKeyValueRepository(this._snapshot);
+
+  S _snapshot;
+  S get snapshot => _snapshot;
+  @protected
+  set snapshot(S value) => _snapshot = value;
+
+  List<K> get keys;
+
+  Object decodeValue(K key, String raw);
+
+  S buildSnapshot(Map<K, Object?> overrides);
+
+  Selectable<({String key, String? value})> selectable();
+
+  Future<void> refresh() async => _snapshot = _build(await selectable().get());
+
+  @protected
+  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));
+
+  S _build(List<({String key, String? value})> rows) => buildSnapshot(
+    rows.fold({}, (overrides, row) {
+      final key = keys.firstWhereOrNull((key) => key.name == row.key);
+      if (key == null) {
+        return overrides;
+      }
+
+      Object? decodedValue;
+      if (row.value != null) {
+        decodedValue = decodeValue(key, row.value!);
+      }
+
+      return {...overrides, key: decodedValue};
+    }),
+  );
+}

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

@@ -25,6 +25,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
@@ -67,6 +68,7 @@ import 'package:sqlite_async/sqlite_async.dart';
     AssetEditEntity,
     SettingsEntity,
     AssetOcrEntity,
+    SessionEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -120,7 +122,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 29;
+  int get schemaVersion => 31;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -308,6 +310,12 @@ class Drift extends $Drift {
             await m.createTable(v29.assetOcrEntity);
             await m.createIndex(v29.idxAssetOcrAssetId);
           },
+          from29To30: (m, v30) async {
+            await m.alterTable(TableMigration(v30.settings));
+          },
+          from30To31: (m, v31) async {
+            await m.createTable(v31.session);
+          },
         ),
       );
 

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

@@ -47,9 +47,11 @@ import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart
     as i22;
 import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
     as i23;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart'
     as i24;
-import 'package:drift/internal/modular.dart' as i25;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i25;
+import 'package:drift/internal/modular.dart' as i26;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -99,9 +101,12 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i23.$AssetOcrEntityTable assetOcrEntity = i23.$AssetOcrEntityTable(
     this,
   );
-  i24.MergedAssetDrift get mergedAssetDrift => i25.ReadDatabaseContainer(
+  late final i24.$SessionEntityTable sessionEntity = i24.$SessionEntityTable(
     this,
-  ).accessor<i24.MergedAssetDrift>(i24.MergedAssetDrift.new);
+  );
+  i25.MergedAssetDrift get mergedAssetDrift => i26.ReadDatabaseContainer(
+    this,
+  ).accessor<i25.MergedAssetDrift>(i25.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -140,6 +145,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     assetEditEntity,
     settingsEntity,
     assetOcrEntity,
+    sessionEntity,
     i10.idxPartnerSharedWithId,
     i11.idxLatLng,
     i11.idxRemoteExifCity,
@@ -414,4 +420,6 @@ class $DriftManager {
       i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
   i23.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
       i23.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
+  i24.$$SessionEntityTableTableManager get sessionEntity =>
+      i24.$$SessionEntityTableTableManager(_db, _db.sessionEntity);
 }

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

@@ -0,0 +1,82 @@
+import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class SessionRepository extends CachedKeyValueRepository<SessionKey, Session> {
+  final Drift _db;
+
+  SessionRepository._(this._db) : super(const .new());
+
+  static SessionRepository? _instance;
+
+  static SessionRepository get instance {
+    final instance = _instance;
+    if (instance == null) {
+      throw StateError('SessionRepository not initialized. Call ensureInitialized() first');
+    }
+    return instance;
+  }
+
+  static Future<SessionRepository> ensureInitialized(Drift db) async {
+    if (_instance == null) {
+      final instance = SessionRepository._(db);
+      await instance.refresh();
+      _instance = instance;
+    }
+    return _instance!;
+  }
+
+  @override
+  List<SessionKey> get keys => SessionKey.values;
+
+  @override
+  Object decodeValue(SessionKey key, String raw) => key.decode(raw);
+
+  @override
+  Session buildSnapshot(Map<SessionKey, Object?> overrides) => Session.fromEntries(overrides);
+
+  @override
+  @protected
+  Selectable<({String key, String? value})> selectable() =>
+      _db.select(_db.sessionEntity).map((row) => (key: row.key, value: row.value));
+
+  Session get session => snapshot;
+
+  Future<void> clear(Iterable<SessionKey> keys) async {
+    if (keys.isEmpty) {
+      return;
+    }
+
+    final names = keys.map((key) => key.name).toList();
+    await (_db.delete(_db.sessionEntity)..where((row) => row.key.isIn(names))).go();
+
+    var session = snapshot;
+    for (final key in keys) {
+      session = session.write(key, defaultSession.read(key));
+    }
+    snapshot = session;
+  }
+
+  Future<void> write<T, U extends T>(SessionKey<T> key, U value) async {
+    if (value == snapshot.read(key)) {
+      return;
+    }
+
+    String? resolvedValue;
+    if (value != null) {
+      resolvedValue = key.encode(value);
+    }
+
+    await _db
+        .into(_db.sessionEntity)
+        .insertOnConflictUpdate(
+          SessionEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
+        );
+    snapshot = snapshot.write(key, value);
+  }
+
+  Stream<Session> watch() => watchSnapshot();
+}

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

@@ -1,14 +1,15 @@
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class SettingsRepository extends DriftDatabaseRepository {
+class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig> {
   final Drift _db;
 
-  SettingsRepository._(this._db) : super(_db);
+  SettingsRepository._(this._db) : super(const .new());
 
   static SettingsRepository? _instance;
 
@@ -20,9 +21,6 @@ class SettingsRepository extends DriftDatabaseRepository {
     return instance;
   }
 
-  AppConfig _appConfig = const .new();
-  AppConfig get appConfig => _appConfig;
-
   static Future<SettingsRepository> ensureInitialized(Drift db) async {
     if (_instance == null) {
       final instance = SettingsRepository._(db);
@@ -32,7 +30,21 @@ class SettingsRepository extends DriftDatabaseRepository {
     return _instance!;
   }
 
-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
+  @override
+  List<SettingsKey> get keys => SettingsKey.values;
+
+  @override
+  Object decodeValue(SettingsKey key, String raw) => key.decode(raw);
+
+  @override
+  AppConfig buildSnapshot(Map<SettingsKey, Object?> overrides) => AppConfig.fromEntries(overrides);
+
+  @override
+  @protected
+  Selectable<({String key, String? value})> selectable() =>
+      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));
+
+  AppConfig get appConfig => snapshot;
 
   Future<void> clear(Iterable<SettingsKey> keys) async {
     if (keys.isEmpty) {
@@ -42,13 +54,15 @@ class SettingsRepository extends DriftDatabaseRepository {
     final names = keys.map((key) => key.name).toList();
     await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
 
+    var config = snapshot;
     for (final key in keys) {
-      _appConfig = _appConfig.write(key, defaultConfig.read(key));
+      config = config.write(key, defaultConfig.read(key));
     }
+    snapshot = config;
   }
 
-  Future<void> write<T extends Object, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
+  Future<void> write<T, U extends T>(SettingsKey<T> key, U value) async {
+    if (value == snapshot.read(key)) {
       return;
     }
 
@@ -56,29 +70,18 @@ class SettingsRepository extends DriftDatabaseRepository {
       return clear([key]);
     }
 
+    String? resolvedValue;
+    if (value != null) {
+      resolvedValue = key.encode(value);
+    }
+
     await _db
         .into(_db.settingsEntity)
         .insertOnConflictUpdate(
-          SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
+          SettingsEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
         );
-    _appConfig = _appConfig.write(key, value);
+    snapshot = snapshot.write(key, value);
   }
 
-  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
-    _applyOverrides(rows);
-    return _appConfig;
-  });
-
-  void _applyOverrides(List<SettingsEntityData> rows) {
-    _appConfig = AppConfig.fromEntries(
-      rows.fold({}, (overrides, row) {
-        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
-        if (metadataKey == null) {
-          return overrides;
-        }
-
-        return {...overrides, metadataKey: metadataKey.decode(row.value)};
-      }),
-    );
-  }
+  Stream<AppConfig> watch() => watchSnapshot();
 }

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

@@ -1,9 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 
 class DriftStoreRepository extends DriftDatabaseRepository {
   final Drift _db;
@@ -63,8 +61,6 @@ class DriftStoreRepository extends DriftDatabaseRepository {
             const (String) => entity.stringValue,
             const (bool) => entity.intValue == 1,
             const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-            const (UserDto) =>
-              entity.stringValue == null ? null : await DriftAuthUserRepository(_db).get(entity.stringValue!),
             _ => null,
           }
           as T?;
@@ -75,7 +71,6 @@ class DriftStoreRepository extends DriftDatabaseRepository {
       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 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/user.repository.dart

@@ -17,16 +17,15 @@ class DriftAuthUserRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftAuthUserRepository(super.db) : _db = db;
 
-  Future<UserDto?> get(String id) async {
-    final user = await _db.managers.authUserEntity.filter((user) => user.id.equals(id)).getSingleOrNull();
+  Selectable<UserDto?> get _authUserQuery => (_db.authUserEntity.select()..limit(1)).asyncMap(_toDto);
 
-    if (user == null) {
-      return null;
-    }
+  Future<UserDto?> get() => _authUserQuery.getSingleOrNull();
 
-    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(id));
+  Stream<UserDto?> watch() => _authUserQuery.watchSingleOrNull();
+
+  Future<UserDto> _toDto(AuthUserEntityData user) async {
+    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(user.id));
     final metadata = await query.map((row) => row.toDto()).get();
-
     return user.toDto(metadata);
   }
 

mobile/lib/pages/backup/drift_backup.page.dart

@@ -5,8 +5,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
@@ -85,7 +83,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
     final backupSyncManager = ref.read(backgroundSyncProvider);
 
     Future<void> startBackup() async {
-      final currentUser = Store.tryGet(StoreKey.currentUser);
+      final currentUser = ref.read(currentUserProvider);
       if (currentUser == null) {
         return;
       }

mobile/lib/pages/common/splash_screen.page.dart

@@ -8,14 +8,15 @@ import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -306,9 +307,10 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
   }
 
   void resumeSession() async {
-    final serverUrl = Store.tryGet(StoreKey.serverUrl);
-    final endpoint = Store.tryGet(StoreKey.serverEndpoint);
-    final accessToken = Store.tryGet(StoreKey.accessToken);
+    final session = ref.read(sessionProvider);
+    final serverUrl = session.serverUrl;
+    final endpoint = session.serverEndpoint;
+    final accessToken = session.accessToken;
 
     if (accessToken != null && serverUrl != null && endpoint != null) {
       final infoProvider = ref.read(serverInfoProvider.notifier);
@@ -316,6 +318,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
       final viewIntentHandler = ref.read(viewIntentHandlerProvider);
+      final authUserRepository = ref.read(authUserRepositoryProvider);
 
       unawaited(
         ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
@@ -335,9 +338,9 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
               if (syncSuccess) {
                 await Future.wait([
                   backgroundManager.hashAssets().then((_) {
-                    _resumeBackup(backupProvider);
+                    _resumeBackup(backupProvider, authUserRepository);
                   }),
-                  _resumeBackup(backupProvider),
+                  _resumeBackup(backupProvider, authUserRepository),
                   // TODO: Bring back when the soft freeze issue is addressed
                   // backgroundManager.syncCloudIds(),
                 ]);
@@ -373,11 +376,11 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     }
   }
 
-  Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
+  Future<void> _resumeBackup(DriftBackupNotifier notifier, DriftAuthUserRepository authUserRepository) async {
     final isEnableBackup = SettingsRepository.instance.appConfig.backup.enabled;
 
     if (isEnableBackup) {
-      final currentUser = Store.tryGet(StoreKey.currentUser);
+      final currentUser = await authUserRepository.get();
       if (currentUser != null) {
         unawaited(notifier.startForegroundBackup(currentUser.id));
       }

mobile/lib/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -22,7 +21,7 @@ class OpenInBrowserActionButton extends ConsumerWidget {
   });
 
   void _onTap() async {
-    final serverEndpoint = Store.get(StoreKey.serverEndpoint).replaceFirst('/api', '');
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint!.replaceFirst('/api', '');
 
     String originPath = '';
     switch (origin) {

mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart

@@ -4,8 +4,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.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';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
@@ -13,6 +11,7 @@ import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.pro
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
@@ -143,7 +142,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
 
       final remoteId = (videoAsset as RemoteAsset).id;
 
-      final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+      final serverEndpoint = ref.read(sessionProvider).serverEndpoint!;
       final isOriginalVideo = ref.read(appConfigProvider).viewer.loadOriginalVideo;
       final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
       final String videoUrl = videoAsset.livePhotoVideoId != null

mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart

@@ -6,7 +6,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -33,7 +33,7 @@ class ViewerKebabMenu extends ConsumerWidget {
     final isInLockedView = ref.watch(inLockedViewProvider);
     final currentAlbum = ref.watch(currentRemoteAlbumProvider);
     final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+    final advancedTroubleshooting = ref.watch(appConfigProvider.select((c) => c.advanced.troubleshooting));
 
     final actionContext = ActionButtonContext(
       asset: asset,

mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
@@ -24,7 +23,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -56,7 +55,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
   Widget build(BuildContext context) {
     final multiselect = ref.watch(multiSelectProvider);
     final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
+    final advancedTroubleshooting = ref.watch(appConfigProvider.select((c) => c.advanced.troubleshooting));
     final tagsEnabled = ref.watch(
       userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
     );

mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart

@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 
-class PartnerUserAvatar extends StatelessWidget {
+class PartnerUserAvatar extends ConsumerWidget {
   const PartnerUserAvatar({super.key, required this.userId, required this.name});
 
   final String userId;
   final String name;
 
   @override
-  Widget build(BuildContext context) {
-    final url = "${Store.get(StoreKey.serverEndpoint)}/users/$userId/profile-image";
+  Widget build(BuildContext context, WidgetRef ref) {
+    final url = "${ref.read(sessionProvider).serverEndpoint}/users/$userId/profile-image";
     final nameFirstLetter = name.isNotEmpty ? name[0] : "";
     return CircleAvatar(
       radius: 16,

mobile/lib/providers/app_life_cycle.provider.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
@@ -13,6 +11,7 @@ import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:logging/logging.dart';
 
@@ -140,7 +139,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     final isEnableBackup = _ref.read(appConfigProvider).backup.enabled;
 
     if (isEnableBackup) {
-      final currentUser = Store.tryGet(StoreKey.currentUser);
+      final currentUser = _ref.read(currentUserProvider);
       if (currentUser != null) {
         await _safeRun(
           _ref.read(driftBackupProvider.notifier).startForegroundBackup(currentUser.id),

mobile/lib/providers/auth.provider.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
@@ -10,6 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -125,10 +127,10 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   Future<bool> saveAuthInfo({required String accessToken}) async {
-    await Store.put(StoreKey.accessToken, accessToken);
+    await _ref.read(sessionRepository).write(SessionKey.accessToken, accessToken);
     await _apiService.updateHeaders();
 
-    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+    final serverEndpoint = _ref.read(sessionProvider).serverEndpoint!;
     final headerMap = _ref.read(appConfigProvider).network.customHeaders;
     final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
@@ -136,7 +138,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     // Get the deviceid from the store if it exists, otherwise generate a new one
     String deviceId = Store.tryGet(StoreKey.deviceId) ?? await FlutterUdid.consistentUdid;
 
-    UserDto? user = _userService.tryGetMyUser();
+    UserDto? user = await _userService.tryGetMyUser();
 
     try {
       final serverUser = await _userService.refreshMyUser().timeout(_timeoutDuration);
@@ -193,9 +195,9 @@ class AuthNotifier extends StateNotifier<AuthState> {
     return _ref.read(appConfigProvider).network.localEndpoint;
   }
 
-  /// Returns the current server endpoint (with /api) URL from the store
+  /// Returns the current server endpoint (with /api) URL from the session
   String? getServerEndpoint() {
-    return Store.tryGet(StoreKey.serverEndpoint);
+    return _ref.read(sessionProvider).serverEndpoint;
   }
 
   Future<String?> setOpenApiServiceEndpoint() {

mobile/lib/providers/haptic_feedback.provider.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 
 final hapticFeedbackProvider = StateNotifierProvider<HapticNotifier, void>((ref) {
   return HapticNotifier(ref);
@@ -14,31 +13,31 @@ class HapticNotifier extends StateNotifier<void> {
   HapticNotifier(this._ref) : super(null);
 
   selectionClick() {
-    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appConfigProvider).advanced.enableHapticFeedback) {
       HapticFeedback.selectionClick();
     }
   }
 
   lightImpact() {
-    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appConfigProvider).advanced.enableHapticFeedback) {
       HapticFeedback.lightImpact();
     }
   }
 
   mediumImpact() {
-    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appConfigProvider).advanced.enableHapticFeedback) {
       HapticFeedback.mediumImpact();
     }
   }
 
   heavyImpact() {
-    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appConfigProvider).advanced.enableHapticFeedback) {
       HapticFeedback.heavyImpact();
     }
   }
 
   vibrate() {
-    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appConfigProvider).advanced.enableHapticFeedback) {
       HapticFeedback.vibrate();
     }
   }

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

@@ -1,22 +1,19 @@
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 
 class ReadOnlyModeNotifier extends Notifier<bool> {
-  late AppSettingsService _appSettingService;
-
   @override
   bool build() {
-    _appSettingService = ref.read(appSettingsServiceProvider);
-    final readonlyMode = _appSettingService.getSetting(AppSettingsEnum.readonlyModeEnabled);
-    return readonlyMode;
+    return ref.read(appConfigProvider).advanced.readonlyModeEnabled;
   }
 
   void setMode(bool value) {
     final isLoggedIn = ref.read(authProvider).isAuthenticated;
-    _appSettingService.setSetting(AppSettingsEnum.readonlyModeEnabled, value);
+    unawaited(ref.read(settingsProvider).write(.advancedReadonlyModeEnabled, value));
     state = value;
 
     if (value && isLoggedIn) {

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

@@ -0,0 +1,12 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+
+final sessionRepository = Provider.autoDispose<SessionRepository>((_) => SessionRepository.instance);
+
+final sessionProvider = Provider.autoDispose<Session>((ref) {
+  final repo = ref.watch(sessionRepository);
+  final subscription = repo.watch().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.session;
+});

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

@@ -1,20 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/setting.model.dart';
-import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
-
-class SettingsNotifier extends Notifier<SettingsService> {
-  @override
-  SettingsService build() => SettingsService(storeService: ref.read(storeServiceProvider));
-
-  T get<T>(Setting<T> setting) => state.get(setting);
-
-  Future<void> set<T>(Setting<T> setting, T value) async {
-    await state.set(setting, value);
-    ref.invalidateSelf();
-  }
-
-  Stream<T> watch<T>(Setting<T> setting) => state.watch(setting);
-}
-
-final settingsProvider = NotifierProvider<SettingsNotifier, SettingsService>(SettingsNotifier.new);

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

@@ -6,7 +6,7 @@ final settingsProvider = Provider.autoDispose<SettingsRepository>((_) => Setting
 
 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
   final repo = ref.watch(settingsProvider);
-  final subscription = repo.watchConfig().listen((event) => ref.state = event);
+  final subscription = repo.watch().listen((event) => ref.state = event);
   ref.onDispose(subscription.cancel);
   return repo.appConfig;
 });

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

@@ -6,17 +6,18 @@ import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 
 final userRepositoryProvider = Provider((ref) => UserRepository(ref.watch(driftProvider)));
 
+final authUserRepositoryProvider = Provider((ref) => DriftAuthUserRepository(ref.watch(driftProvider)));
+
 final userApiRepositoryProvider = Provider((ref) => UserApiRepository(ref.watch(apiServiceProvider).usersApi));
 
 final userServiceProvider = Provider(
   (ref) => UserService(
     userApiRepository: ref.watch(userApiRepositoryProvider),
-    storeService: ref.watch(storeServiceProvider),
+    authUserRepository: ref.watch(authUserRepositoryProvider),
   ),
 );
 

mobile/lib/providers/user.provider.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 
 class CurrentUserProvider extends StateNotifier<UserDto?> {
   CurrentUserProvider(this._userService) : super(null) {
-    state = _userService.tryGetMyUser();
+    _userService.tryGetMyUser().then((user) => state = user ?? state);
     streamSub = _userService.watchMyUser().listen((user) => state = user ?? state);
   }
 

mobile/lib/providers/websocket.provider.dart

@@ -1,12 +1,11 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
@@ -68,7 +67,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
     if (authenticationState.isAuthenticated) {
       try {
-        final endpoint = Uri.parse(Store.get(StoreKey.serverEndpoint));
+        final endpoint = Uri.parse(_ref.read(sessionProvider).serverEndpoint!);
         dPrint(() => "Attempting to connect to websocket");
         // Configure socket transports must be specified
         Socket socket = io(

mobile/lib/repositories/upload.repository.dart

@@ -5,9 +5,8 @@ import 'dart:io';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -96,7 +95,7 @@ class UploadRepository {
     void Function(int bytes, int totalBytes)? onProgress,
     required String logContext,
   }) async {
-    final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
+    final String savedEndpoint = SessionRepository.instance.session.serverEndpoint!;
     final baseRequest = ProgressMultipartRequest(
       'POST',
       Uri.parse('$savedEndpoint/assets'),

mobile/lib/routing/auth_guard.dart

@@ -2,9 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -23,10 +21,8 @@ class AuthGuard extends AutoRouteGuard {
     // guards, so we keep this function fully sync and validate the token in
     // the background — otherwise a slow validateAccessToken() request would
     // block the route transition for as long as the OS-level HTTP timeout.
-    try {
-      Store.get(StoreKey.accessToken);
-    } on StoreKeyNotFoundException catch (_) {
-      _log.warning('No access token in the store.');
+    if (SessionRepository.instance.session.accessToken == null) {
+      _log.warning('No access token in the session.');
       resolver.next(false);
       unawaited(router.replaceAll([const LoginRoute()]));
       return;
@@ -40,7 +36,7 @@ class AuthGuard extends AutoRouteGuard {
     if (_validateInFlight) {
       return;
     }
-    final token = Store.tryGet(StoreKey.accessToken);
+    final token = SessionRepository.instance.session.accessToken;
     if (token == null) {
       return;
     }
@@ -50,7 +46,7 @@ class AuthGuard extends AutoRouteGuard {
       if (res == null || res.authStatus != true) {
         // Token may have changed during validation (user logged out + logged in
         // again); only act if it still applies to the current session.
-        if (Store.tryGet(StoreKey.accessToken) != token) {
+        if (SessionRepository.instance.session.accessToken != token) {
           return;
         }
         _log.fine('User token is invalid. Redirecting to login');
@@ -61,7 +57,7 @@ class AuthGuard extends AutoRouteGuard {
       if (e.code != HttpStatus.unauthorized) {
         return;
       }
-      if (Store.tryGet(StoreKey.accessToken) != token) {
+      if (SessionRepository.instance.session.accessToken != token) {
         return;
       }
       _log.warning("Unauthorized access token.");

mobile/lib/services/api.service.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:logging/logging.dart';
@@ -41,7 +41,7 @@ class ApiService {
     // The below line ensures that the api clients are initialized when the service is instantiated
     // This is required to avoid late initialization errors when the clients are access before the endpoint is resolved
     setEndpoint('');
-    final endpoint = Store.tryGet(StoreKey.serverEndpoint);
+    final endpoint = SessionRepository.instance.session.serverEndpoint;
     if (endpoint != null && endpoint.isNotEmpty) {
       setEndpoint(endpoint);
     }
@@ -84,7 +84,7 @@ class ApiService {
     setEndpoint(endpoint);
 
     // Save in local database for next startup
-    await Store.put(StoreKey.serverEndpoint, endpoint);
+    await SessionRepository.instance.write(SessionKey.serverEndpoint, endpoint);
     return endpoint;
   }
 
@@ -173,13 +173,13 @@ class ApiService {
 
   static List<String> getServerUrls() {
     final urls = <String>[];
-    final serverEndpoint = Store.tryGet(StoreKey.serverEndpoint);
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint;
     if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
       urls.add(serverEndpoint);
     }
     final network = SettingsRepository.instance.appConfig.network;
     final localEndpoint = network.localEndpoint;
-    if (localEndpoint.isNotEmpty) {
+    if (localEndpoint != null && localEndpoint.isNotEmpty) {
       urls.add(localEndpoint);
     }
     for (final url in network.externalEndpointList) {

mobile/lib/services/app_settings.service.dart

@@ -2,10 +2,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 
 enum AppSettingsEnum<T> {
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
-  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
-  enableHapticFeedback<bool>(StoreKey.enableHapticFeedback, null, true),
-  readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false);
+  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
 

mobile/lib/services/auth.service.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -55,7 +55,7 @@ class AuthService {
   Future<String> validateServerUrl(String url) async {
     final validUrl = await _apiService.resolveAndSetEndpoint(url);
     await _apiService.setDeviceInfoHeader();
-    await Store.put(StoreKey.serverUrl, validUrl);
+    await SessionRepository.instance.write(SessionKey.serverUrl, validUrl);
 
     return validUrl;
   }
@@ -118,8 +118,7 @@ class AuthService {
     await _backgroundSyncManager.cancel();
     await Future.wait([
       _authRepository.clearLocalData(),
-      Store.delete(StoreKey.currentUser),
-      Store.delete(StoreKey.accessToken),
+      SessionRepository.instance.clear([SessionKey.accessToken]),
       SettingsRepository.instance.clear(const [
         .networkAutoEndpointSwitching,
         .networkPreferredWifiName,

mobile/lib/services/background_upload.service.dart

@@ -13,6 +13,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
@@ -386,7 +387,7 @@ class BackgroundUploadService {
     String? latitude,
     String? longitude,
   }) async {
-    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+    final serverEndpoint = SessionRepository.instance.session.serverEndpoint!;
     final url = Uri.parse('$serverEndpoint/assets').toString();
     final headers = ApiService.getRequestHeaders();
     final deviceId = Store.get(StoreKey.deviceId);

mobile/lib/utils/bootstrap.dart

@@ -6,6 +6,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
@@ -51,6 +52,8 @@ abstract final class Bootstrap {
 
     await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);
 
+    await SessionRepository.ensureInitialized(drift);
+
     final settingsRepo = await SettingsRepository.ensureInitialized(drift);
 
     await LogService.init(

mobile/lib/utils/image_url_builder.dart

@@ -1,9 +1,8 @@
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:openapi/api.dart';
 
 String getOriginalUrlForRemoteId(final String id, {bool edited = true}) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original?edited=$edited';
+  return '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/original?edited=$edited';
 }
 
 String getThumbnailUrlForRemoteId(
@@ -12,14 +11,15 @@ String getThumbnailUrlForRemoteId(
   bool edited = true,
   String? thumbhash,
 }) {
-  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
+  final url =
+      '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
   return thumbhash != null ? '$url&c=${Uri.encodeComponent(thumbhash)}' : url;
 }
 
 String getPlaybackUrlForRemoteId(final String id) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/video/playback?';
+  return '${SessionRepository.instance.session.serverEndpoint!}/assets/$id/video/playback?';
 }
 
 String getFaceThumbnailUrl(final String personId) {
-  return '${Store.get(StoreKey.serverEndpoint)}/people/$personId/thumbnail';
+  return '${SessionRepository.instance.session.serverEndpoint!}/people/$personId/thumbnail';
 }

mobile/lib/utils/migration.dart

@@ -8,17 +8,21 @@ import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-const int targetVersion = 26;
+const int targetVersion = 28;
 
 Future<void> migrateDatabaseIfNeeded(Drift drift) async {
   final int version = Store.get(StoreKey.version, targetVersion);
@@ -31,18 +35,26 @@ Future<void> migrateDatabaseIfNeeded(Drift drift) async {
     await _migrateTo26(drift);
   }
 
+  if (version < 27) {
+    await _migrateTo27(drift);
+  }
+
+  if (version < 28) {
+    await _migrateTo28(drift);
+  }
+
   await Store.put(StoreKey.version, targetVersion);
   return;
 }
 
 Future<void> _migrateTo25() async {
-  final accessToken = Store.tryGet(StoreKey.accessToken);
+  final accessToken = Store.tryGet(StoreKey.legacyAccessToken);
   if (accessToken == null || accessToken.isEmpty) {
     return;
   }
 
   final urls = <String>[];
-  final serverEndpoint = Store.tryGet(StoreKey.serverEndpoint);
+  final serverEndpoint = Store.tryGet(StoreKey.legacyServerEndpoint);
   if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
     urls.add(serverEndpoint);
   }
@@ -73,7 +85,7 @@ Future<void> _migrateTo25() async {
 }
 
 Future<void> _migrateTo26(Drift drift) async {
-  final migrator = _StoreMigrator(drift);
+  final migrator = _StoreMigrator.settings(drift);
   await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, SettingsKey.logLevel, LogLevel.values);
   // Theme
   await migrator.migrateEnumName(StoreKey.legacyThemeMode, SettingsKey.themeMode, ThemeMode.values);
@@ -118,8 +130,10 @@ Future<void> _migrateTo26(Drift drift) async {
   await migrator.migrateBool(StoreKey.legacyTapToNavigate, SettingsKey.viewerTapToNavigate);
   // Network
   await migrator.migrateBool(StoreKey.legacyAutoEndpointSwitching, SettingsKey.networkAutoEndpointSwitching);
-  await migrator.migrateString(StoreKey.legacyPreferredWifiName, SettingsKey.networkPreferredWifiName);
-  await migrator.migrateString(StoreKey.legacyLocalEndpoint, SettingsKey.networkLocalEndpoint);
+  final preferredWifiName = await migrator.readLegacyStoreString(StoreKey.legacyPreferredWifiName.id);
+  migrator.stage(StoreKey.legacyPreferredWifiName, SettingsKey.networkPreferredWifiName, preferredWifiName);
+  final localEndpoint = await migrator.readLegacyStoreString(StoreKey.legacyLocalEndpoint.id);
+  migrator.stage(StoreKey.legacyLocalEndpoint, SettingsKey.networkLocalEndpoint, localEndpoint);
   await _migrateExternalEndpointList(migrator);
   await _migrateCustomHeaders(migrator);
   // Album
@@ -136,7 +150,27 @@ Future<void> _migrateTo26(Drift drift) async {
   await migrator.complete();
 }
 
-Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
+Future<void> _migrateTo27(Drift drift) async {
+  final migrator = _StoreMigrator.session(drift);
+  await migrator.migrateString(StoreKey.legacyServerUrl, SessionKey.serverUrl);
+  await migrator.migrateString(StoreKey.legacyAccessToken, SessionKey.accessToken);
+  await migrator.migrateString(StoreKey.legacyServerEndpoint, SessionKey.serverEndpoint);
+  await migrator.complete();
+
+  await SessionRepository.instance.refresh();
+}
+
+Future<void> _migrateTo28(Drift drift) async {
+  final migrator = _StoreMigrator.settings(drift);
+  await migrator.migrateBool(StoreKey.legacyAdvancedTroubleshooting, SettingsKey.advancedTroubleshooting);
+  await migrator.migrateBool(StoreKey.legacyEnableHapticFeedback, SettingsKey.advancedEnableHapticFeedback);
+  await migrator.migrateBool(StoreKey.legacyReadonlyModeEnabled, SettingsKey.advancedReadonlyModeEnabled);
+  await migrator.complete();
+
+  await SettingsRepository.instance.refresh();
+}
+
+Future<void> _migrateAlbumSortMode(_StoreMigrator<SettingsKey> migrator) async {
   final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
   final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);
   if (mode == null) {
@@ -146,7 +180,7 @@ Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
   migrator.stage(StoreKey.legacySelectedAlbumSortOrder, SettingsKey.albumSortMode, mode);
 }
 
-Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
+Future<void> _migrateExternalEndpointList(_StoreMigrator<SettingsKey> migrator) async {
   final raw = await migrator.readLegacyStoreString(StoreKey.legacyExternalEndpointList.id);
   if (raw == null) {
     return;
@@ -170,7 +204,7 @@ Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
   migrator.stage(StoreKey.legacyExternalEndpointList, SettingsKey.networkExternalEndpointList, urls);
 }
 
-Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
+Future<void> _migrateCustomHeaders(_StoreMigrator<SettingsKey> migrator) async {
   final raw = await migrator.readLegacyStoreString(StoreKey.legacyCustomHeaders.id);
   if (raw == null) {
     return;
@@ -193,14 +227,39 @@ Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
   migrator.stage(StoreKey.legacyCustomHeaders, SettingsKey.networkCustomHeaders, headers);
 }
 
-class _StoreMigrator {
+class _StoreMigrator<K extends Enum> {
+  _StoreMigrator._(this._db, {required this.encode, required this.readDefault, required this.insertRow});
+
+  static _StoreMigrator<SettingsKey> settings(Drift db) => _StoreMigrator<SettingsKey>._(
+    db,
+    encode: (key, value) => key.encode(value),
+    readDefault: (key) => defaultConfig.read(key),
+    insertRow: (batch, name, value) => batch.insert(
+      db.settingsEntity,
+      SettingsEntityCompanion(key: Value(name), value: Value(value)),
+      mode: InsertMode.insertOrReplace,
+    ),
+  );
+
+  static _StoreMigrator<SessionKey> session(Drift db) => _StoreMigrator<SessionKey>._(
+    db,
+    encode: (key, value) => key.encode(value),
+    readDefault: (key) => defaultSession.read(key),
+    insertRow: (batch, name, value) => batch.insert(
+      db.sessionEntity,
+      SessionEntityCompanion(key: Value(name), value: Value(value)),
+      mode: InsertMode.insertOrReplace,
+    ),
+  );
+
   final Drift _db;
-  final Map<SettingsKey<Object>, Object> _cache = {};
+  final String Function(K key, Object value) encode;
+  final Object? Function(K key) readDefault;
+  final void Function(Batch batch, String name, String? value) insertRow;
+  final Map<K, Object?> _cache = {};
   final List<int> _migratedStoreIds = [];
 
-  _StoreMigrator(this._db);
-
-  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, SettingsKey<T> newKey, List<T> values) async {
+  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, K newKey, List<T> values) async {
     final index = await readLegacyStoreInt(legacyKey.id);
     if (index == null) {
       return;
@@ -215,11 +274,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateEnumName<T extends Enum>(
-    StoreKey<String> legacyKey,
-    SettingsKey<T> newKey,
-    List<T> values,
-  ) async {
+  Future<void> migrateEnumName<T extends Enum>(StoreKey<String> legacyKey, K newKey, List<T> values) async {
     final name = await readLegacyStoreString(legacyKey.id);
     if (name == null) {
       return;
@@ -234,18 +289,17 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateBool(StoreKey<bool> legacyKey, SettingsKey<bool> newKey) async {
+  Future<void> migrateBool(StoreKey<bool> legacyKey, K newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
     }
 
-    final boolValue = intValue != 0;
-    _cache[newKey] = boolValue;
+    _cache[newKey] = intValue != 0;
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateInt(StoreKey<int> legacyKey, SettingsKey<int> newKey) async {
+  Future<void> migrateInt(StoreKey<int> legacyKey, K newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
@@ -255,9 +309,9 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateString(StoreKey<String> legacyKey, SettingsKey<String> newKey) async {
+  Future<void> migrateString(StoreKey<String> legacyKey, K newKey) async {
     final value = await readLegacyStoreString(legacyKey.id);
-    if (value == null) {
+    if (value == null || value.isEmpty) {
       return;
     }
 
@@ -265,7 +319,12 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  void stage<T extends Object>(StoreKey legacyKey, SettingsKey<T> newKey, T value) {
+  Future<void> migrateNullableString(StoreKey<String> legacyKey, K newKey) async {
+    _cache[newKey] = await readLegacyStoreString(legacyKey.id);
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  void stage(StoreKey legacyKey, K newKey, Object? value) {
     _cache[newKey] = value;
     _migratedStoreIds.add(legacyKey.id);
   }
@@ -273,14 +332,12 @@ class _StoreMigrator {
   Future<void> complete() async {
     await _db.batch((batch) {
       for (final entry in _cache.entries) {
-        if (entry.value == defaultConfig.read(entry.key)) {
+        if (entry.value == readDefault(entry.key)) {
           continue;
         }
-        batch.insert(
-          _db.settingsEntity,
-          SettingsEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
-          mode: InsertMode.insertOrReplace,
-        );
+
+        final value = entry.value;
+        insertRow(batch, entry.key.name, value == null ? null : encode(entry.key, value));
       }
     });
     await deleteLegacyStoreRows(_migratedStoreIds);

mobile/lib/utils/option.dart

@@ -55,8 +55,8 @@ final class None<T> extends Option<T> {
   int get hashCode => 0;
 }
 
-extension ObjectOptionExtension<T> on T? {
-  Option<T> toOption() => Option.fromNullable(this);
+extension NullableOptionExtension<T> on Option<T>? {
+  T? patch(T? current) => this == null ? current : this!.unwrapOrNull;
 }
 
 extension OptionToOptional<T> on Option<T> {

mobile/lib/utils/url_helper.dart

@@ -1,5 +1,4 @@
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:punycode/punycode.dart';
 
 String sanitizeUrl(String url) {
@@ -11,7 +10,7 @@ String sanitizeUrl(String url) {
 }
 
 String? getServerUrl() {
-  final serverUrl = punycodeDecodeUrl(Store.tryGet(StoreKey.serverEndpoint));
+  final serverUrl = punycodeDecodeUrl(SessionRepository.instance.session.serverEndpoint);
   final serverUri = serverUrl != null ? Uri.tryParse(serverUrl) : null;
   if (serverUri == null) {
     return null;

mobile/lib/widgets/common/user_avatar.dart

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 
 Widget userAvatar(BuildContext context, UserDto u, {double? radius}) {
-  final url = "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image";
+  final url = "${SessionRepository.instance.session.serverEndpoint!}/users/${u.id}/profile-image";
   final nameFirstLetter = u.name.isNotEmpty ? u.name[0] : "";
   return CircleAvatar(
     radius: radius,

mobile/lib/widgets/common/user_circle_avatar.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/session.provider.dart';
 
 // ignore: must_be_immutable
 class UserCircleAvatar extends ConsumerWidget {
@@ -18,7 +17,7 @@ class UserCircleAvatar extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final userAvatarColor = user.avatarColor.toColor().withValues(alpha: opacity);
     final profileImageUrl =
-        '${Store.get(StoreKey.serverEndpoint)}/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';
+        '${ref.read(sessionProvider).serverEndpoint}/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';
 
     final textColor = (user.avatarColor.toColor().computeLuminance() > 0.5 ? Colors.black : Colors.white).withValues(
       alpha: opacity,

mobile/lib/widgets/settings/advanced_settings.dart

@@ -27,7 +27,11 @@ class AdvancedSettings extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final advancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
+    final advancedTroubleshooting = useState(ref.read(appConfigProvider).advanced.troubleshooting);
+    useValueChanged(
+      advancedTroubleshooting.value,
+      (_, __) => ref.read(settingsProvider).write(.advancedTroubleshooting, advancedTroubleshooting.value),
+    );
     final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final isManageMediaSupported = useState(false);
     final manageMediaAndroidPermission = useState(false);
@@ -37,7 +41,7 @@ class AdvancedSettings extends HookConsumerWidget {
       preferRemote.value,
       (_, __) => ref.read(settingsProvider).write(.imagePreferRemote, preferRemote.value),
     );
-    final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);
+    final readonlyModeEnabled = useState(ref.read(appConfigProvider).advanced.readonlyModeEnabled);
 
     final logLevel = Level.LEVELS[levelId.value].name;
 

mobile/lib/widgets/settings/preference_settings/haptic_setting.dart

@@ -2,21 +2,23 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
 class HapticSetting extends HookConsumerWidget {
   const HapticSetting({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final hapticFeedbackSetting = useAppSettingsState(AppSettingsEnum.enableHapticFeedback);
-    final isHapticFeedbackEnabled = useValueNotifier(hapticFeedbackSetting.value);
+    final isHapticFeedbackEnabled = useState(ref.read(appConfigProvider).advanced.enableHapticFeedback);
+    useValueChanged(
+      isHapticFeedbackEnabled.value,
+      (_, __) => ref.read(settingsProvider).write(.advancedEnableHapticFeedback, isHapticFeedbackEnabled.value),
+    );
 
     onHapticFeedbackChange(bool isEnabled) {
-      hapticFeedbackSetting.value = isEnabled;
+      isHapticFeedbackEnabled.value = isEnabled;
     }
 
     return Column(

mobile/test/domain/services/store_service_test.dart

@@ -21,14 +21,14 @@ void main() {
     controller = StreamController<List<StoreDto<Object>>>.broadcast();
     mockDriftStoreRepo = MockDriftStoreRepository();
     // For generics, we need to provide fallback to each concrete type to avoid runtime errors
-    registerFallbackValue(StoreKey.accessToken);
+    registerFallbackValue(StoreKey.legacyAccessToken);
     registerFallbackValue(StoreKey.version);
-    registerFallbackValue(StoreKey.advancedTroubleshooting);
+    registerFallbackValue(StoreKey.legacyAdvancedTroubleshooting);
 
     when(() => mockDriftStoreRepo.getAll()).thenAnswer(
       (_) async => [
-        const StoreDto(StoreKey.accessToken, _kAccessToken),
-        const StoreDto(StoreKey.advancedTroubleshooting, _kAdvancedTroubleshooting),
+        const StoreDto(StoreKey.legacyAccessToken, _kAccessToken),
+        const StoreDto(StoreKey.legacyAdvancedTroubleshooting, _kAdvancedTroubleshooting),
         const StoreDto(StoreKey.version, _kVersion),
       ],
     );
@@ -45,35 +45,35 @@ void main() {
   group("Store Service Init:", () {
     test('Populates the internal cache on init', () {
       verify(() => mockDriftStoreRepo.getAll()).called(1);
-      expect(sut.tryGet(StoreKey.accessToken), _kAccessToken);
-      expect(sut.tryGet(StoreKey.advancedTroubleshooting), _kAdvancedTroubleshooting);
+      expect(sut.tryGet(StoreKey.legacyAccessToken), _kAccessToken);
+      expect(sut.tryGet(StoreKey.legacyAdvancedTroubleshooting), _kAdvancedTroubleshooting);
       expect(sut.tryGet(StoreKey.version), _kVersion);
       // Other keys should be null
-      expect(sut.tryGet(StoreKey.currentUser), isNull);
+      expect(sut.tryGet(StoreKey.deviceId), isNull);
     });
 
     test('Listens to stream of store updates', () async {
-      final event = StoreDto(StoreKey.accessToken, _kAccessToken.toUpperCase());
+      final event = StoreDto(StoreKey.legacyAccessToken, _kAccessToken.toUpperCase());
       controller.add([event]);
 
       await pumpEventQueue();
 
       verify(() => mockDriftStoreRepo.watchAll()).called(1);
-      expect(sut.tryGet(StoreKey.accessToken), _kAccessToken.toUpperCase());
+      expect(sut.tryGet(StoreKey.legacyAccessToken), _kAccessToken.toUpperCase());
     });
   });
 
   group('Store Service get:', () {
     test('Returns the stored value for the given key', () {
-      expect(sut.get(StoreKey.accessToken), _kAccessToken);
+      expect(sut.get(StoreKey.legacyAccessToken), _kAccessToken);
     });
 
     test('Throws StoreKeyNotFoundException for nonexistent keys', () {
-      expect(() => sut.get(StoreKey.currentUser), throwsA(isA<StoreKeyNotFoundException>()));
+      expect(() => sut.get(StoreKey.deviceId), throwsA(isA<StoreKeyNotFoundException>()));
     });
 
     test('Returns the stored value for the given key or the defaultValue', () {
-      expect(sut.get(StoreKey.currentUser, 5), 5);
+      expect(sut.get(StoreKey.legacyBackupTriggerDelay, 5), 5);
     });
   });
 
@@ -83,15 +83,15 @@ void main() {
     });
 
     test('Skip insert when value is not modified', () async {
-      await sut.put(StoreKey.accessToken, _kAccessToken);
-      verifyNever(() => mockDriftStoreRepo.upsert<String>(StoreKey.accessToken, any()));
+      await sut.put(StoreKey.legacyAccessToken, _kAccessToken);
+      verifyNever(() => mockDriftStoreRepo.upsert<String>(StoreKey.legacyAccessToken, any()));
     });
 
     test('Insert value when modified', () async {
       final newAccessToken = _kAccessToken.toUpperCase();
-      await sut.put(StoreKey.accessToken, newAccessToken);
-      verify(() => mockDriftStoreRepo.upsert<String>(StoreKey.accessToken, newAccessToken)).called(1);
-      expect(sut.tryGet(StoreKey.accessToken), newAccessToken);
+      await sut.put(StoreKey.legacyAccessToken, newAccessToken);
+      verify(() => mockDriftStoreRepo.upsert<String>(StoreKey.legacyAccessToken, newAccessToken)).called(1);
+      expect(sut.tryGet(StoreKey.legacyAccessToken), newAccessToken);
     });
   });
 
@@ -108,7 +108,7 @@ void main() {
     });
 
     test('Watches a specific key for changes', () async {
-      final stream = sut.watch(StoreKey.accessToken);
+      final stream = sut.watch(StoreKey.legacyAccessToken);
       final events = <String?>[_kAccessToken, _kAccessToken.toUpperCase(), null, _kAccessToken.toLowerCase()];
 
       unawaited(expectLater(stream, emitsInOrder(events)));
@@ -118,7 +118,7 @@ void main() {
       }
 
       await pumpEventQueue();
-      verify(() => mockDriftStoreRepo.watch<String>(StoreKey.accessToken)).called(1);
+      verify(() => mockDriftStoreRepo.watch<String>(StoreKey.legacyAccessToken)).called(1);
     });
   });
 
@@ -128,13 +128,13 @@ void main() {
     });
 
     test('Removes the value from the DB', () async {
-      await sut.delete(StoreKey.accessToken);
-      verify(() => mockDriftStoreRepo.delete<String>(StoreKey.accessToken)).called(1);
+      await sut.delete(StoreKey.legacyAccessToken);
+      verify(() => mockDriftStoreRepo.delete<String>(StoreKey.legacyAccessToken)).called(1);
     });
 
     test('Removes the value from the cache', () async {
-      await sut.delete(StoreKey.accessToken);
-      expect(sut.tryGet(StoreKey.accessToken), isNull);
+      await sut.delete(StoreKey.legacyAccessToken);
+      expect(sut.tryGet(StoreKey.legacyAccessToken), isNull);
     });
   });
 
@@ -146,8 +146,8 @@ void main() {
     test('Clears all values from the store', () async {
       await sut.clear();
       verify(() => mockDriftStoreRepo.deleteAll()).called(1);
-      expect(sut.tryGet(StoreKey.accessToken), isNull);
-      expect(sut.tryGet(StoreKey.advancedTroubleshooting), isNull);
+      expect(sut.tryGet(StoreKey.legacyAccessToken), isNull);
+      expect(sut.tryGet(StoreKey.legacyAdvancedTroubleshooting), isNull);
       expect(sut.tryGet(StoreKey.version), isNull);
     });
   });

mobile/test/domain/services/user_service_test.dart

@@ -1,78 +1,62 @@
 import 'dart:typed_data';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 import '../../fixtures/user.stub.dart';
 import '../../infrastructure/repository.mock.dart';
-import '../service.mock.dart';
 
 void main() {
   late UserService sut;
   late UserApiRepository mockUserApiRepo;
-  late StoreService mockStoreService;
+  late DriftAuthUserRepository mockAuthUserRepo;
 
   setUp(() {
     mockUserApiRepo = MockUserApiRepository();
-    mockStoreService = MockStoreService();
-    sut = UserService(userApiRepository: mockUserApiRepo, storeService: mockStoreService);
+    mockAuthUserRepo = MockDriftAuthUserRepository();
+    sut = UserService(userApiRepository: mockUserApiRepo, authUserRepository: mockAuthUserRepo);
 
     registerFallbackValue(UserStub.admin);
-    when(() => mockStoreService.get(StoreKey.currentUser)).thenReturn(UserStub.admin);
-    when(() => mockStoreService.tryGet(StoreKey.currentUser)).thenReturn(UserStub.admin);
-  });
-
-  group('getMyUser', () {
-    test('should return user from store', () {
-      final result = sut.getMyUser();
-      expect(result, UserStub.admin);
-    });
-
-    test('should handle user not found scenario', () {
-      when(() => mockStoreService.get(StoreKey.currentUser)).thenThrow(Exception('User not found'));
-
-      expect(() => sut.getMyUser(), throwsA(isA<Exception>()));
-    });
+    when(() => mockAuthUserRepo.get()).thenAnswer((_) async => UserStub.admin);
+    when(() => mockAuthUserRepo.upsert(any())).thenAnswer((_) async => UserStub.admin);
   });
 
   group('tryGetMyUser', () {
-    test('should return user from store', () {
-      final result = sut.tryGetMyUser();
+    test('should return the current user from the auth user repository', () async {
+      final result = await sut.tryGetMyUser();
       expect(result, UserStub.admin);
     });
 
-    test('should return null if user not found', () {
-      when(() => mockStoreService.tryGet(StoreKey.currentUser)).thenReturn(null);
-      final result = sut.tryGetMyUser();
+    test('should return null if no user is logged in', () async {
+      when(() => mockAuthUserRepo.get()).thenAnswer((_) async => null);
+      final result = await sut.tryGetMyUser();
       expect(result, isNull);
     });
   });
 
   group('watchMyUser', () {
-    test('should return user stream from store', () {
-      when(() => mockStoreService.watch(StoreKey.currentUser)).thenAnswer((_) => Stream.value(UserStub.admin));
+    test('should return the current user stream from the auth user repository', () {
+      when(() => mockAuthUserRepo.watch()).thenAnswer((_) => Stream.value(UserStub.admin));
       final result = sut.watchMyUser();
       expect(result, emits(UserStub.admin));
     });
 
-    test('should return an empty stream if user not found', () {
-      when(() => mockStoreService.watch(StoreKey.currentUser)).thenAnswer((_) => const Stream.empty());
+    test('should return an empty stream if no user is logged in', () {
+      when(() => mockAuthUserRepo.watch()).thenAnswer((_) => const Stream.empty());
       final result = sut.watchMyUser();
       expect(result, emitsInOrder([]));
     });
   });
 
   group('refreshMyUser', () {
-    test('should return user from api and store it', () async {
+    test('should return user from api and persist it', () async {
       when(() => mockUserApiRepo.getMyUser()).thenAnswer((_) async => UserStub.admin);
-      when(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)).thenAnswer((_) async => true);
 
       final result = await sut.refreshMyUser();
-      verify(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)).called(1);
+      verify(() => mockAuthUserRepo.upsert(UserStub.admin)).called(1);
       expect(result, UserStub.admin);
     });
 
@@ -80,7 +64,7 @@ void main() {
       when(() => mockUserApiRepo.getMyUser()).thenAnswer((_) async => null);
 
       final result = await sut.refreshMyUser();
-      verifyNever(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin));
+      verifyNever(() => mockAuthUserRepo.upsert(any()));
       expect(result, isNull);
     });
   });
@@ -88,29 +72,26 @@ void main() {
   group('createProfileImage', () {
     test('should return profile image path', () async {
       const profileImagePath = 'profile.jpg';
-      final updatedUser = UserStub.admin;
 
       when(
         () => mockUserApiRepo.createProfileImage(name: profileImagePath, data: Uint8List(0)),
       ).thenAnswer((_) async => profileImagePath);
-      when(() => mockStoreService.put(StoreKey.currentUser, updatedUser)).thenAnswer((_) async => true);
 
       final result = await sut.createProfileImage(profileImagePath, Uint8List(0));
 
-      verify(() => mockStoreService.put(StoreKey.currentUser, updatedUser)).called(1);
+      verify(() => mockAuthUserRepo.upsert(UserStub.admin)).called(1);
       expect(result, profileImagePath);
     });
 
     test('should return null if profile image creation fails', () async {
       const profileImagePath = 'profile.jpg';
-      final updatedUser = UserStub.admin;
 
       when(
         () => mockUserApiRepo.createProfileImage(name: profileImagePath, data: Uint8List(0)),
       ).thenThrow(Exception('Failed to create profile image'));
 
       final result = await sut.createProfileImage(profileImagePath, Uint8List(0));
-      verifyNever(() => mockStoreService.put(StoreKey.currentUser, updatedUser));
+      verifyNever(() => mockAuthUserRepo.upsert(any()));
       expect(result, isNull);
     });
   });

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

@@ -33,6 +33,8 @@ import 'schema_v26.dart' as v26;
 import 'schema_v27.dart' as v27;
 import 'schema_v28.dart' as v28;
 import 'schema_v29.dart' as v29;
+import 'schema_v30.dart' as v30;
+import 'schema_v31.dart' as v31;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -96,6 +98,10 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v28.DatabaseAtV28(db);
       case 29:
         return v29.DatabaseAtV29(db);
+      case 30:
+        return v30.DatabaseAtV30(db);
+      case 31:
+        return v31.DatabaseAtV31(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -131,5 +137,7 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     27,
     28,
     29,
+    30,
+    31,
   ];
 }

mobile/test/infrastructure/repositories/store_repository_test.dart

@@ -4,24 +4,20 @@ import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 
-import '../../fixtures/user.stub.dart';
-
 const _kTestAccessToken = "#TestToken";
 const _kTestVersion = 10;
 const _kTestAdvancedTroubleshooting = false;
-final _kTestUser = UserStub.admin;
 
 Future<void> _populateStore(Drift db) async {
   await db.batch((batch) async {
     batch.insert(
       db.storeEntity,
       StoreEntityCompanion(
-        id: Value(StoreKey.advancedTroubleshooting.id),
+        id: Value(StoreKey.legacyAdvancedTroubleshooting.id),
         intValue: const Value(_kTestAdvancedTroubleshooting ? 1 : 0),
         stringValue: const Value(null),
       ),
@@ -29,7 +25,7 @@ Future<void> _populateStore(Drift db) async {
     batch.insert(
       db.storeEntity,
       StoreEntityCompanion(
-        id: Value(StoreKey.accessToken.id),
+        id: Value(StoreKey.legacyAccessToken.id),
         intValue: const Value(null),
         stringValue: const Value(_kTestAccessToken),
       ),
@@ -68,28 +64,20 @@ void main() {
     });
 
     test('converts string', () async {
-      String? accessToken = await sut.tryGet(StoreKey.accessToken);
+      String? accessToken = await sut.tryGet(StoreKey.legacyAccessToken);
       expect(accessToken, isNull);
-      await sut.upsert(StoreKey.accessToken, _kTestAccessToken);
-      accessToken = await sut.tryGet(StoreKey.accessToken);
+      await sut.upsert(StoreKey.legacyAccessToken, _kTestAccessToken);
+      accessToken = await sut.tryGet(StoreKey.legacyAccessToken);
       expect(accessToken, _kTestAccessToken);
     });
 
     test('converts bool', () async {
-      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.legacyAdvancedTroubleshooting);
       expect(advancedTroubleshooting, isNull);
-      await sut.upsert(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting);
-      advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      await sut.upsert(StoreKey.legacyAdvancedTroubleshooting, _kTestAdvancedTroubleshooting);
+      advancedTroubleshooting = await sut.tryGet(StoreKey.legacyAdvancedTroubleshooting);
       expect(advancedTroubleshooting, _kTestAdvancedTroubleshooting);
     });
-
-    test('converts user', () async {
-      UserDto? user = await sut.tryGet(StoreKey.currentUser);
-      expect(user, isNull);
-      await sut.upsert(StoreKey.currentUser, _kTestUser);
-      user = await sut.tryGet(StoreKey.currentUser);
-      expect(user, _kTestUser);
-    });
   });
 
   group('Store Repository Deletes:', () {
@@ -98,10 +86,10 @@ void main() {
     });
 
     test('delete()', () async {
-      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.legacyAdvancedTroubleshooting);
       expect(advancedTroubleshooting, isFalse);
-      await sut.delete(StoreKey.advancedTroubleshooting);
-      advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      await sut.delete(StoreKey.legacyAdvancedTroubleshooting);
+      advancedTroubleshooting = await sut.tryGet(StoreKey.legacyAdvancedTroubleshooting);
       expect(advancedTroubleshooting, isNull);
     });
 
@@ -147,13 +135,13 @@ void main() {
           emitsInOrder([
             [
               const StoreDto<Object>(StoreKey.version, _kTestVersion),
-              const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
-              const StoreDto<Object>(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting),
+              const StoreDto<Object>(StoreKey.legacyAccessToken, _kTestAccessToken),
+              const StoreDto<Object>(StoreKey.legacyAdvancedTroubleshooting, _kTestAdvancedTroubleshooting),
             ],
             [
               const StoreDto<Object>(StoreKey.version, _kTestVersion + 10),
-              const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
-              const StoreDto<Object>(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting),
+              const StoreDto<Object>(StoreKey.legacyAccessToken, _kTestAccessToken),
+              const StoreDto<Object>(StoreKey.legacyAdvancedTroubleshooting, _kTestAdvancedTroubleshooting),
             ],
           ]),
         ),

mobile/test/infrastructure/repository.mock.dart

@@ -48,6 +48,8 @@ class MockSyncMigrationRepository extends Mock implements SyncMigrationRepositor
 
 class MockUserRepository extends Mock implements UserRepository {}
 
+class MockDriftAuthUserRepository extends Mock implements DriftAuthUserRepository {}
+
 class MockPartnerRepository extends Mock implements PartnerRepository {}
 
 // API Repos

mobile/test/medium/repositories/local_asset_repository_test.dart

@@ -456,7 +456,7 @@ void main() {
 
     test('does not update when longitude does not match', () async {
       final remoteAsset = await ctx.newRemoteAsset(ownerId: userId);
-      final cloudIdAsset = await ctx.newRemoteAssetCloudId(id: remoteAsset.id, longitude: (-74.006).toOption());
+      final cloudIdAsset = await ctx.newRemoteAssetCloudId(id: remoteAsset.id, longitude: .fromNullable((-74.006)));
       final localAsset = await ctx.newLocalAsset(
         checksumOption: const Option.none(),
         iCloudId: cloudIdAsset.cloudId,

mobile/test/medium/repositories/session_repository_test.dart

@@ -0,0 +1,118 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
+import 'package:immich_mobile/infrastructure/entities/session.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
+
+import '../repository_context.dart';
+
+void main() {
+  late MediumRepositoryContext ctx;
+  late SessionRepository sut;
+
+  setUpAll(() async {
+    ctx = MediumRepositoryContext();
+    sut = await SessionRepository.ensureInitialized(ctx.db);
+  });
+
+  tearDownAll(() async {
+    await ctx.dispose();
+  });
+
+  setUp(() async {
+    await ctx.db.delete(ctx.db.sessionEntity).go();
+    await SessionRepository.instance.refresh();
+  });
+
+  group('defaults', () {
+    test('session returns null fields when DB is empty', () {
+      expect(sut.session.serverUrl, isNull);
+      expect(sut.session.accessToken, isNull);
+      expect(sut.session.serverEndpoint, isNull);
+    });
+  });
+
+  group('write', () {
+    test('persists a value and reflects it in the composed view', () async {
+      await sut.write(.serverEndpoint, 'https://demo.immich.app/api');
+      expect(sut.session.serverEndpoint, 'https://demo.immich.app/api');
+    });
+
+    test('persists across keys independently', () async {
+      await sut.write(.serverUrl, 'https://demo.immich.app');
+      await sut.write(.accessToken, 'token-123');
+      expect(sut.session.serverUrl, 'https://demo.immich.app');
+      expect(sut.session.accessToken, 'token-123');
+      expect(sut.session.serverEndpoint, isNull);
+    });
+  });
+
+  group('null values', () {
+    test('a stored NULL value column decodes to null on refresh', () async {
+      await ctx.db
+          .into(ctx.db.sessionEntity)
+          .insert(
+            SessionEntityCompanion.insert(
+              key: SessionKey.accessToken.name,
+              value: const .new(null),
+              updatedAt: .new(DateTime.now()),
+            ),
+          );
+
+      await SessionRepository.instance.refresh();
+      expect(sut.session.accessToken, isNull);
+    });
+  });
+
+  group('sync', () {
+    test('picks up rows that were inserted directly into the DB', () async {
+      await ctx.db
+          .into(ctx.db.sessionEntity)
+          .insert(
+            SessionEntityCompanion.insert(
+              key: SessionKey.serverEndpoint.name,
+              value: const .new('https://demo.immich.app/api'),
+              updatedAt: .new(DateTime.now()),
+            ),
+          );
+      expect(sut.session.serverEndpoint, isNull);
+
+      await SessionRepository.instance.refresh();
+      expect(sut.session.serverEndpoint, 'https://demo.immich.app/api');
+    });
+
+    test('drops cached values for rows that were deleted out from under the repo', () async {
+      await sut.write(.serverEndpoint, 'https://demo.immich.app/api');
+      await ctx.db.delete(ctx.db.sessionEntity).go();
+      expect(sut.session.serverEndpoint, 'https://demo.immich.app/api');
+
+      await SessionRepository.instance.refresh();
+      expect(sut.session.serverEndpoint, isNull);
+    });
+
+    test('skips rows whose key is unknown to SessionKey', () async {
+      await ctx.db
+          .into(ctx.db.sessionEntity)
+          .insert(
+            SessionEntityCompanion.insert(
+              key: 'session.unknown.future-key',
+              value: const .new('unknown'),
+              updatedAt: .new(DateTime.now()),
+            ),
+          );
+
+      await SessionRepository.instance.refresh();
+      expect(sut.session.serverEndpoint, isNull);
+    });
+  });
+
+  group('watch', () {
+    test('watchSession emits the new value after a write', () async {
+      final expectation = expectLater(
+        sut.watch().map((s) => s.serverEndpoint),
+        emitsThrough('https://demo.immich.app/api/watch'),
+      );
+      await sut.write(SessionKey.serverEndpoint, 'https://demo.immich.app/api/watch');
+      await expectation;
+    });
+  });
+}

mobile/test/medium/repositories/settings_repository_test.dart

@@ -1,4 +1,3 @@
-import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
@@ -61,6 +60,39 @@ void main() {
     });
   });
 
+  group('null values', () {
+    test('writing null to a nullable key clears the row and reverts the cache to null', () async {
+      await sut.write(SettingsKey.networkPreferredWifiName, 'home-wifi');
+      expect(sut.appConfig.network.preferredWifiName, 'home-wifi');
+      expect(await ctx.db.select(ctx.db.settingsEntity).get(), hasLength(1));
+
+      await sut.write(SettingsKey.networkPreferredWifiName, null);
+
+      expect(await ctx.db.select(ctx.db.settingsEntity).get(), isEmpty);
+      expect(sut.appConfig.network.preferredWifiName, isNull);
+    });
+
+    test('writing null to an already-null key is a no-op', () async {
+      await sut.write(SettingsKey.networkPreferredWifiName, null);
+      expect(await ctx.db.select(ctx.db.settingsEntity).get(), isEmpty);
+    });
+
+    test('a stored NULL value column decodes to null on refresh', () async {
+      await ctx.db
+          .into(ctx.db.settingsEntity)
+          .insert(
+            SettingsEntityCompanion.insert(
+              key: SettingsKey.networkPreferredWifiName.name,
+              value: const .new(null),
+              updatedAt: .new(DateTime.now()),
+            ),
+          );
+
+      await SettingsRepository.instance.refresh();
+      expect(sut.appConfig.network.preferredWifiName, isNull);
+    });
+  });
+
   group('delete', () {});
 
   group('sync', () {
@@ -70,8 +102,8 @@ void main() {
           .insert(
             SettingsEntityCompanion.insert(
               key: SettingsKey.themeMode.name,
-              value: ThemeMode.dark.name,
-              updatedAt: Value(DateTime.now()),
+              value: .new(ThemeMode.dark.name),
+              updatedAt: .new(DateTime.now()),
             ),
           );
 
@@ -98,8 +130,8 @@ void main() {
           .insert(
             SettingsEntityCompanion.insert(
               key: 'app-config.unknown.future-key',
-              value: 'whatever',
-              updatedAt: Value(DateTime.now()),
+              value: const .new('unknown'),
+              updatedAt: .new(DateTime.now()),
             ),
           );
 
@@ -110,13 +142,13 @@ void main() {
 
   group('watch', () {
     test('watchAppConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
+      final expectation = expectLater(sut.watch().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
       await sut.write(SettingsKey.themeMode, ThemeMode.dark);
       await expectation;
     });
 
     test('watchConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
+      final expectation = expectLater(sut.watch().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
       await sut.write(SettingsKey.logLevel, LogLevel.warning);
       await expectation;
     });

mobile/test/providers/infrastructure/action_provider_test.dart

@@ -60,7 +60,7 @@ void main() {
     when(() => actionService.editDateTime(any(), any())).thenAnswer((_) async => true);
     when(() => assetService.watchAsset(any())).thenAnswer((_) => const Stream.empty());
     when(() => assetService.getExif(any())).thenAnswer((_) async => null);
-    when(() => userService.tryGetMyUser()).thenReturn(_user);
+    when(() => userService.tryGetMyUser()).thenAnswer((_) async => _user);
     when(() => userService.watchMyUser()).thenAnswer((_) => const Stream.empty());
 
     container = ProviderContainer(

mobile/test/services/auth.service_test.dart

@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -44,6 +45,7 @@ void main() {
     WidgetsFlutterBinding.ensureInitialized();
     db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
     await StoreService.init(storeRepository: DriftStoreRepository(db));
+    await SessionRepository.ensureInitialized(db);
   });
 
   tearDownAll(() async {

mobile/test/services/background_upload.service_test.dart

@@ -7,10 +7,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/services/background_upload.service.dart';
@@ -39,8 +41,8 @@ void main() {
     db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
     await StoreService.init(storeRepository: DriftStoreRepository(db));
     await SettingsRepository.ensureInitialized(db);
-
-    await Store.put(StoreKey.serverEndpoint, 'http://test-server.com');
+    await SessionRepository.ensureInitialized(db);
+    await SessionRepository.instance.write(SessionKey.serverEndpoint, 'https://demo.immich.app');
     await Store.put(StoreKey.deviceId, 'test-device-id');
   });
 

mobile/test/unit/presentation_context.dart

@@ -5,10 +5,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/session.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/session.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 
 import '../test_utils.dart';
@@ -25,7 +26,8 @@ class PresentationContext {
     if (_db == null) {
       final db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
       await StoreService.init(storeRepository: DriftStoreRepository(db), listenUpdates: false);
-      await StoreService.I.put(StoreKey.serverEndpoint, serverEndpoint);
+      await SessionRepository.ensureInitialized(db);
+      await SessionRepository.instance.write(SessionKey.serverEndpoint, serverEndpoint);
       _db = db;
     }
     return const PresentationContext._();

mobile/test/unit/repositories/settings_repository_test.dart

@@ -5,8 +5,12 @@ import 'package:immich_mobile/domain/models/settings_key.dart';
 void main() {
   group('SettingsKey', () {
     for (final key in SettingsKey.values) {
+      final defaultValue = defaultConfig.read(key);
+      // null is a valid value for some keys but we don't use the codec in that case
+      if (defaultValue == null) {
+        continue;
+      }
       test('verify codec for $key', () {
-        final defaultValue = defaultConfig.read(key);
         final encoded = key.encode(defaultValue);
         final decoded = key.decode(encoded);
         expect(decoded, defaultValue, reason: 'round-trip failed for ${key.name}');

mobile/test/unit/utils/option_test.dart

@@ -100,17 +100,23 @@ void main() {
     });
   });
 
-  group('ObjectOptionExtension', () {
-    test('non-null value.toOption() returns Some', () {
-      final option = 'hello'.toOption();
-      expect(option, isA<Some<String>>());
-      expect((option as Some).value, 'hello');
+  group('NullableOptionExtension', () {
+    test('patch returns the current value when the option is null', () {
+      const Option<String>? omitted = null;
+      expect(omitted.patch('existing'), 'existing');
     });
 
-    test('null value.toOption() returns None', () {
-      const String? value = null;
-      final option = value.toOption();
-      expect(option, isA<None<String>>());
+    test('patch preserves a null current when the option is null', () {
+      const Option<String>? omitted = null;
+      expect(omitted.patch(null), isNull);
+    });
+
+    test('patch returns the wrapped value for Some, overriding current', () {
+      expect(const Option.some('new').patch('existing'), 'new');
+    });
+
+    test('patch returns null for None, clearing current', () {
+      expect(const Option<String>.none().patch('existing'), isNull);
     });
   });
 }

mobile/test/unit/utils/value_codec_test.dart

@@ -0,0 +1,99 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/value_codec.dart';
+
+enum _Fruit { apple, banana, cherry }
+
+void main() {
+  group('MapCodec', () {
+    group('encode', () {
+      test('serializes an empty map to an empty JSON object', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.encode({}), '{}');
+      });
+
+      test('encodes a string-to-string map as a JSON object', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.encode({'a': '1', 'b': '2'}), '{"a":"1","b":"2"}');
+      });
+
+      test('stringifies non-string values via the value codec', () {
+        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
+        expect(codec.encode({'x': 10, 'y': 20}), '{"x":"10","y":"20"}');
+      });
+
+      test('stringifies non-string keys via the key codec', () {
+        const codec = MapCodec<int, String>(PrimitiveCodec.integer, PrimitiveCodec.string);
+        expect(codec.encode({1: 'one', 2: 'two'}), '{"1":"one","2":"two"}');
+      });
+    });
+
+    group('decode', () {
+      test('reconstructs a string-to-string map', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.decode('{"a":"1","b":"2"}'), {'a': '1', 'b': '2'});
+      });
+
+      test('parses values back to their domain type', () {
+        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
+        expect(codec.decode('{"x":"10","y":"20"}'), {'x': 10, 'y': 20});
+      });
+
+      test('parses keys back to their domain type', () {
+        const codec = MapCodec<int, String>(PrimitiveCodec.integer, PrimitiveCodec.string);
+        expect(codec.decode('{"1":"one","2":"two"}'), {1: 'one', 2: 'two'});
+      });
+
+      test('returns an empty map for an empty JSON object', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.decode('{}'), isEmpty);
+      });
+
+      test('returns an empty map when the payload is not valid JSON', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.decode('not json'), isEmpty);
+      });
+
+      test('returns an empty map when the JSON root is not an object', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.decode('[]'), isEmpty);
+        expect(codec.decode('"a string"'), isEmpty);
+        expect(codec.decode('42'), isEmpty);
+      });
+
+      test('skips entries whose value is not a JSON string, keeping the rest', () {
+        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
+        expect(codec.decode('{"x":1,"y":"20"}'), {'y': 20});
+      });
+
+      test('skips entries whose value is a nested object, keeping the rest', () {
+        const codec = MapCodec<String, String>(PrimitiveCodec.string, PrimitiveCodec.string);
+        expect(codec.decode('{"a":{"nested":"value"},"b":"ok"}'), {'b': 'ok'});
+      });
+
+      test('returns an empty map when every entry is malformed', () {
+        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
+        expect(codec.decode('{"x":1,"y":2}'), isEmpty);
+      });
+    });
+
+    group('round trip', () {
+      test('preserves a primitive map through encode then decode', () {
+        const codec = MapCodec<String, int>(PrimitiveCodec.string, PrimitiveCodec.integer);
+        const original = {'one': 1, 'two': 2, 'three': 3};
+        expect(codec.decode(codec.encode(original)), original);
+      });
+
+      test('preserves an enum-valued map by composing with EnumCodec', () {
+        const codec = MapCodec<String, _Fruit>(PrimitiveCodec.string, EnumCodec(_Fruit.values));
+        const original = {'breakfast': _Fruit.banana, 'snack': _Fruit.apple};
+        expect(codec.decode(codec.encode(original)), original);
+      });
+
+      test('preserves a DateTime-valued map by composing with DateTimeCodec', () {
+        const codec = MapCodec<String, DateTime>(PrimitiveCodec.string, DateTimeCodec());
+        final original = {'created': DateTime.utc(2024, 1, 1, 12, 30)};
+        expect(codec.decode(codec.encode(original)), original);
+      });
+    });
+  });
+}