feat(auth,macos): add support for publish and addApplicationDelegate on macOS FlutterPluginRegistrar (#17518)

SelaseKay · web-flow · commit 376bb6ea8878 · 2025-07-16T09:36:37.000Z
* feat(auth,macos): add support for `publish` and `addApplicationDelegat`e on macOS FlutterPluginRegistrar

* chore: refactor code

* chore: use TARGET_OS_IPHONE

* chore: fix formatting
diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift
@@ -134,7 +134,7 @@ func deepHashFirebaseAnalyticsMessages(value: Any?, hasher: inout Hasher) {
 /// Generated class from Pigeon that represents data sent in messages.
 struct AnalyticsEvent: Hashable {
   var name: String
-  var parameters: [String?: Any?]? = nil
+  var parameters: [String?: Any?]?
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
   static func fromList(_ pigeonVar_list: [Any?]) -> AnalyticsEvent? {
diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift
@@ -45,8 +45,8 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler {
     }
   }
 
-  public func onListen(withArguments _: Any?,
-                       eventSink events: @escaping FlutterEventSink) -> FlutterError? {
+  func onListen(withArguments _: Any?,
+                eventSink events: @escaping FlutterEventSink) -> FlutterError? {
     eventSink = events
 
     installationIDObserver = NotificationCenter.default.addObserver(
@@ -63,7 +63,7 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler {
     return nil
   }
 
-  public func onCancel(withArguments _: Any?) -> FlutterError? {
+  func onCancel(withArguments _: Any?) -> FlutterError? {
     if let observer = installationIDObserver {
       NotificationCenter.default.removeObserver(observer)
       installationIDObserver = nil
diff --git a/packages/firebase_auth/firebase_auth/example/macos/Runner/AppDelegate.swift b/packages/firebase_auth/firebase_auth/example/macos/Runner/AppDelegate.swift
@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/FLTFirebaseAuthPlugin.m b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/FLTFirebaseAuthPlugin.m
@@ -152,18 +152,12 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
 
   [registrar addMethodCallDelegate:instance channel:channel];
 
-#if TARGET_OS_OSX
-  // TODO(Salakar): Publish does not exist on MacOS version of
-  // FlutterPluginRegistrar.
-  // TODO(Salakar): addApplicationDelegate does not exist on MacOS version of
-  // FlutterPluginRegistrar. (https://github.com/flutter/flutter/issues/41471)
-  SetUpFirebaseAuthHostApi(registrar.messenger, instance);
-  SetUpFirebaseAuthUserHostApi(registrar.messenger, instance);
-#else
   [registrar publish:instance];
   [registrar addApplicationDelegate:instance];
   SetUpFirebaseAuthHostApi(registrar.messenger, instance);
   SetUpFirebaseAuthUserHostApi(registrar.messenger, instance);
+
+#if TARGET_OS_IPHONE
   SetUpMultiFactorUserHostApi(registrar.messenger, instance);
   SetUpMultiFactoResolverHostApi(registrar.messenger, instance);
   SetUpMultiFactorTotpHostApi(registrar.messenger, instance);

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public func onListen(withArguments _: Any?,`
`49`		`- eventSink events: @escaping FlutterEventSink) -> FlutterError? {`
	`48`	`+ func onListen(withArguments _: Any?,`
	`49`	`+ eventSink events: @escaping FlutterEventSink) -> FlutterError? {`
`50`	`50`	`eventSink = events`
`51`	`51`
`52`	`52`	`installationIDObserver = NotificationCenter.default.addObserver(`
`@@ -63,7 +63,7 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler {`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
`66`		`- public func onCancel(withArguments _: Any?) -> FlutterError? {`
	`66`	`+ func onCancel(withArguments _: Any?) -> FlutterError? {`
`67`	`67`	`if let observer = installationIDObserver {`
`68`	`68`	`NotificationCenter.default.removeObserver(observer)`
`69`	`69`	`installationIDObserver = nil`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {`
`6`	`6`	`override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {`
`7`	`7`	`return true`
`8`	`8`	`}`
	`9`	`+`
	`10`	`+ override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {`
	`11`	`+ return true`
	`12`	`+ }`
`9`	`13`	`}`