fix: user id migration (#960)

digiboridev · web-flow · commit ba2170c6a1a1 · 2026-02-23T09:24:26.000+02:00
diff --git a/lib/app/router/main_shell.dart b/lib/app/router/main_shell.dart
@@ -472,23 +472,23 @@ class _MainShellState extends State<MainShell> with WidgetsBindingObserver {
                       final session = context.read<AppBloc>().state.session;
 
                       return MessagingBloc(
-                        session.userId,
                         createMessagingSocket(session.coreUrl!, session.token!, session.tenantId),
                         featureAccess.messagingConfig,
                         context.read<ChatsRepository>(),
                         context.read<ChatsOutboxRepository>(),
                         context.read<SmsRepository>(),
                         context.read<SmsOutboxRepository>(),
+                        context.read<SessionRepository>(),
                         (n) => context.read<NotificationsBloc>().add(NotificationsSubmitted(n)),
                       );
                     },
                   ),
                   BlocProvider<UnreadCountCubit>(
                     create: (context) {
                       return UnreadCountCubit(
-                        userId: context.read<AppBloc>().state.session.userId,
                         chatsRepository: context.read<ChatsRepository>(),
                         smsRepository: context.read<SmsRepository>(),
+                        sessionRepository: context.read<SessionRepository>(),
                       )..init();
                     },
                   ),
