fix(chat): websockets

lib/core/const.dart

@@ -1,4 +1,3 @@
-// String baseUrl = 'https://mobile-stage.eatvio.ru';
 String baseUrl = 'https://eatvio.ru';
 
 const List<int> durationValues = [7, 14, 21];

lib/core/websockets/ws_manager.dart

@@ -98,7 +98,6 @@ class WsManager {
             const Duration(milliseconds: 300),
             () => sl<ChatsCubit>().getChatRooms(),
           );
-          log(event.rootObject.toString());
         });
         _subscribe();
       } catch (e, st) {

lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart

@@ -89,7 +89,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<void> initChat(String uuid, {bool sendInitialMessage = false}) async {
+  Future<void> initChat(
+    String uuid, {
+    bool sendInitialMessage = false,
+  }) async {
     try {
       final chatRoom = await chatRepository.getChatRoom(uuid);
       ChosenPlanModel? chosenPlan;
@@ -98,8 +101,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       }
       final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
       lastPage = chatMessages.meta.lastPage;
-
-      await _subscribeToChatChannel(uuid: uuid);
+      await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
       emit(
         ChatRoomState.loaded(
           chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -158,14 +160,14 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<void> _subscribeToChatChannel({required String uuid}) async {
+  Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
     final client = wsManager.client;
     if (client == null) return;
-    await wsManager.initPrivateDirectChatChannel(uuid);
+    await wsManager.initPrivateDirectChatChannel(chatId);
     wsManager.subscribeDirectChatChannel();
     messagesSubscription = wsManager.directChatStream?.listen((event) {
       AudioPlayer().play((AssetSource('audio/recive_message.wav')));
-      final message = ChatMessageModel.fromJson(jsonDecode(event.data)['message']);
+      final message = ChatMessageModel.fromJson(jsonDecode(event.data));
       List<ChatMessageModel> messagesList = [message, ...(state as ChatRoomStateLoaded).chatMessages];
       chatRepository.emitNewMessageToChats(message);
       emit((state as ChatRoomStateLoaded).copyWith(chatMessages: messagesList, isLoading: isLoading));
@@ -179,7 +181,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     typingSubscription = wsManager.clientTypingStream?.listen((event) {
       emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
       EasyDebounce.debounce(
-          'client-typing', const Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
+        'client-typing',
+        const Duration(seconds: 3),
+        () => emit(
+          (state as ChatRoomStateLoaded).copyWith(
+            isTyping: false,
+            isLoading: isLoading,
+          ),
+        ),
+      );
     });
   }
 

lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart

@@ -3,7 +3,6 @@ import 'dart:developer';
 import 'package:eatvio_app/core/app_router.dart';
 
 import 'package:eatvio_app/core/token_storage.dart';
-import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
 import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
@@ -51,25 +50,17 @@ class RegistrationCubit extends Cubit<RegistrationState> {
   void updateSheet(UserRegistrationSheet sheet) => emit(RegistrationState(sheet: sheet));
 
   Future<void> tryRegistration() async {
-    if (await registrationRepository.emailIsReachable(state.sheet.email)) {
-      try {
-        final token = await registrationRepository.tryRegister(
-          state.sheet.copyWith(
-            phone: state.sheet.phone.replaceAll(' ', '').replaceAll('(', '').replaceAll(')', ''),
-            responseBody: '{}',
-          ),
-        );
-        await TokenStorage.saveTokenInStorage(token);
-        AppRouter.navigatorKey.currentContext?.pushNamed('verifyEmailScreen');
-      } catch (e) {
-        log(e.toString());
-      }
-    } else {
-      showErrorDialog(
-        AppRouter.navigatorKey.currentContext!,
-        title: 'Ошибка регистрации',
-        description: 'Несуществующая почта.',
+    try {
+      final token = await registrationRepository.tryRegister(
+        state.sheet.copyWith(
+          phone: state.sheet.phone.replaceAll(' ', '').replaceAll('(', '').replaceAll(')', ''),
+          responseBody: '{}',
+        ),
       );
+      await TokenStorage.saveTokenInStorage(token);
+      AppRouter.navigatorKey.currentContext?.pushNamed('verifyEmailScreen');
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
     }
   }
 

lib/features/registration/repositories/registration_repository.dart

@@ -1,5 +1,7 @@
+
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/models/location_model.dart';
 import 'package:eatvio_app/features/registration/services/registration_service.dart';
@@ -11,7 +13,13 @@ class RegistrationRepository {
 
   Future<String> tryRegister(UserRegistrationSheet sheet) async {
     try {
-      return (await registrationService.register(sheet: sheet.toJson()))['token']!;
+      final response = await registrationService.register(sheet: sheet.toJson());
+      try {
+        return (response['token']!);
+      } catch (e) {
+        showErrorToast(response.toString());
+        rethrow;
+      }
     } catch (e) {
       rethrow;
     }