fix(ui): pass auth down to LoginView (#7645)

firebase · Dec 17, 2021 · e892670 · e892670
1 parent 3a7889a
commit e892670
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/packages/flutterfire_ui/example/lib/io_init.dart b/packages/flutterfire_ui/example/lib/io_init.dart
@@ -3,7 +3,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'firebase_options.dart';
 
 Future<void> initializeFirebase() {
-  if (Platform.isIOS) {
+  if (Platform.isIOS || Platform.isMacOS) {
     return Firebase.initializeApp();
   } else {
     return Firebase.initializeApp(options: firebaseOptions);

diff --git a/packages/flutterfire_ui/example/macos/Runner.xcodeproj/project.pbxproj b/packages/flutterfire_ui/example/macos/Runner.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 /* Begin PBXBuildFile section */
 		2674AEA5ED29158EEDEDFCD3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB0C88E6F0927DC3B5F48BDC /* Pods_Runner.framework */; };
 		2F61F08126EBA08300C15711 /* GoogleSignInMacOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F61F08026EBA08300C15711 /* GoogleSignInMacOS.swift */; };
+		2F6439FA276CCE3900F6B03D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2F6439F9276CCE3900F6B03D /* GoogleService-Info.plist */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
@@ -57,6 +58,7 @@
 		037A2C29BF0A48E4F7A15C1F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1AF28F01426F339B8D1D36C3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		2F61F08026EBA08300C15711 /* GoogleSignInMacOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleSignInMacOS.swift; sourceTree = "<group>"; };
+		2F6439F9276CCE3900F6B03D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* flutterfire_ui_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutterfire_ui_example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -144,6 +146,7 @@
 		33FAB671232836740065AC1E /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				2F6439F9276CCE3900F6B03D /* GoogleService-Info.plist */,
 				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
 				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
 				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
@@ -249,6 +252,7 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+				2F6439FA276CCE3900F6B03D /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/packages/flutterfire_ui/lib/src/auth/screens/internal/login_screen.dart b/packages/flutterfire_ui/lib/src/auth/screens/internal/login_screen.dart
@@ -47,6 +47,7 @@ class LoginScreen extends StatelessWidget {
         child: LoginView(
           key: loginViewKey,
           action: action,
+          auth: auth,
           providerConfigs: providerConfigs,
           oauthButtonVariant: oauthButtonVariant,
           email: email,

diff --git a/packages/flutterfire_ui/lib/src/auth/widgets/email_form.dart b/packages/flutterfire_ui/lib/src/auth/widgets/email_form.dart
@@ -40,6 +40,7 @@ class EmailForm extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AuthFlowBuilder<EmailFlowController>(
+      auth: auth,
       action: action,
       config: config,
       child: _SignInFormContent(