Use UIImplementation to open settings #376

tung2744 · web-flow · commit 3e25b24609de · 2025-09-01T15:00:38.000+08:00
ref DEV-2547
diff --git a/example/capacitor/src/pages/Home.tsx b/example/capacitor/src/pages/Home.tsx
@@ -509,12 +509,19 @@ function AuthgearDemo() {
   }, [authenticationFlowGroup, showError, colorScheme, showAuthTime]);
 
   const openSettings = useCallback(async () => {
+    setLoading(true);
     if (isPlatformWeb()) {
-      authgearWeb.open(WebPage.Settings);
+      await authgearWeb.open(WebPage.Settings);
     } else {
-      authgearCapacitor.open(CapacitorPage.Settings);
+      try {
+        await authgearCapacitor.open(CapacitorPage.Settings);
+      } catch (e) {
+        showError(e);
+      } finally {
+        setLoading(false);
+      }
     }
-  }, []);
+  }, [showError]);
 
   const changePassword = useCallback(async () => {
     if (isPlatformWeb()) {
diff --git a/packages/authgear-capacitor/android/src/main/AndroidManifest.xml b/packages/authgear-capacitor/android/src/main/AndroidManifest.xml
@@ -11,11 +11,6 @@
         <activity android:name=".OAuthCoordinatorActivity"
             android:exported="false"
             android:launchMode="singleTask" />
-        <activity android:name=".WebViewActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:theme="@style/AuthgearTheme"
-            android:configChanges="orientation|screenSize"/>
         <activity android:name=".WebKitWebViewActivity"
             android:exported="false"
             android:launchMode="singleTask"
diff --git a/packages/authgear-capacitor/android/src/main/java/com/authgear/capacitor/AuthgearPlugin.java b/packages/authgear-capacitor/android/src/main/java/com/authgear/capacitor/AuthgearPlugin.java
@@ -186,27 +186,6 @@ private void handleOpenAuthorizeURLWithWebView(PluginCall call, ActivityResult a
         }
     }
 
-    @PluginMethod
-    public void openURL(PluginCall call) {
-        String urlString = call.getString("url");
-        Uri uri = Uri.parse(urlString).normalizeScheme();
-
-        Context ctx = this.getContext();
-        Intent intent = WebViewActivity.createIntent(ctx, uri.toString());
-        this.startActivityForResult(call, intent, "handleOpenURL");
-    }
-
-    @ActivityCallback
-    private void handleOpenURL(PluginCall call, ActivityResult activityResult) {
-        int resultCode = activityResult.getResultCode();
-        if (resultCode == Activity.RESULT_CANCELED) {
-            call.resolve();
-        }
-        if (resultCode == Activity.RESULT_OK) {
-            call.resolve();
-        }
-    }
-
     @PluginMethod
     public void checkBiometricSupported(PluginCall call) {
         JSObject android = call.getObject("android");
diff --git a/packages/authgear-capacitor/android/src/main/java/com/authgear/capacitor/WebViewActivity.java b/packages/authgear-capacitor/android/src/main/java/com/authgear/capacitor/WebViewActivity.java
diff --git a/packages/authgear-capacitor/ios/Plugin/AuthgearPlugin.m b/packages/authgear-capacitor/ios/Plugin/AuthgearPlugin.m
@@ -13,7 +13,6 @@
            CAP_PLUGIN_METHOD(generateUUID, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(openAuthorizeURL, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(openAuthorizeURLWithWebView, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(openURL, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(checkBiometricSupported, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(createBiometricPrivateKey, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(signWithBiometricPrivateKey, CAPPluginReturnPromise);
diff --git a/packages/authgear-capacitor/ios/Plugin/AuthgearPlugin.swift b/packages/authgear-capacitor/ios/Plugin/AuthgearPlugin.swift
@@ -133,20 +133,6 @@ public class AuthgearPlugin: CAPPlugin {
         }
     }
 
-    @objc func openURL(_ call: CAPPluginCall) {
-        let url = URL(string: call.getString("url")!)!
-
-        DispatchQueue.main.async {
-            self.impl.openURL(window: (self.bridge?.webView?.window)!, url: url) { (error) in
-                if let error = error {
-                    error.reject(call)
-                } else {
-                    call.resolve()
-                }
-            }
-        }
-    }
-
     @objc func checkBiometricSupported(_ call: CAPPluginCall) {
         let ios = call.getObject("ios")!
         let policyString = ios["policy"] as! String
diff --git a/packages/authgear-capacitor/ios/Plugin/AuthgearPluginImpl.swift b/packages/authgear-capacitor/ios/Plugin/AuthgearPluginImpl.swift
@@ -250,38 +250,6 @@ import Capacitor
         controller?.start()
     }
 
-    @objc func openURL(window: UIWindow, url: URL, completion: @escaping (Error?) -> Void) {
-        if #available(iOS 12.0, *) {
-            let scheme = "nocallback"
-            var asWebSession: ASWebAuthenticationSession?
-            asWebSession = ASWebAuthenticationSession(
-                url: url,
-                callbackURLScheme: scheme
-            ) { redirectURI, error in
-                self.asWebAuthenticationSessionHandles.removeValue(forKey: asWebSession!)
-                if let error = error {
-                    let nsError = error as NSError
-                    let isCancel = nsError.domain == ASWebAuthenticationSessionErrorDomain && nsError.code == ASWebAuthenticationSessionError.Code.canceledLogin.rawValue
-                    if isCancel {
-                        completion(nil)
-                    } else {
-                        completion(NSError.makeUnrecoverableAuthgearError(message: "openURL failed", error: error))
-                    }
-                } else {
-                    completion(nil)
-                }
-            }
-            self.asWebAuthenticationSessionHandles[asWebSession!] = window
-            if #available(iOS 13.0, *) {
-                asWebSession!.presentationContextProvider = self
-                asWebSession!.prefersEphemeralWebBrowserSession = true
-            }
-            asWebSession!.start()
-        } else {
-            completion(NSError.makeUnrecoverableAuthgearError(message: "SDK supports only iOS 12.0 or newer", error: nil))
-        }
-    }
-
     @objc func checkBiometricSupported(policyString: String) throws {
         if #available(iOS 11.3, *) {
             let policy = LAPolicy.from(string: policyString)!
diff --git a/packages/authgear-capacitor/src/index.ts b/packages/authgear-capacitor/src/index.ts
@@ -5,6 +5,7 @@ import {
   type TokenStorage,
   type UserInfo,
   AuthgearError,
+  CancelError,
   OAuthError,
   SessionState,
   SessionStateChangeReason,
@@ -30,7 +31,6 @@ import { generateCodeVerifier, computeCodeChallenge } from "./pkce";
 import {
   generateUUID,
   getDeviceInfo,
-  openURL,
   createBiometricPrivateKey,
   checkBiometricSupported,
   removeBiometricPrivateKey,
@@ -588,7 +588,19 @@ export class CapacitorContainer {
       platform,
     });
 
-    await openURL({ url: targetURL });
+    try {
+      await this.uiImplementation.openAuthorizationURL({
+        url: targetURL,
+        redirectURI: "nocallback://nocallback",
+        shareCookiesWithDeviceBrowser: false,
+      });
+    } catch (e: unknown) {
+      if (e instanceof CancelError) {
+        // Ignore CancelError.
+        return;
+      }
+      throw e;
+    }
   }
 
   /**
diff --git a/packages/authgear-capacitor/src/plugin.ts b/packages/authgear-capacitor/src/plugin.ts
@@ -25,7 +25,6 @@ export interface AuthgearPlugin {
     actionBarButtonTintColor?: string;
     iosIsInspectable?: boolean;
   }): Promise<{ redirectURI: string }>;
-  openURL(options: { url: string }): Promise<void>;
   checkBiometricSupported(options: BiometricOptions): Promise<void>;
   createBiometricPrivateKey(
     options: BiometricPrivateKeyOptions
@@ -141,14 +140,6 @@ export async function openAuthorizeURLWithWebView(options: {
   }
 }
 
-export async function openURL(options: { url: string }): Promise<void> {
-  try {
-    await Authgear.openURL(options);
-  } catch (e: unknown) {
-    throw _wrapError(e);
-  }
-}
-
 export async function checkBiometricSupported(
   options: BiometricOptions
 ): Promise<void> {
diff --git a/packages/authgear-react-native/android/src/main/AndroidManifest.xml b/packages/authgear-react-native/android/src/main/AndroidManifest.xml
@@ -11,11 +11,6 @@
         <activity android:name=".OAuthCoordinatorActivity"
             android:exported="false"
             android:launchMode="singleTask" />
-        <activity android:name=".WebViewActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:theme="@style/AuthgearTheme"
-            android:configChanges="orientation|screenSize"/>
         <activity android:name=".WebKitWebViewActivity"
             android:exported="false"
             android:launchMode="singleTask"
diff --git a/packages/authgear-react-native/android/src/main/java/com/authgear/reactnative/AuthgearReactNativeModule.java b/packages/authgear-react-native/android/src/main/java/com/authgear/reactnative/AuthgearReactNativeModule.java
@@ -80,7 +80,6 @@ private static class Handle {
     private static final Charset UTF8 = Charset.forName("UTF-8");
 
     private static final int ACTIVITY_PROMISE_TAG_CODE_AUTHORIZATION = 1;
-    private static final int ACTIVITY_PROMISE_TAG_OPEN_URL = 2;
     private final StartActivityHandles<Handle> mHandles;
 
     private final ReactApplicationContext reactContext;
@@ -756,28 +755,6 @@ public void sha256String(String input, Promise promise) {
         }
     }
 
-    @ReactMethod
-    public void openURL(String urlString, Promise promise) {
-        final Handle handle = new Handle(promise);
-        final int requestCode = this.mHandles.push(new StartActivityHandle<>(ACTIVITY_PROMISE_TAG_OPEN_URL, handle));
-        try {
-            Activity currentActivity = getCurrentActivity();
-            if (currentActivity == null) {
-                promise.reject(new Exception("No Activity"));
-                return;
-            }
-
-            Context context = currentActivity;
-            Intent intent = WebViewActivity.createIntent(context, urlString);
-            currentActivity.startActivityForResult(intent, requestCode);
-        } catch (Exception e) {
-            StartActivityHandle<Handle> startActivityHandle = this.mHandles.pop(requestCode);
-            if (startActivityHandle != null) {
-                startActivityHandle.value.mPromise.reject(e);
-            }
-        }
-    }
-
     @ReactMethod
     public void openAuthorizeURLWithWebView(ReadableMap options, Promise promise) {
         final Handle handle = new Handle(promise);
@@ -1027,14 +1004,6 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
                         promise.resolve(data.getData().toString());
                     }
                     break;
-                case ACTIVITY_PROMISE_TAG_OPEN_URL:
-                    if (resultCode == Activity.RESULT_CANCELED) {
-                        promise.resolve(null);
-                    }
-                    if (resultCode == Activity.RESULT_OK) {
-                        promise.resolve(null);
-                    }
-                    break;
             }
         }
     }
diff --git a/packages/authgear-react-native/android/src/main/java/com/authgear/reactnative/WebViewActivity.java b/packages/authgear-react-native/android/src/main/java/com/authgear/reactnative/WebViewActivity.java
diff --git a/packages/authgear-react-native/ios/AGAuthgearReactNative.m b/packages/authgear-react-native/ios/AGAuthgearReactNative.m
diff --git a/packages/authgear-react-native/src/index.ts b/packages/authgear-react-native/src/index.ts
diff --git a/packages/authgear-react-native/src/nativemodule.ts b/packages/authgear-react-native/src/nativemodule.ts
