fix(auth, windows): fix a crash that could happen when using `sendEma…

…ilVerification` or `sendPasswordResetEmail` (#12946) * fix(auth, windows): fix a crash that could happen when using sendEmailVerification or sendPasswordResetEmail * format
firebase · Jun 13, 2024 · a100829 · a100829
1 parent 747b0b6
commit a100829
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/packages/firebase_auth/firebase_auth/windows/messages.g.cpp b/packages/firebase_auth/firebase_auth/windows/messages.g.cpp
@@ -2856,10 +2856,16 @@ void FirebaseAuthHostApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& email_arg =
                   std::get<std::string>(encodable_email_arg);
               const auto& encodable_action_code_settings_arg = args.at(2);
-              const auto* action_code_settings_arg =
-                  &(std::any_cast<const PigeonActionCodeSettings&>(
-                      std::get<CustomEncodableValue>(
-                          encodable_action_code_settings_arg)));
+              // IF CODE REGENERATED, PLEASE REINSERT THIS. IF ARG IS NULL, APP
+              // CRASHES
+              const PigeonActionCodeSettings* action_code_settings_arg =
+                  nullptr;
+              if (!encodable_action_code_settings_arg.IsNull()) {
+                action_code_settings_arg =
+                    &(std::any_cast<const PigeonActionCodeSettings&>(
+                        std::get<CustomEncodableValue>(
+                            encodable_action_code_settings_arg)));
+              }
               api->SendPasswordResetEmail(
                   app_arg, email_arg, action_code_settings_arg,
                   [reply](std::optional<FlutterError>&& output) {
@@ -3744,10 +3750,16 @@ void FirebaseAuthUserHostApi::SetUp(flutter::BinaryMessenger* binary_messenger,
               const auto& app_arg = std::any_cast<const AuthPigeonFirebaseApp&>(
                   std::get<CustomEncodableValue>(encodable_app_arg));
               const auto& encodable_action_code_settings_arg = args.at(1);
-              const auto* action_code_settings_arg =
-                  &(std::any_cast<const PigeonActionCodeSettings&>(
-                      std::get<CustomEncodableValue>(
-                          encodable_action_code_settings_arg)));
+              // IF CODE REGENERATED, PLEASE REINSERT THIS. IF ARG IS NULL, APP
+              // CRASHES
+              const PigeonActionCodeSettings* action_code_settings_arg =
+                  nullptr;
+              if (!encodable_action_code_settings_arg.IsNull()) {
+                action_code_settings_arg =
+                    &(std::any_cast<const PigeonActionCodeSettings&>(
+                        std::get<CustomEncodableValue>(
+                            encodable_action_code_settings_arg)));
+              }
               api->SendEmailVerification(
                   app_arg, action_code_settings_arg,
                   [reply](std::optional<FlutterError>&& output) {

diff --git a/packages/firebase_core/firebase_core/example/windows/flutter/CMakeLists.txt b/packages/firebase_core/firebase_core/example/windows/flutter/CMakeLists.txt
@@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -92,7 +97,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS