Fix iOS redirection when scheme is https (#117)

* fix: fix ios redirects

* feat: enable ASWebAuthenticationSession.Callback.https support

* Revert some style changes

* Also allow universal links on macOS

* fix: apply some fixes

---------

Co-authored-by: Nico Mexis <nico.mexis@kabelmail.de>

Author: GabrielDamasceno

flutter_web_auth_2/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,14 +7,12 @@ import Foundation
 
 import desktop_webview_window
 import flutter_web_auth_2
-import path_provider_foundation
 import url_launcher_macos
 import window_to_front
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin"))
   FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin"))
 }

flutter_web_auth_2/ios/Classes/SwiftFlutterWebAuth2Plugin.swift

@@ -64,7 +64,21 @@ public class SwiftFlutterWebAuth2Plugin: NSObject, FlutterPlugin {
             if #available(iOS 12, *) {
                 var _session: ASWebAuthenticationSession? = nil
                 if #available(iOS 17.4, *) {
-                    _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.customScheme(callbackURLScheme), completionHandler: completionHandler!)
+                    if (callbackURLScheme == "https") {
+                        guard let host = options["httpsHost"] as? String else {
+                            result(FlutterError.invalidHttpsHostError)
+                            return 
+                        }
+
+                        guard let path = options["httpsPath"] as? String else {
+                            result(FlutterError.invalidHttpsPathError)
+                            return 
+                        }
+
+                        _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.https(host: host, path: path), completionHandler: completionHandler!)
+                    } else {
+                        _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.customScheme(callbackURLScheme), completionHandler: completionHandler!)
+                    }
                 } else {
                     _session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURLScheme, completionHandler: completionHandler!)
                 }
@@ -151,4 +165,12 @@ fileprivate extension FlutterError {
     static var acquireRootViewControllerFailed: FlutterError {
         return FlutterError(code: "ACQUIRE_ROOT_VIEW_CONTROLLER_FAILED", message: "Failed to acquire root view controller", details: nil)
     }
+
+    static var invalidHttpsHostError: FlutterError {
+        return FlutterError(code: "INVALID_HTTPS_HOST_ERROR", message: "Failed to retrieve host for https scheme", details: nil)
+    }
+
+    static var invalidHttpsPathError: FlutterError {
+        return FlutterError(code: "INVALID_HTTPS_PATH_ERROR", message: "Failed to retrieve path for https scheme", details: nil)
+    }
 }

flutter_web_auth_2/lib/flutter_web_auth_2.dart

@@ -55,6 +55,10 @@ class FlutterWebAuth2 {
   ///
   /// [callbackUrlScheme] should be a string specifying the scheme of the URL
   /// that the page will redirect to upon successful authentication.
+  /// If it is `https`, you also need to specify
+  /// [FlutterWebAuth2Options.httpsHost] and [FlutterWebAuth2Options.httpsPath]
+  /// on Apple devices running iOS >= 17.4 or macOS >= 14.4. This allows for
+  /// easy integration of Universal links.
   ///
   /// [options] can be used to specify either both general and
   /// platform-specific settings.

flutter_web_auth_2/lib/src/options.dart

@@ -56,6 +56,8 @@ class FlutterWebAuth2Options {
     String? landingPageHtml,
     bool? silentAuth,
     bool? useWebview,
+    this.httpsHost,
+    this.httpsPath,
     this.customTabsPackageOrder,
   })  : preferEphemeral = preferEphemeral ?? false,
         intentFlags = intentFlags ?? defaultIntentFlags,
@@ -75,6 +77,8 @@ class FlutterWebAuth2Options {
           landingPageHtml: json['landingPageHtml'],
           silentAuth: json['silentAuth'],
           useWebview: json['useWebview'],
+          httpsHost: json['httpsHost'],
+          httpsPath: json['httpsPath'],
           customTabsPackageOrder: json['customTabsPackageOrder'],
         );
 
@@ -137,6 +141,20 @@ class FlutterWebAuth2Options {
   /// described in https://github.com/ThexXTURBOXx/flutter_web_auth_2/issues/25
   final bool useWebview;
 
+  /// **Only has an effect on iOS and MacOS!**
+  /// String specifying the **host** of the URL that the page will redirect to
+  /// upon successful authentication (callback URL).
+  /// When `callbackUrlScheme` is `https`, this **must** be specified on
+  /// Apple devices running iOS >= 17.4 or macOS >= 14.4.
+  final String? httpsHost;
+
+  /// **Only has an effect on iOS and MacOS!**
+  /// String specifying the **path** of the URL that the page will redirect to
+  /// upon successful authentication (callback URL).
+  /// When `callbackUrlScheme` is `https`, this **must** be specified on
+  /// Apple devices running iOS >= 17.4 or macOS >= 14.4.
+  final String? httpsPath;
+
   /// **Only has an effect on Android!**
   /// Sets the Android browser priority for opening custom tabs.
   /// Needs to be a list of packages providing a custom tabs
@@ -155,5 +173,7 @@ class FlutterWebAuth2Options {
         'silentAuth': silentAuth,
         'useWebview': useWebview,
         'customTabsPackageOrder': customTabsPackageOrder,
+        'httpsHost': httpsHost,
+        'httpsPath': httpsPath,
       };
 }

flutter_web_auth_2/macos/Classes/FlutterWebAuth2Plugin.swift

@@ -42,7 +42,21 @@ public class FlutterWebAuth2Plugin: NSObject, FlutterPlugin, ASWebAuthentication
 
             var _session: ASWebAuthenticationSession? = nil
             if #available(macOS 14.4, *) {
-                _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.customScheme(callbackURLScheme), completionHandler: completionHandler)
+                if (callbackURLScheme == "https") {
+                    guard let host = options["httpsHost"] as? String else {
+                        result(FlutterError.invalidHttpsHostError)
+                        return
+                    }
+
+                    guard let path = options["httpsPath"] as? String else {
+                        result(FlutterError.invalidHttpsPathError)
+                        return 
+                    }
+
+                    _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.https(host: host, path: path), completionHandler: completionHandler)
+                } else {
+                    _session = ASWebAuthenticationSession(url: url, callback: ASWebAuthenticationSession.Callback.customScheme(callbackURLScheme), completionHandler: completionHandler)
+                }
             } else {
                 _session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURLScheme, completionHandler: completionHandler)
             }
@@ -68,3 +82,13 @@ public class FlutterWebAuth2Plugin: NSObject, FlutterPlugin, ASWebAuthentication
         return NSApplication.shared.windows.first { $0.isKeyWindow } ?? ASPresentationAnchor()
     }
 }
+
+fileprivate extension FlutterError {
+    static var invalidHttpsHostError: FlutterError {
+        return FlutterError(code: "INVALID_HTTPS_HOST_ERROR", message: "Failed to retrieve host for https scheme", details: nil)
+    }
+
+    static var invalidHttpsPathError: FlutterError {
+        return FlutterError(code: "INVALID_HTTPS_PATH_ERROR", message: "Failed to retrieve path for https scheme", details: nil)
+    }
+}