diff --git a/lib/blocs/app/app_bloc.dart b/lib/blocs/app/app_bloc.dart
@@ -39,8 +39,8 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     required AppThemes appThemes,
   }) : super(
          AppState(
-           session: sessionRepository.getCurrent() ?? const Session(),
-           status: (sessionRepository.getCurrent()?.isLoggedIn ?? false)
+           session: sessionRepository.getCurrent(),
+           status: (sessionRepository.getCurrent().isLoggedIn)
                ? AppLifecycleStatus.authenticated
                : AppLifecycleStatus.unauthenticated,
            themeSettings: appThemes.values.first.settings,
@@ -135,7 +135,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     // guarantees the session is already terminated.
     final shouldRevokeRemote = reason == AppLogoutReason.userRequest || reason == AppLogoutReason.serverRejection;
 
-    if (shouldRevokeRemote && currentSession != null && currentSession.isLoggedIn) {
+    if (shouldRevokeRemote && currentSession.isLoggedIn) {
       _logger.info('Revoking remote session. Reason: $reason');
       unawaited(sessionRepository.revokeSession(currentSession));
     } else {
diff --git a/lib/features/messaging/bloc/messaging_bloc.dart b/lib/features/messaging/bloc/messaging_bloc.dart
@@ -28,15 +28,15 @@ final _logger = Logger('MessagingBloc');
 
 class MessagingBloc extends Bloc<MessagingEvent, MessagingState> {
   MessagingBloc(
-    this._userId,
     this._client,
     this._messagingConfig,
     this._chatsRepository,
     this._chatsOutboxRepository,
     this._smsRepository,
     this._smsOutboxRepository,
+    this._sessionRepository,
     this._submitNotification,
-  ) : super(MessagingState.initial(_client, _messagingConfig)) {
+  ) : super(MessagingState.initial(_sessionRepository.getCurrent().userId, _client, _messagingConfig)) {
     on<Connect>(_connect);
     on<Refresh>(_refresh);
     on<Disconnect>(_onDisconnect);
@@ -49,13 +49,13 @@ class MessagingBloc extends Bloc<MessagingEvent, MessagingState> {
     _subs.add(_client.errorStream.listen((e) => add(_ClientError(e))));
   }
 
-  final String _userId;
   final PhoenixSocket _client;
   final MessagingConfig _messagingConfig;
   final ChatsRepository _chatsRepository;
   final ChatsOutboxRepository _chatsOutboxRepository;
   final SmsRepository _smsRepository;
   final SmsOutboxRepository _smsOutboxRepository;
+  final SessionRepository _sessionRepository;
   final Function(Notification) _submitNotification;
   final List<StreamSubscription> _subs = [];
 
@@ -70,10 +70,7 @@ class MessagingBloc extends Bloc<MessagingEvent, MessagingState> {
     // -
     // Uncomment section below to wipe messaging related data
     // -
-    // _chatsRepository.wipeChatsData();
-    // _chatsOutboxRepository.wipeOutboxData();
-    // _smsRepository.wipeData();
-    // _smsOutboxRepository.wipeOutboxData();
+    // wipeData()
 
     emit(state.copyWith(status: ConnectionStatus.connecting));
     _client.connect();
@@ -89,8 +86,26 @@ class MessagingBloc extends Bloc<MessagingEvent, MessagingState> {
     try {
       // Join channel for user specific events
       if (_client.userChannel == null) {
-        final userChannel = _client.createUserChannel(_userId);
-        await userChannel.join().future;
+        final userId = _sessionRepository.getCurrent().userId;
+        final userChannel = _client.createUserChannel(userId);
+        final joinReq = await userChannel.join().future;
+        final response = joinReq.response;
+
+        /// Handle the workaround for core userId upgrade
+        /// When the server detects that the client is using an old userId format, it responds with a "forbidden" message containing the new userId.
+        /// The client then updates its session with the new userId, wipes local messaging data to prevent inconsistencies
+        /// and rejoins the channel with the new userId.
+        if (response is List && response[0] == 'forbidden' && response[1] is String) {
+          final newUserId = response[1] as String;
+          _logger.warning('UserId upgrade required, new userId: $newUserId');
+
+          await _sessionRepository.patchSession(userId: newUserId);
+          await wipeData();
+
+          emit(state.copyWith(userId: newUserId));
+          final userChannel = _client.createUserChannel(newUserId);
+          await userChannel.join().future;
+        }
       }
 
       // Init workers
@@ -137,6 +152,13 @@ class MessagingBloc extends Bloc<MessagingEvent, MessagingState> {
     }
   }
 
+  Future<void> wipeData() async {
+    await _chatsRepository.wipeChatsData();
+    await _chatsOutboxRepository.wipeOutboxData();
+    await _smsRepository.wipeData();
+    await _smsOutboxRepository.wipeOutboxData();
+  }
+
   void _disposeWorkers() {
     _chatsSyncWorker?.dispose();
     _chatsSyncWorker = null;
diff --git a/lib/features/messaging/bloc/messaging_state.dart b/lib/features/messaging/bloc/messaging_state.dart
@@ -3,24 +3,37 @@ part of 'messaging_bloc.dart';
 enum ConnectionStatus { initial, error, connecting, connected }
 
 class MessagingState with EquatableMixin {
-  const MessagingState._(this.client, this.status, this.messagingConfig, this.error);
+  const MessagingState._(this.userId, this.client, this.status, this.messagingConfig, this.error);
 
+  final String userId;
   final PhoenixSocket client;
   final ConnectionStatus status;
   final MessagingConfig messagingConfig;
   final Exception? error;
 
-  factory MessagingState.initial(PhoenixSocket client, MessagingConfig messagingConfig) {
-    return MessagingState._(client, ConnectionStatus.initial, messagingConfig, null);
+  factory MessagingState.initial(String userId, PhoenixSocket client, MessagingConfig messagingConfig) {
+    return MessagingState._(userId, client, ConnectionStatus.initial, messagingConfig, null);
   }
 
-  MessagingState copyWith({ConnectionStatus? status, MessagingConfig? messagingConfig, Exception? error}) {
-    return MessagingState._(client, status ?? this.status, messagingConfig ?? this.messagingConfig, error);
+  MessagingState copyWith({
+    String? userId,
+    PhoenixSocket? client,
+    ConnectionStatus? status,
+    MessagingConfig? messagingConfig,
+    Exception? error,
+  }) {
+    return MessagingState._(
+      userId ?? this.userId,
+      client ?? this.client,
+      status ?? this.status,
+      messagingConfig ?? this.messagingConfig,
+      error,
+    );
   }
 
   @override
   bool? get stringify => true;
 
   @override
-  List<Object?> get props => [client, status];
+  List<Object?> get props => [userId, client, status, messagingConfig, error];
 }
diff --git a/lib/features/messaging/cubits/unread_count/unread_count_cubit.dart b/lib/features/messaging/cubits/unread_count/unread_count_cubit.dart
@@ -11,15 +11,15 @@ final _logger = Logger('UnreadCountCubit');
 
 class UnreadCountCubit extends Cubit<UnreadCountState> {
   UnreadCountCubit({
-    required this.userId,
     required this.chatsRepository,
     required this.smsRepository,
+    required this.sessionRepository,
     this.updateDebounce = const Duration(seconds: 1),
   }) : super(UnreadCountState.initial());
 
-  final String userId;
   final ChatsRepository chatsRepository;
   final SmsRepository smsRepository;
+  final SessionRepository sessionRepository;
   final Duration updateDebounce;
   StreamSubscription? _chatsUpdatesSub;
   StreamSubscription? _smsUpdatesSub;
@@ -32,6 +32,7 @@ class UnreadCountCubit extends Cubit<UnreadCountState> {
   }
 
   void _updateUnreadCount() async {
+    final userId = sessionRepository.getCurrent().userId;
     final chatCounts = await chatsRepository.unreadedCountPerChat(userId);
     final smsCounts = await smsRepository.unreadedCountPerConversation(userId);
 
diff --git a/lib/features/messaging/extensions/phoenix_socket.dart b/lib/features/messaging/extensions/phoenix_socket.dart
@@ -26,8 +26,13 @@ PhoenixSocket createMessagingSocket(String coreUrl, String token, String tenantI
 }
 
 extension PhoenixSocketExt on PhoenixSocket {
-  /// Create user channel by [userId] and connect, if already exists returns it
-  PhoenixChannel createUserChannel(String userId) => addChannel(topic: 'chat:user:$userId');
+  /// Create user channel by [userId] and connect, if already exists replaces it
+  PhoenixChannel createUserChannel(String userId) {
+    final oldChannel = userChannel;
+    if (oldChannel != null) removeChannel(oldChannel);
+
+    return addChannel(topic: 'chat:user:$userId');
+  }
 
   /// Get user channel if exists
   PhoenixChannel? get userChannel => channels.values.firstWhereOrNull((c) => c.topic.startsWith('chat:user:'));
diff --git a/lib/features/messaging/features/chat_conversation/view/conversation_screen.dart b/lib/features/messaging/features/chat_conversation/view/conversation_screen.dart
@@ -6,7 +6,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import 'package:webtrit_phone/app/router/app_router.dart';
-import 'package:webtrit_phone/blocs/app/app_bloc.dart';
 import 'package:webtrit_phone/features/features.dart';
 import 'package:webtrit_phone/models/models.dart';
 import 'package:webtrit_phone/l10n/l10n.dart';
@@ -22,9 +21,9 @@ class ChatConversationScreen extends StatefulWidget {
 }
 
 class _ChatConversationScreenState extends State<ChatConversationScreen> {
-  late final userId = context.read<AppBloc>().state.session.userId;
   late final messagingBloc = context.read<MessagingBloc>();
   late final conversationCubit = context.read<ConversationCubit>();
+  late final userId = messagingBloc.state.userId;
 
   void onMenuTap() {
     final state = conversationCubit.state;
diff --git a/lib/features/messaging/features/conversations/view/conversations_screen.dart b/lib/features/messaging/features/conversations/view/conversations_screen.dart
@@ -264,7 +264,7 @@ class _ConversationsScreenState extends State<ConversationsScreen> with SingleTi
         body: MessagingStateWrapper(
           child: TabBarView(
             controller: _tabController,
-            children: [for (final tab in _tabs) ConversationsList(selectedTab: tab)],
+            children: [for (final tab in _tabs) ConversationsList(selectedTab: tab)], // TODO: wtf
           ),
         ),
         floatingActionButton: Builder(
diff --git a/lib/features/messaging/features/conversations/widgets/conversations_list.dart b/lib/features/messaging/features/conversations/widgets/conversations_list.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-import 'package:webtrit_phone/blocs/app/app_bloc.dart';
 import 'package:webtrit_phone/features/features.dart';
 import 'package:webtrit_phone/l10n/l10n.dart';
 import 'package:webtrit_phone/widgets/widgets.dart';
@@ -16,7 +15,7 @@ class ConversationsList extends StatefulWidget {
 }
 
 class _ConversationsListState extends State<ConversationsList> {
-  late final userId = context.read<AppBloc>().state.session.userId;
+  late final messagingBloc = context.read<MessagingBloc>();
 
   @override
   Widget build(BuildContext context) {
@@ -29,6 +28,8 @@ class _ConversationsListState extends State<ConversationsList> {
 
         return ListView(
           children: conversationsToShow.map((e) {
+            final userId = messagingBloc.state.userId;
+
             final (:chat, :message, contacts: _) = e;
             return FadeIn(
               child: ChatConversationsTile(conversation: chat, lastMessage: message, userId: userId, key: ValueKey(e)),
@@ -47,6 +48,8 @@ class _ConversationsListState extends State<ConversationsList> {
 
         return ListView(
           children: conversationsToShow.map((e) {
+            final userId = messagingBloc.state.userId;
+
             final conversation = e.$1;
             final lastMessage = e.$2;
             return FadeIn(
diff --git a/lib/features/messaging/features/sms_conversation/view/sms_conversation_screen.dart b/lib/features/messaging/features/sms_conversation/view/sms_conversation_screen.dart
@@ -7,7 +7,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import 'package:webtrit_phone/app/router/app_router.dart';
-import 'package:webtrit_phone/blocs/app/app_bloc.dart';
 import 'package:webtrit_phone/features/features.dart';
 import 'package:webtrit_phone/repositories/repositories.dart';
 import 'package:webtrit_phone/widgets/fade_id.dart';
@@ -22,10 +21,10 @@ class SmsConversationScreen extends StatefulWidget {
 }
 
 class _SmsConversationScreenState extends State<SmsConversationScreen> {
-  late final userId = context.read<AppBloc>().state.session.userId;
   late final messagingBloc = context.read<MessagingBloc>();
   late final conversationCubit = context.read<SmsConversationCubit>();
   late final contactsRepo = context.read<ContactsRepository>();
+  late final userId = messagingBloc.state.userId;
 
   Future<void> onDeleteDialog() async {
     final askResult = await showDialog<bool>(
diff --git a/lib/features/messaging/widgets/messaging_shell.dart b/lib/features/messaging/widgets/messaging_shell.dart
@@ -48,7 +48,7 @@ class _MessagingShellState extends State<MessagingShell> {
       if (connectionStatus == ConnectionStatus.initial) messagingBloc.add(const Connect());
 
       pushService ??= MessagingPushService(
-        context.read<AppBloc>().state.session.userId,
+        messagingBloc.state.userId,
         context.read<ChatsRepository>(),
         context.read<SmsRepository>(),
         context.read<ContactsRepository>(),
diff --git a/lib/repositories/auth/session_repository.dart b/lib/repositories/auth/session_repository.dart
@@ -11,7 +11,7 @@ final _logger = Logger('SessionRepository');
 
 abstract class SessionRepository {
   /// Returns the current in-memory session snapshot.
-  Session? getCurrent();
+  Session getCurrent();
 
   /// Persists a session.
   ///
@@ -26,6 +26,10 @@ abstract class SessionRepository {
   /// Revokes the session on the server (API Call).
   /// This does NOT clear local data.
   Future<void> revokeSession(Session session);
+
+  /// Patches the current session with new values.
+  /// Only non-null parameters will be updated; null parameters will be ignored.
+  Future<void> patchSession({String? tenantId, String? token, String? coreUrl, String? userId});
 }
 
 class SessionRepositoryImpl implements SessionRepository {
@@ -63,7 +67,7 @@ class SessionRepositoryImpl implements SessionRepository {
   }
 
   @override
-  Session? getCurrent() => _effectiveSession;
+  Session getCurrent() => _effectiveSession;
 
   @override
   Future<void> save(Session session) async {
@@ -133,6 +137,33 @@ class SessionRepositoryImpl implements SessionRepository {
     }
   }
 
+  @override
+  Future<void> patchSession({String? tenantId, String? token, String? coreUrl, String? userId}) async {
+    if (tenantId != null) {
+      await secureStorage.writeTenantId(tenantId);
+      _currentSession = _currentSession?.copyWith(tenantId: tenantId) ?? _currentSession;
+      _logger.warning('tenantId patched: $tenantId');
+    }
+
+    if (token != null) {
+      await secureStorage.writeToken(token);
+      _currentSession = _currentSession?.copyWith(token: token) ?? _currentSession;
+      _logger.warning('token patched: ${token.substring(0, 8)}...');
+    }
+
+    if (coreUrl != null) {
+      await secureStorage.writeCoreUrl(coreUrl);
+      _currentSession = _currentSession?.copyWith(coreUrl: coreUrl) ?? _currentSession;
+      _logger.warning('coreUrl patched: $coreUrl');
+    }
+
+    if (userId != null) {
+      await secureStorage.writeUserId(userId);
+      _currentSession = _currentSession?.copyWith(userId: userId) ?? _currentSession;
+      _logger.warning('userId patched: $userId');
+    }
+  }
+
   Session _loadFromStorage() {
     return Session(
       coreUrl: secureStorage.readCoreUrl(),
diff --git a/screenshots/lib/mocks/mock_messaging_bloc.dart b/screenshots/lib/mocks/mock_messaging_bloc.dart
@@ -20,6 +20,7 @@ class MockMessagingBloc extends MockBloc<MessagingEvent, MessagingState> impleme
       mock,
       const Stream<MessagingState>.empty(),
       initialState: MessagingState.initial(
+          'user-id',
           MockPhoenixSocket(),
           MessagingConfig(
             coreSmsSupport: true,
