Merge pull request 'implement OAuth verification request and confirmation flow with error handling and UI updates' (#812) from main into test-flight

Reviewed-on: eatvio/eatvio_app#812
2025-12-17 12:53:07 +00:00
parent d4ed2eda74 5dfdbe4543
commit 91e3cf210f
39 changed files with 65 additions and 2 deletions
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -48,8 +48,33 @@ platform :ios do
    UI.message "Configuring Flutter for release mode..."
    sh("cd .. && flutter build ios --config-only --release")
    
+    # Read build number from Flutter Generated.xcconfig
+    generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
+    flutter_build_number = nil
+    
+    if File.exist?(generated_xcconfig_path)
+      File.foreach(generated_xcconfig_path) do |line|
+        matches = line.match(/FLUTTER_BUILD_NUMBER=(.*)/)
+        if matches
+          flutter_build_number = matches[1].strip
+          break
+        end
+      end
+    end
+    
+    if flutter_build_number.nil?
+      UI.user_error!("Could not find FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
+    end
+    
+    UI.message "Flutter build number: #{flutter_build_number}"
+    
    match(type: "appstore", readonly: true)
-    increment_build_number(xcodeproj: "Runner.xcodeproj")
+    
+    # Set build number explicitly instead of incrementing
+    increment_build_number(
+      xcodeproj: "Runner.xcodeproj",
+      build_number: flutter_build_number
+    )
    
    build_app(
      workspace: "Runner.xcworkspace", 
@@ -74,7 +99,7 @@ platform :ios do
        skip_submission: true,
        distribute_external: false,
        notify_external_testers: false,
-        changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
+        changelog: "TestFlight build #{flutter_build_number}",
        verbose: true
      )
    rescue => ex
--- a/lib/features/auth/models/oauth_verification_confirm_response.dart
+++ b/lib/features/auth/models/oauth_verification_confirm_response.dart
@@ -16,3 +16,4 @@ abstract class OAuthVerificationConfirmResponse with _$OAuthVerificationConfirmR
  factory OAuthVerificationConfirmResponse.fromJson(Map<String, dynamic> json) => _$OAuthVerificationConfirmResponseFromJson(json);
 }

+
--- a/lib/features/auth/models/oauth_verification_request.dart
+++ b/lib/features/auth/models/oauth_verification_request.dart
@@ -10,3 +10,4 @@ abstract class OAuthVerificationRequest with _$OAuthVerificationRequest {
  factory OAuthVerificationRequest.fromJson(Map<String, dynamic> json) => _$OAuthVerificationRequestFromJson(json);
 }

+
--- a/lib/features/auth/models/oauth_verification_request_response.dart
+++ b/lib/features/auth/models/oauth_verification_request_response.dart
@@ -10,3 +10,4 @@ abstract class OAuthVerificationRequestResponse with _$OAuthVerificationRequestR
  factory OAuthVerificationRequestResponse.fromJson(Map<String, dynamic> json) => _$OAuthVerificationRequestResponseFromJson(json);
 }

