From 2ab3bc1cf0a2e335163919e582c0dedef828de1e Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 17 Dec 2025 15:41:38 +0300 Subject: [PATCH] feat(auth): implement OAuth verification request and confirmation flow with error handling and UI updates --- ios/Runner.xcodeproj/project.pbxproj | 6 +- ios/Runner/Info.plist | 2 +- .../oauth_verification_confirm_request.dart | 27 ++ .../oauth_verification_confirm_response.dart | 18 ++ .../models/oauth_verification_request.dart | 12 + .../oauth_verification_request_response.dart | 12 + .../bloc/oauth_cubit/oauth_cubit.dart | 97 +++++- .../pages/register_via_social_screen.dart | 289 +++++++++++++++++- .../auth/repositories/auth_repository.dart | 62 +++- lib/features/auth/services/auth_service.dart | 10 + pubspec.yaml | 2 +- test/core/constants/app_constants_test.dart | 2 + test/core/cubit/state_utils_test.dart | 2 + .../core/data/selection_popup_model_test.dart | 2 + test/core/enums/prefs_keys_test.dart | 2 + .../internet_connection_state_test.dart | 2 + test/core/prefs_keys_test.dart | 2 + .../routing/main_navigation_routes_test.dart | 2 + test/core/routing/other_routes_test.dart | 2 + test/core/routing/route_constants_test.dart | 2 + test/core/routing/settings_routes_test.dart | 2 + test/core/views/cubit/views_state_test.dart | 2 + test/core/widgets/add_item_button_test.dart | 2 + .../widgets/animated_option_button_test.dart | 2 + test/core/widgets/base_button_test.dart | 2 + .../widgets/bottom_sheet_with_blur_test.dart | 2 + test/core/widgets/cpfc_container_test.dart | 2 + test/core/widgets/custom_search_bar_test.dart | 2 + test/core/widgets/item_widget_test.dart | 2 + test/core/widgets/loader_test.dart | 2 + .../widgets/main_background_bouble_test.dart | 2 + .../widgets/marketing_bottom_sheet_test.dart | 2 + test/core/widgets/option_widget_test.dart | 2 + .../create_diet/basic_widget_test.dart | 1 + .../widgets/error_widget_test.dart | 2 + .../chosen_diet_widget_content_test.dart | 2 + .../widgets/comment_container_test.dart | 2 + .../finish_day_button_widget_test.dart | 2 + .../widgets/meal_summary_widget_test.dart | 2 + .../widgets/product_loader_widget_test.dart | 2 + .../widgets/info_bouble_test.dart | 2 + .../widgets/choice_chip_widget_test.dart | 2 + .../widgets/filter_badge_test.dart | 2 + .../widgets/status_widget_test.dart | 2 + .../glossary_repository_test.dart | 2 + .../widgets/notification_widget_test.dart | 2 + .../service/notifications_service_test.dart | 2 + test/fixtures/doubles/auth_doubles.dart | 14 + .../fixtures/doubles/create_diet_doubles.dart | 18 -- 49 files changed, 601 insertions(+), 39 deletions(-) create mode 100644 lib/features/auth/models/oauth_verification_confirm_request.dart create mode 100644 lib/features/auth/models/oauth_verification_confirm_response.dart create mode 100644 lib/features/auth/models/oauth_verification_request.dart create mode 100644 lib/features/auth/models/oauth_verification_request_response.dart diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index e06b26ab..ad156380 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 87; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -539,7 +539,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 87; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -578,7 +578,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 87; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 94c063d6..182a74af 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 87 + $(FLUTTER_BUILD_NUMBER) ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/lib/features/auth/models/oauth_verification_confirm_request.dart b/lib/features/auth/models/oauth_verification_confirm_request.dart new file mode 100644 index 00000000..88101ab2 --- /dev/null +++ b/lib/features/auth/models/oauth_verification_confirm_request.dart @@ -0,0 +1,27 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'oauth_verification_confirm_request.freezed.dart'; +part 'oauth_verification_confirm_request.g.dart'; + +@freezed +abstract class OAuthVerificationConfirmRequest with _$OAuthVerificationConfirmRequest { + const factory OAuthVerificationConfirmRequest({ + @JsonKey(name: 'access_token') required String accessToken, + @JsonKey(name: 'refresh_token') required String refreshToken, + @JsonKey(name: 'client_id') required String clientId, + required String provider, + required String id, + String? email, + String? phone, + required String code, + @JsonKey(name: 'verification_type') required String verificationType, + @JsonKey(name: 'first_name') required String firstName, + @JsonKey(name: 'last_name') required String lastName, + @JsonKey(name: 'date_of_birth') required String dateOfBirth, + required String gender, + required int weight, + required int height, + }) = _OAuthVerificationConfirmRequest; + + factory OAuthVerificationConfirmRequest.fromJson(Map json) => _$OAuthVerificationConfirmRequestFromJson(json); +} diff --git a/lib/features/auth/models/oauth_verification_confirm_response.dart b/lib/features/auth/models/oauth_verification_confirm_response.dart new file mode 100644 index 00000000..9333a03d --- /dev/null +++ b/lib/features/auth/models/oauth_verification_confirm_response.dart @@ -0,0 +1,18 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'oauth_verification_confirm_response.freezed.dart'; +part 'oauth_verification_confirm_response.g.dart'; + +@freezed +abstract class OAuthVerificationConfirmResponse with _$OAuthVerificationConfirmResponse { + const factory OAuthVerificationConfirmResponse({ + required bool success, + required String message, + required String token, + required Map user, + @JsonKey(name: 'is_new_user') required bool isNewUser, + }) = _OAuthVerificationConfirmResponse; + + factory OAuthVerificationConfirmResponse.fromJson(Map json) => _$OAuthVerificationConfirmResponseFromJson(json); +} + diff --git a/lib/features/auth/models/oauth_verification_request.dart b/lib/features/auth/models/oauth_verification_request.dart new file mode 100644 index 00000000..5d9c8408 --- /dev/null +++ b/lib/features/auth/models/oauth_verification_request.dart @@ -0,0 +1,12 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'oauth_verification_request.freezed.dart'; +part 'oauth_verification_request.g.dart'; + +@freezed +abstract class OAuthVerificationRequest with _$OAuthVerificationRequest { + const factory OAuthVerificationRequest({String? email, String? phone}) = _OAuthVerificationRequest; + + factory OAuthVerificationRequest.fromJson(Map json) => _$OAuthVerificationRequestFromJson(json); +} + diff --git a/lib/features/auth/models/oauth_verification_request_response.dart b/lib/features/auth/models/oauth_verification_request_response.dart new file mode 100644 index 00000000..32787602 --- /dev/null +++ b/lib/features/auth/models/oauth_verification_request_response.dart @@ -0,0 +1,12 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'oauth_verification_request_response.freezed.dart'; +part 'oauth_verification_request_response.g.dart'; + +@freezed +abstract class OAuthVerificationRequestResponse with _$OAuthVerificationRequestResponse { + const factory OAuthVerificationRequestResponse({required String email, required String status}) = _OAuthVerificationRequestResponse; + + factory OAuthVerificationRequestResponse.fromJson(Map json) => _$OAuthVerificationRequestResponseFromJson(json); +} + diff --git a/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart b/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart index b4f78b4a..22f65f42 100644 --- a/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart +++ b/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart @@ -3,6 +3,7 @@ import 'package:dio/dio.dart'; import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart'; import 'package:eatvio_app/core/prefs.dart'; import 'package:eatvio_app/core/token_storage.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart'; import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart'; import 'package:eatvio_app/features/auth/repositories/auth_repository.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -28,6 +29,19 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin { log('OAuthCubit: Got token model: ${tokenModel.token}'); TokenStorage.saveTokenInStorage(tokenModel.token); emit(OAuthState.loaded(token: tokenModel.token)); + } on DioException catch (e) { + log('OAuthCubit: Error occurred: $e'); + // Проверяем, является ли ошибка ошибкой валидации email/phone + final errors = e.response?.data['errors'] as Map?; + final emailErrors = errors?['email'] as List?; + final phoneErrors = errors?['phone'] as List?; + + if ((emailErrors != null && emailErrors.isNotEmpty) || (phoneErrors != null && phoneErrors.isNotEmpty)) { + // Это ошибка валидации - нужно показать экран подтверждения + emit(const OAuthState.error(errorMessage: 'validation_error')); + } else { + emit(OAuthState.error(errorMessage: e.toString())); + } } catch (e) { log('OAuthCubit: Error occurred: $e'); emit(OAuthState.error(errorMessage: e.toString())); @@ -77,16 +91,22 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin { final dateOfBirth = errors?['date_of_birth'] as List?; final errorsList = []; if (emailErrors != null && emailErrors.isNotEmpty) { - if (emailErrors.contains('Некорректный формат email')) { - errorsList.add(RegistrationValidationErrors.incorrectEmailFormat); - } - if (emailErrors.contains('Такой Эл. почта уже существует.')) { - errorsList.add(RegistrationValidationErrors.emailExist); + for (final error in emailErrors) { + final errorStr = error.toString(); + if (errorStr.contains('Некорректный формат email')) { + errorsList.add(RegistrationValidationErrors.incorrectEmailFormat); + } + if (errorStr.contains('почта уже существует') || errorStr.contains('Эл. почта уже существует')) { + errorsList.add(RegistrationValidationErrors.emailExist); + } } } if (phoneErrors != null && phoneErrors.isNotEmpty) { - if (phoneErrors.contains('Такой phone уже существует.')) { - errorsList.add(RegistrationValidationErrors.phoneExist); + for (final error in phoneErrors) { + final errorStr = error.toString(); + if (errorStr.contains('phone уже существует') || errorStr.contains('телефон уже существует')) { + errorsList.add(RegistrationValidationErrors.phoneExist); + } } } if (dateOfBirth != null && dateOfBirth.isNotEmpty) { @@ -101,6 +121,69 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin { return null; } + + Future requestOAuthVerification({String? email, String? phone}) async { + try { + emit(const OAuthState.loading()); + log('OAuthCubit: Requesting verification code for email: $email, phone: $phone'); + final response = await authRepository.requestOAuthVerification(email: email, phone: phone); + log('OAuthCubit: Verification code requested successfully, masked email: ${response.email}'); + // Сбрасываем состояние после успешного запроса кода + emit(const OAuthState()); + return response; + } catch (e) { + log('OAuthCubit: Error requesting verification code: $e'); + emit(OAuthState.error(errorMessage: e.toString())); + return null; + } + } + + Future confirmOAuthVerification({ + required String provider, + required String accessToken, + required String refreshToken, + required String clientId, + required String id, + String? email, + String? phone, + required String code, + required String verificationType, + required String firstName, + required String lastName, + required String dateOfBirth, + required String gender, + required int weight, + required int height, + }) async { + try { + emit(const OAuthState.loading()); + log('OAuthCubit: Confirming OAuth verification - provider: $provider, verificationType: $verificationType, code: $code'); + final response = await authRepository.confirmOAuthVerification( + provider: provider, + accessToken: accessToken, + refreshToken: refreshToken, + clientId: clientId, + id: id, + email: email, + phone: phone, + code: code, + verificationType: verificationType, + firstName: firstName, + lastName: lastName, + dateOfBirth: dateOfBirth, + gender: gender, + weight: weight, + height: height, + ); + log('OAuthCubit: OAuth verification confirmed successfully, token received'); + TokenStorage.saveTokenInStorage(response.token); + emit(OAuthState.loaded(token: response.token)); + } catch (e) { + log('OAuthCubit: Error confirming OAuth verification: $e'); + emit(OAuthState.error(errorMessage: e.toString())); + rethrow; // Пробрасываем ошибку дальше, чтобы UI мог её обработать + } + } } enum RegistrationValidationErrors { incorrectEmailFormat, emailExist, phoneExist, incorrectDateOfBirthFormat } diff --git a/lib/features/auth/presentation/pages/register_via_social_screen.dart b/lib/features/auth/presentation/pages/register_via_social_screen.dart index 1791e24e..2663dac2 100644 --- a/lib/features/auth/presentation/pages/register_via_social_screen.dart +++ b/lib/features/auth/presentation/pages/register_via_social_screen.dart @@ -1,3 +1,4 @@ +import 'dart:developer'; import 'package:eatvio_app/core/app_config.dart'; import 'package:eatvio_app/core/const.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; @@ -49,6 +50,8 @@ class _RegisterViaSocialScreenState extends State { bool weightError = false; bool heightError = false; bool incorrectEmailFormatError = false; + bool showVerificationButton = false; + String? verificationType; // 'email' or 'phone' // Состояние для выбора пола bool isMaleSelected = true; @@ -221,7 +224,28 @@ class _RegisterViaSocialScreenState extends State { hasError: emailExistError || incorrectEmailFormatError, onChanged: (newValue) {}, ), - if (emailExistError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Такая почта уже существует.')], + if (emailExistError) ...[ + const SizedBox(height: 4), + const ValidationErrorWidget(error: 'Такая почта уже существует.'), + if (showVerificationButton && verificationType == 'email') ...[ + const SizedBox(height: 12), + InkWell( + borderRadius: BorderRadius.circular(20), + onTap: () => _handleVerificationRequest(context, 'email'), + child: Ink( + width: MediaQuery.of(context).size.width - 32, + height: 52, + decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(20)), + child: const Center( + child: Text( + 'Да, это мой аккаунт, подтвердить', + style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white), + ), + ), + ), + ), + ], + ], if (incorrectEmailFormatError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Некорректный формат email')], const SizedBox(height: 12), const Text('Номер телефона'), @@ -235,7 +259,28 @@ class _RegisterViaSocialScreenState extends State { hasError: phoneExistError, onChanged: (newValue) {}, ), - if (phoneExistError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Такой номер телефона уже существует.')], + if (phoneExistError) ...[ + const SizedBox(height: 4), + const ValidationErrorWidget(error: 'Такой номер телефона уже существует.'), + if (showVerificationButton && verificationType == 'phone') ...[ + const SizedBox(height: 12), + InkWell( + borderRadius: BorderRadius.circular(20), + onTap: () => _handleVerificationRequest(context, 'phone'), + child: Ink( + width: MediaQuery.of(context).size.width - 32, + height: 52, + decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(20)), + child: const Center( + child: Text( + 'Да, это мой аккаунт, подтвердить', + style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white), + ), + ), + ), + ), + ], + ], const SizedBox(height: 12), Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -501,6 +546,10 @@ class _RegisterViaSocialScreenState extends State { clientId: clientID, ); if (errors != null) { + bool hasEmailExist = false; + bool hasPhoneExist = false; + + // Сначала определяем, какие ошибки присутствуют for (final error in errors) { switch (error) { case RegistrationValidationErrors.incorrectEmailFormat: @@ -509,14 +558,10 @@ class _RegisterViaSocialScreenState extends State { }); break; case RegistrationValidationErrors.emailExist: - setState(() { - emailExistError = true; - }); + hasEmailExist = true; break; case RegistrationValidationErrors.phoneExist: - setState(() { - phoneExistError = true; - }); + hasPhoneExist = true; break; case RegistrationValidationErrors.incorrectDateOfBirthFormat: setState(() { @@ -525,8 +570,236 @@ class _RegisterViaSocialScreenState extends State { break; } } + + // Устанавливаем verificationType согласно правилам: + // - Если оба (email и phone) существуют -> 'email' + // - Если только email -> 'email' + // - Если только phone -> 'phone' + if (hasEmailExist || hasPhoneExist) { + setState(() { + emailExistError = hasEmailExist; + phoneExistError = hasPhoneExist; + showVerificationButton = true; + if (hasEmailExist && hasPhoneExist) { + verificationType = 'email'; // Если оба существуют, используем email + } else if (hasEmailExist) { + verificationType = 'email'; // Только email + } else { + verificationType = 'phone'; // Только phone + } + }); + } + + // Если есть ошибки, возвращаемся и не показываем toast об успехе return; } + // Регистрация успешна только если нет ошибок showSuccessToast('Регистрация успешна'); } + + Future _handleVerificationRequest(BuildContext context, String type) async { + try { + // Используем service locator для доступа к OAuthCubit + final oauthCubit = CubitRegistrations.sl(); + // Всегда передаем и email и phone + final String email = emailController.text; + final String phone = phoneController.text.replaceAll(RegExp(r'[^\d+]'), ''); + + final response = await oauthCubit.requestOAuthVerification(email: email, phone: phone); + + if (response != null && context.mounted) { + // Показываем диалог для ввода кода + final displayText = response.email; + _showVerificationCodeDialog(context, type, displayText); + } else { + if (context.mounted) { + showErrorToast('Не удалось отправить код верификации'); + } + } + } catch (e) { + if (context.mounted) { + showErrorToast('Ошибка: ${e.toString()}'); + } + } + } + + void _showVerificationCodeDialog(BuildContext context, String verificationType, String displayText) { + final List focusNodes = List.generate(4, (_) => FocusNode()); + final List controllers = List.generate(4, (_) => TextEditingController()); + + showDialog( + context: context, + barrierDismissible: false, + builder: (dialogContext) => AlertDialog( + title: const Text('Подтверждение аккаунта'), + content: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text('Код отправлен на $displayText'), + const SizedBox(height: 20), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: List.generate(4, (index) { + return SizedBox( + width: 50, + child: TextField( + controller: controllers[index], + focusNode: focusNodes[index], + textAlign: TextAlign.center, + keyboardType: TextInputType.number, + maxLength: 1, + decoration: const InputDecoration(counterText: '', border: OutlineInputBorder()), + onChanged: (value) { + if (value.isNotEmpty && index < 3) { + focusNodes[index + 1].requestFocus(); + } + if (value.isEmpty && index > 0) { + focusNodes[index - 1].requestFocus(); + } + // Проверяем, заполнен ли весь код + final code = controllers.map((c) => c.text).join(); + if (code.length == 4) { + // Небольшая задержка перед отправкой, чтобы пользователь увидел последний символ + Future.delayed(const Duration(milliseconds: 100), () async { + if (dialogContext.mounted && context.mounted) { + await _handleVerificationConfirm(context, dialogContext, verificationType, code, controllers, focusNodes); + } + }); + } + }, + ), + ); + }), + ), + ], + ), + ), + actions: [ + TextButton( + onPressed: () { + for (var controller in controllers) { + controller.dispose(); + } + for (var node in focusNodes) { + node.dispose(); + } + Navigator.of(dialogContext).pop(); + }, + child: const Text('Отмена'), + ), + ], + ), + ); + } + + Future _handleVerificationConfirm( + BuildContext widgetContext, + BuildContext dialogContext, + String verificationType, + String code, + List controllers, + List focusNodes, + ) async { + try { + // Используем service locator для доступа к OAuthCubit, так как контекст из диалога может не иметь доступа к провайдеру + final oauthCubit = CubitRegistrations.sl(); + final authResult = widget.authResult; + + if (authResult == null) { + showErrorToast('Ошибка: данные авторизации не найдены'); + return; + } + + // Всегда передаем и email и phone (полный набор данных от провайдера) + // Используем данные из формы, если они есть, иначе из authResult + final String email = emailController.text.isNotEmpty ? emailController.text : (authResult.email ?? ''); + final String phone = phoneController.text.isNotEmpty ? phoneController.text.replaceAll(RegExp(r'[^\d+]'), '') : (authResult.phone ?? ''); + + // Проверяем, что данные есть + if (email.isEmpty && phone.isEmpty) { + log('OAuth Verification Confirm: Both email and phone are empty'); + showErrorToast('Ошибка: не указан email или телефон'); + return; + } + + // Проверяем, что все необходимые данные от провайдера есть + if (authResult.accessToken.isEmpty || authResult.clientId.isEmpty || authResult.userId.isEmpty) { + log('OAuth Verification Confirm: Missing required OAuth data'); + showErrorToast('Ошибка: неполные данные авторизации'); + return; + } + + // Проверяем, что код не пустой + if (code.isEmpty || code.length != 4) { + showErrorToast('Введите полный код'); + return; + } + + // Получаем данные профиля из формы + final String firstName = firstNameController.text.isNotEmpty ? firstNameController.text : (authResult.firstName ?? ''); + final String lastName = lastNameController.text.isNotEmpty ? lastNameController.text : (authResult.lastName ?? ''); + final String dateOfBirth = dateOfBirthController.text.isNotEmpty ? dateOfBirthController.text : (authResult.birthDate ?? ''); + final String gender = isMaleSelected ? 'male' : 'female'; + final int weight = weightController.text.isNotEmpty ? (int.tryParse(weightController.text) ?? 0) : 0; + final int height = heightController.text.isNotEmpty ? (int.tryParse(heightController.text) ?? 0) : 0; + + // Проверяем, что все обязательные поля заполнены + if (firstName.isEmpty || lastName.isEmpty || dateOfBirth.isEmpty || weight == 0 || height == 0) { + log('OAuth Verification Confirm: Missing required profile data'); + showErrorToast('Ошибка: заполните все обязательные поля'); + return; + } + + // Логируем перед отправкой запроса + log('OAuth Verification Confirm: provider=${widget.provider}, verificationType=$verificationType, code=$code, email=$email, phone=$phone'); + + // Отправляем запрос на подтверждение с полным набором данных от провайдера + await oauthCubit.confirmOAuthVerification( + provider: widget.provider ?? 'social', + accessToken: authResult.accessToken, + refreshToken: authResult.refreshToken ?? '', + clientId: authResult.clientId, + id: authResult.userId, + email: email, + phone: phone, + code: code, + verificationType: verificationType, + firstName: firstName, + lastName: lastName, + dateOfBirth: dateOfBirth, + gender: gender, + weight: weight, + height: height, + ); + + // Закрываем диалог + for (var controller in controllers) { + controller.dispose(); + } + for (var node in focusNodes) { + node.dispose(); + } + if (dialogContext.mounted) { + Navigator.of(dialogContext).pop(); + } + + // Перезагружаем веб-сокет и переходим на главный экран + if (widgetContext.mounted) { + _reconnectWebSocket(widgetContext); + } + } catch (e, stackTrace) { + log('OAuth Verification Confirm Error: $e', error: e, stackTrace: stackTrace); + if (widgetContext.mounted) { + showErrorToast('Неверный код. Попробуйте снова.'); + } + // Очищаем поля + for (var controller in controllers) { + controller.clear(); + } + if (focusNodes.isNotEmpty) { + focusNodes[0].requestFocus(); + } + } + } } diff --git a/lib/features/auth/repositories/auth_repository.dart b/lib/features/auth/repositories/auth_repository.dart index a65f309c..da80bf68 100644 --- a/lib/features/auth/repositories/auth_repository.dart +++ b/lib/features/auth/repositories/auth_repository.dart @@ -1,6 +1,11 @@ +import 'dart:developer'; import 'package:eatvio_app/features/auth/models/credentials_model.dart'; import 'package:eatvio_app/features/auth/models/oauth_model.dart'; import 'package:eatvio_app/features/auth/models/oauth_login_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_response.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart'; import 'package:eatvio_app/features/auth/models/token_model.dart'; import 'package:eatvio_app/features/auth/services/auth_service.dart'; @@ -19,7 +24,6 @@ class AuthRepository { } } - Future signInViaSocialMedia({ required String provider, required String accessToken, @@ -73,4 +77,60 @@ class AuthRepository { rethrow; } } + + Future requestOAuthVerification({String? email, String? phone}) async { + try { + return await authService.requestOAuthVerification( + body: OAuthVerificationRequest(email: email, phone: phone), + ); + } catch (e) { + rethrow; + } + } + + Future confirmOAuthVerification({ + required String provider, + required String accessToken, + required String refreshToken, + required String clientId, + required String id, + String? email, + String? phone, + required String code, + required String verificationType, + required String firstName, + required String lastName, + required String dateOfBirth, + required String gender, + required int weight, + required int height, + }) async { + try { + final request = OAuthVerificationConfirmRequest( + provider: provider, + accessToken: accessToken, + refreshToken: refreshToken, + clientId: clientId, + id: id, + email: email, + phone: phone, + code: code, + verificationType: verificationType, + firstName: firstName, + lastName: lastName, + dateOfBirth: dateOfBirth, + gender: gender, + weight: weight, + height: height, + ); + // Логируем запрос перед отправкой + log( + 'AuthRepository: Sending OAuth verification confirm request: provider=$provider, verificationType=$verificationType, code=$code, email=$email, phone=$phone', + ); + return await authService.confirmOAuthVerification(body: request); + } catch (e) { + log('AuthRepository: Error in confirmOAuthVerification: $e'); + rethrow; + } + } } diff --git a/lib/features/auth/services/auth_service.dart b/lib/features/auth/services/auth_service.dart index 41d35da7..34e624c0 100644 --- a/lib/features/auth/services/auth_service.dart +++ b/lib/features/auth/services/auth_service.dart @@ -2,6 +2,10 @@ import 'package:dio/dio.dart'; import 'package:eatvio_app/features/auth/models/credentials_model.dart'; import 'package:eatvio_app/features/auth/models/oauth_model.dart'; import 'package:eatvio_app/features/auth/models/oauth_login_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_response.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart'; import 'package:eatvio_app/features/auth/models/token_model.dart'; import 'package:retrofit/retrofit.dart'; @@ -19,4 +23,10 @@ abstract class AuthService { @POST('/api/oauth/login') Future signInViaSocialMedia({@Body() required OAuthLoginRequest body}); + + @POST('/api/oauth/verification/request') + Future requestOAuthVerification({@Body() required OAuthVerificationRequest body}); + + @POST('/api/oauth/verification/confirm') + Future confirmOAuthVerification({@Body() required OAuthVerificationConfirmRequest body}); } diff --git a/pubspec.yaml b/pubspec.yaml index 23aad87a..96bab2f8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: eatvio_app description: A new Flutter project. -version: 1.3.7+87 +version: 1.3.8+88 publish_to: 'none' environment: diff --git a/test/core/constants/app_constants_test.dart b/test/core/constants/app_constants_test.dart index af45b4d5..8c10cae7 100644 --- a/test/core/constants/app_constants_test.dart +++ b/test/core/constants/app_constants_test.dart @@ -138,3 +138,5 @@ void main() { + + diff --git a/test/core/cubit/state_utils_test.dart b/test/core/cubit/state_utils_test.dart index 545788c9..63c632ca 100644 --- a/test/core/cubit/state_utils_test.dart +++ b/test/core/cubit/state_utils_test.dart @@ -73,3 +73,5 @@ void main() { + + diff --git a/test/core/data/selection_popup_model_test.dart b/test/core/data/selection_popup_model_test.dart index f34736db..72b9e03d 100644 --- a/test/core/data/selection_popup_model_test.dart +++ b/test/core/data/selection_popup_model_test.dart @@ -87,3 +87,5 @@ void main() { + + diff --git a/test/core/enums/prefs_keys_test.dart b/test/core/enums/prefs_keys_test.dart index a58bdac4..d9394d38 100644 --- a/test/core/enums/prefs_keys_test.dart +++ b/test/core/enums/prefs_keys_test.dart @@ -36,3 +36,5 @@ void main() { + + diff --git a/test/core/internet_connection_cubit/internet_connection_state_test.dart b/test/core/internet_connection_cubit/internet_connection_state_test.dart index f1814986..68dac160 100644 --- a/test/core/internet_connection_cubit/internet_connection_state_test.dart +++ b/test/core/internet_connection_cubit/internet_connection_state_test.dart @@ -62,3 +62,5 @@ void main() { + + diff --git a/test/core/prefs_keys_test.dart b/test/core/prefs_keys_test.dart index 1b731127..e1962106 100644 --- a/test/core/prefs_keys_test.dart +++ b/test/core/prefs_keys_test.dart @@ -32,3 +32,5 @@ void main() { + + diff --git a/test/core/routing/main_navigation_routes_test.dart b/test/core/routing/main_navigation_routes_test.dart index 78b85526..fd115acb 100644 --- a/test/core/routing/main_navigation_routes_test.dart +++ b/test/core/routing/main_navigation_routes_test.dart @@ -29,3 +29,5 @@ void main() { + + diff --git a/test/core/routing/other_routes_test.dart b/test/core/routing/other_routes_test.dart index c71e3bb8..19b4747a 100644 --- a/test/core/routing/other_routes_test.dart +++ b/test/core/routing/other_routes_test.dart @@ -33,3 +33,5 @@ void main() { + + diff --git a/test/core/routing/route_constants_test.dart b/test/core/routing/route_constants_test.dart index 59101949..66b3306b 100644 --- a/test/core/routing/route_constants_test.dart +++ b/test/core/routing/route_constants_test.dart @@ -112,3 +112,5 @@ void main() { + + diff --git a/test/core/routing/settings_routes_test.dart b/test/core/routing/settings_routes_test.dart index bb89e314..70e0af0e 100644 --- a/test/core/routing/settings_routes_test.dart +++ b/test/core/routing/settings_routes_test.dart @@ -36,3 +36,5 @@ void main() { + + diff --git a/test/core/views/cubit/views_state_test.dart b/test/core/views/cubit/views_state_test.dart index 90b9786e..7214e4fd 100644 --- a/test/core/views/cubit/views_state_test.dart +++ b/test/core/views/cubit/views_state_test.dart @@ -30,3 +30,5 @@ void main() { + + diff --git a/test/core/widgets/add_item_button_test.dart b/test/core/widgets/add_item_button_test.dart index 6f635e79..f5235cb7 100644 --- a/test/core/widgets/add_item_button_test.dart +++ b/test/core/widgets/add_item_button_test.dart @@ -66,3 +66,5 @@ void main() { + + diff --git a/test/core/widgets/animated_option_button_test.dart b/test/core/widgets/animated_option_button_test.dart index 3fd3e337..62809f4d 100644 --- a/test/core/widgets/animated_option_button_test.dart +++ b/test/core/widgets/animated_option_button_test.dart @@ -118,3 +118,5 @@ void main() { + + diff --git a/test/core/widgets/base_button_test.dart b/test/core/widgets/base_button_test.dart index 21a98920..b0d3a80a 100644 --- a/test/core/widgets/base_button_test.dart +++ b/test/core/widgets/base_button_test.dart @@ -55,3 +55,5 @@ void main() { + + diff --git a/test/core/widgets/bottom_sheet_with_blur_test.dart b/test/core/widgets/bottom_sheet_with_blur_test.dart index 55c5ae8a..bcd64961 100644 --- a/test/core/widgets/bottom_sheet_with_blur_test.dart +++ b/test/core/widgets/bottom_sheet_with_blur_test.dart @@ -137,3 +137,5 @@ void main() { + + diff --git a/test/core/widgets/cpfc_container_test.dart b/test/core/widgets/cpfc_container_test.dart index fdbf3c1a..cf80ae48 100644 --- a/test/core/widgets/cpfc_container_test.dart +++ b/test/core/widgets/cpfc_container_test.dart @@ -98,3 +98,5 @@ void main() { + + diff --git a/test/core/widgets/custom_search_bar_test.dart b/test/core/widgets/custom_search_bar_test.dart index 446de0dd..3e7ea5a7 100644 --- a/test/core/widgets/custom_search_bar_test.dart +++ b/test/core/widgets/custom_search_bar_test.dart @@ -166,3 +166,5 @@ void main() { + + diff --git a/test/core/widgets/item_widget_test.dart b/test/core/widgets/item_widget_test.dart index 6f75b11d..e827b8f6 100644 --- a/test/core/widgets/item_widget_test.dart +++ b/test/core/widgets/item_widget_test.dart @@ -59,3 +59,5 @@ void main() { + + diff --git a/test/core/widgets/loader_test.dart b/test/core/widgets/loader_test.dart index daefbf8b..5d5bf3a6 100644 --- a/test/core/widgets/loader_test.dart +++ b/test/core/widgets/loader_test.dart @@ -44,3 +44,5 @@ void main() { + + diff --git a/test/core/widgets/main_background_bouble_test.dart b/test/core/widgets/main_background_bouble_test.dart index c6baecf0..60df496e 100644 --- a/test/core/widgets/main_background_bouble_test.dart +++ b/test/core/widgets/main_background_bouble_test.dart @@ -98,3 +98,5 @@ void main() { + + diff --git a/test/core/widgets/marketing_bottom_sheet_test.dart b/test/core/widgets/marketing_bottom_sheet_test.dart index f5962e3b..3f79c376 100644 --- a/test/core/widgets/marketing_bottom_sheet_test.dart +++ b/test/core/widgets/marketing_bottom_sheet_test.dart @@ -78,3 +78,5 @@ void main() { + + diff --git a/test/core/widgets/option_widget_test.dart b/test/core/widgets/option_widget_test.dart index aec5263d..fdaf84db 100644 --- a/test/core/widgets/option_widget_test.dart +++ b/test/core/widgets/option_widget_test.dart @@ -67,3 +67,5 @@ void main() { + + diff --git a/test/features/create_diet/basic_widget_test.dart b/test/features/create_diet/basic_widget_test.dart index 27dd8faf..6812d414 100644 --- a/test/features/create_diet/basic_widget_test.dart +++ b/test/features/create_diet/basic_widget_test.dart @@ -9,6 +9,7 @@ import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../fixtures/doubles/create_diet_doubles.dart'; +import '../../fixtures/doubles/profile_doubles.dart'; void main() { group('Diet Creation Basic Widget Tests', () { diff --git a/test/features/create_diet/presentation/widgets/error_widget_test.dart b/test/features/create_diet/presentation/widgets/error_widget_test.dart index 638d62e9..36d0a184 100644 --- a/test/features/create_diet/presentation/widgets/error_widget_test.dart +++ b/test/features/create_diet/presentation/widgets/error_widget_test.dart @@ -73,3 +73,5 @@ void main() { + + diff --git a/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart b/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart index cc2d101f..15ef7bd4 100644 --- a/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart +++ b/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart @@ -82,3 +82,5 @@ void main() { + + diff --git a/test/features/diary/presentation/widgets/comment_container_test.dart b/test/features/diary/presentation/widgets/comment_container_test.dart index d1a50b33..dd6296da 100644 --- a/test/features/diary/presentation/widgets/comment_container_test.dart +++ b/test/features/diary/presentation/widgets/comment_container_test.dart @@ -60,3 +60,5 @@ void main() { + + diff --git a/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart b/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart index b82b8283..52a1d8ba 100644 --- a/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart +++ b/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart @@ -55,3 +55,5 @@ void main() { + + diff --git a/test/features/diary/presentation/widgets/meal_summary_widget_test.dart b/test/features/diary/presentation/widgets/meal_summary_widget_test.dart index 05d6cf69..2625403e 100644 --- a/test/features/diary/presentation/widgets/meal_summary_widget_test.dart +++ b/test/features/diary/presentation/widgets/meal_summary_widget_test.dart @@ -92,3 +92,5 @@ void main() { + + diff --git a/test/features/diary/presentation/widgets/product_loader_widget_test.dart b/test/features/diary/presentation/widgets/product_loader_widget_test.dart index 593e73dd..0dc02252 100644 --- a/test/features/diary/presentation/widgets/product_loader_widget_test.dart +++ b/test/features/diary/presentation/widgets/product_loader_widget_test.dart @@ -44,3 +44,5 @@ void main() { + + diff --git a/test/features/diets/presentation/widgets/info_bouble_test.dart b/test/features/diets/presentation/widgets/info_bouble_test.dart index b851b03d..1c5889ef 100644 --- a/test/features/diets/presentation/widgets/info_bouble_test.dart +++ b/test/features/diets/presentation/widgets/info_bouble_test.dart @@ -110,3 +110,5 @@ void main() { + + diff --git a/test/features/feed/presentation/widgets/choice_chip_widget_test.dart b/test/features/feed/presentation/widgets/choice_chip_widget_test.dart index 76290597..0c54328f 100644 --- a/test/features/feed/presentation/widgets/choice_chip_widget_test.dart +++ b/test/features/feed/presentation/widgets/choice_chip_widget_test.dart @@ -140,3 +140,5 @@ void main() { + + diff --git a/test/features/feed/presentation/widgets/filter_badge_test.dart b/test/features/feed/presentation/widgets/filter_badge_test.dart index 1ec1491a..e0023ab4 100644 --- a/test/features/feed/presentation/widgets/filter_badge_test.dart +++ b/test/features/feed/presentation/widgets/filter_badge_test.dart @@ -52,3 +52,5 @@ void main() { + + diff --git a/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart b/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart index 4eea2fdc..ca12ebef 100644 --- a/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart +++ b/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart @@ -60,3 +60,5 @@ void main() { + + diff --git a/test/features/glossary/repositories/glossary_repository_test.dart b/test/features/glossary/repositories/glossary_repository_test.dart index 122c538e..5cb09ffb 100644 --- a/test/features/glossary/repositories/glossary_repository_test.dart +++ b/test/features/glossary/repositories/glossary_repository_test.dart @@ -53,3 +53,5 @@ void main() { + + diff --git a/test/features/notifications/presentation/widgets/notification_widget_test.dart b/test/features/notifications/presentation/widgets/notification_widget_test.dart index b77698fb..11b00faa 100644 --- a/test/features/notifications/presentation/widgets/notification_widget_test.dart +++ b/test/features/notifications/presentation/widgets/notification_widget_test.dart @@ -1030,3 +1030,5 @@ void main() { + + diff --git a/test/features/notifications/service/notifications_service_test.dart b/test/features/notifications/service/notifications_service_test.dart index 015944d4..a05cf8f0 100644 --- a/test/features/notifications/service/notifications_service_test.dart +++ b/test/features/notifications/service/notifications_service_test.dart @@ -62,3 +62,5 @@ void main() { } + + diff --git a/test/fixtures/doubles/auth_doubles.dart b/test/fixtures/doubles/auth_doubles.dart index d8ba584f..ad61fedd 100644 --- a/test/fixtures/doubles/auth_doubles.dart +++ b/test/fixtures/doubles/auth_doubles.dart @@ -1,6 +1,10 @@ import 'package:eatvio_app/features/auth/models/credentials_model.dart'; import 'package:eatvio_app/features/auth/models/oauth_login_request.dart'; import 'package:eatvio_app/features/auth/models/oauth_model.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_response.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request.dart'; +import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart'; import 'package:eatvio_app/features/auth/models/token_model.dart'; import 'package:eatvio_app/features/auth/repositories/auth_repository.dart'; import 'package:eatvio_app/features/auth/services/auth_service.dart'; @@ -62,5 +66,15 @@ class _NoopAuthService implements AuthService { Future> signUpViaSocialMedia({required OAuthModel body}) { throw UnimplementedError('Not implemented in fixture.'); } + + @override + Future requestOAuthVerification({required OAuthVerificationRequest body}) { + throw UnimplementedError('Not implemented in fixture.'); + } + + @override + Future confirmOAuthVerification({required OAuthVerificationConfirmRequest body}) { + throw UnimplementedError('Not implemented in fixture.'); + } } diff --git a/test/fixtures/doubles/create_diet_doubles.dart b/test/fixtures/doubles/create_diet_doubles.dart index f4ed17bc..7cf7b3b9 100644 --- a/test/fixtures/doubles/create_diet_doubles.dart +++ b/test/fixtures/doubles/create_diet_doubles.dart @@ -7,9 +7,6 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'; import 'package:eatvio_app/features/glossary/models/glossary_model.dart'; import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart'; import 'package:eatvio_app/features/glossary/services/glossary_service.dart'; -import 'package:eatvio_app/features/profile/models/profile_model.dart'; -import 'package:eatvio_app/features/profile/repositories/profile_repository.dart'; -import 'package:eatvio_app/features/profile/services/profile_service.dart'; import 'package:retrofit/dio.dart' show HttpResponse; import '../../fixtures/fixture_reader.dart'; @@ -133,16 +130,6 @@ class FixtureCreateDietRepository extends CreateDietRepository { } } -class FixtureProfileRepository extends ProfileRepository { - FixtureProfileRepository() : super(profileService: _NoopProfileService()); - - @override - Future getMyProfile() async { - final profileFixture = FixtureReader.readAsMap('profile/my_profile_response.json'); - return ProfileModel.fromJson(profileFixture); - } -} - class FixtureGlossaryRepository extends GlossaryRepository { FixtureGlossaryRepository() : super(glossaryService: _NoopGlossaryService()); @@ -190,11 +177,6 @@ class _NoopCreateDietService implements CreateDietService { } } -class _NoopProfileService implements ProfileService { - @override - noSuchMethod(Invocation invocation) => throw UnimplementedError('ProfileService call ${invocation.memberName}'); -} - class _NoopGlossaryService implements GlossaryService { @override noSuchMethod(Invocation invocation) => throw UnimplementedError('GlossaryService call ${invocation.memberName}');