+
--- a/test/core/constants/app_constants_test.dart
+++ b/test/core/constants/app_constants_test.dart
@@ -140,3 +140,4 @@ void main() {



+
--- a/test/core/cubit/state_utils_test.dart
+++ b/test/core/cubit/state_utils_test.dart
@@ -75,3 +75,4 @@ void main() {



+
--- a/test/core/data/selection_popup_model_test.dart
+++ b/test/core/data/selection_popup_model_test.dart
@@ -89,3 +89,4 @@ void main() {



+
--- a/test/core/enums/prefs_keys_test.dart
+++ b/test/core/enums/prefs_keys_test.dart
@@ -38,3 +38,4 @@ void main() {



+
--- a/test/core/internet_connection_cubit/internet_connection_state_test.dart
+++ b/test/core/internet_connection_cubit/internet_connection_state_test.dart
@@ -64,3 +64,4 @@ void main() {



+
--- a/test/core/prefs_keys_test.dart
+++ b/test/core/prefs_keys_test.dart
@@ -34,3 +34,4 @@ void main() {



+
--- a/test/core/routing/main_navigation_routes_test.dart
+++ b/test/core/routing/main_navigation_routes_test.dart
@@ -31,3 +31,4 @@ void main() {



+
--- a/test/core/routing/other_routes_test.dart
+++ b/test/core/routing/other_routes_test.dart
@@ -35,3 +35,4 @@ void main() {



+
--- a/test/core/routing/route_constants_test.dart
+++ b/test/core/routing/route_constants_test.dart
@@ -114,3 +114,4 @@ void main() {



+
--- a/test/core/routing/settings_routes_test.dart
+++ b/test/core/routing/settings_routes_test.dart
@@ -38,3 +38,4 @@ void main() {



+
--- a/test/core/views/cubit/views_state_test.dart
+++ b/test/core/views/cubit/views_state_test.dart
@@ -32,3 +32,4 @@ void main() {



+
--- a/test/core/widgets/add_item_button_test.dart
+++ b/test/core/widgets/add_item_button_test.dart
@@ -68,3 +68,4 @@ void main() {



+
--- a/test/core/widgets/animated_option_button_test.dart
+++ b/test/core/widgets/animated_option_button_test.dart
@@ -120,3 +120,4 @@ void main() {



+
--- a/test/core/widgets/base_button_test.dart
+++ b/test/core/widgets/base_button_test.dart
@@ -57,3 +57,4 @@ void main() {



+
--- a/test/core/widgets/bottom_sheet_with_blur_test.dart
+++ b/test/core/widgets/bottom_sheet_with_blur_test.dart
@@ -139,3 +139,4 @@ void main() {



+
--- a/test/core/widgets/cpfc_container_test.dart
+++ b/test/core/widgets/cpfc_container_test.dart
@@ -100,3 +100,4 @@ void main() {



+
--- a/test/core/widgets/custom_search_bar_test.dart
+++ b/test/core/widgets/custom_search_bar_test.dart
@@ -168,3 +168,4 @@ void main() {



+
--- a/test/core/widgets/item_widget_test.dart
+++ b/test/core/widgets/item_widget_test.dart
@@ -61,3 +61,4 @@ void main() {



+
--- a/test/core/widgets/loader_test.dart
+++ b/test/core/widgets/loader_test.dart
@@ -46,3 +46,4 @@ void main() {



+
--- a/test/core/widgets/main_background_bouble_test.dart
+++ b/test/core/widgets/main_background_bouble_test.dart
@@ -100,3 +100,4 @@ void main() {



+
--- a/test/core/widgets/marketing_bottom_sheet_test.dart
+++ b/test/core/widgets/marketing_bottom_sheet_test.dart
@@ -80,3 +80,4 @@ void main() {



+
--- a/test/core/widgets/option_widget_test.dart
+++ b/test/core/widgets/option_widget_test.dart
@@ -69,3 +69,4 @@ void main() {



+
--- a/test/features/create_diet/presentation/widgets/error_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/error_widget_test.dart
@@ -75,3 +75,4 @@ void main() {



+
--- a/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart
+++ b/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart
@@ -84,3 +84,4 @@ void main() {



+
--- a/test/features/diary/presentation/widgets/comment_container_test.dart
+++ b/test/features/diary/presentation/widgets/comment_container_test.dart
@@ -62,3 +62,4 @@ void main() {



+
--- a/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart
+++ b/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart
@@ -57,3 +57,4 @@ void main() {



+
--- a/test/features/diary/presentation/widgets/meal_summary_widget_test.dart
+++ b/test/features/diary/presentation/widgets/meal_summary_widget_test.dart
@@ -94,3 +94,4 @@ void main() {



+
--- a/test/features/diary/presentation/widgets/product_loader_widget_test.dart
+++ b/test/features/diary/presentation/widgets/product_loader_widget_test.dart
@@ -46,3 +46,4 @@ void main() {



+
--- a/test/features/diets/presentation/widgets/info_bouble_test.dart
+++ b/test/features/diets/presentation/widgets/info_bouble_test.dart
@@ -112,3 +112,4 @@ void main() {



+
--- a/test/features/feed/presentation/widgets/choice_chip_widget_test.dart
+++ b/test/features/feed/presentation/widgets/choice_chip_widget_test.dart
@@ -142,3 +142,4 @@ void main() {



+
--- a/test/features/feed/presentation/widgets/filter_badge_test.dart
+++ b/test/features/feed/presentation/widgets/filter_badge_test.dart
@@ -54,3 +54,4 @@ void main() {



+
--- 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
@@ -62,3 +62,4 @@ void main() {



+
--- a/test/features/glossary/repositories/glossary_repository_test.dart
+++ b/test/features/glossary/repositories/glossary_repository_test.dart
@@ -55,3 +55,4 @@ void main() {



+
--- a/test/features/notifications/presentation/widgets/notification_widget_test.dart
+++ b/test/features/notifications/presentation/widgets/notification_widget_test.dart
@@ -1032,3 +1032,4 @@ void main() {



+
--- a/test/features/notifications/service/notifications_service_test.dart
+++ b/test/features/notifications/service/notifications_service_test.dart
@@ -64,3 +64,4 @@ void main() {



+