expo-web-browser 12.2.0 → 12.3.1

package/CHANGELOG.md

@@ -10,6 +10,23 @@
 
 ### 💡 Others
 
+## 12.3.1 — 2023-06-27
+
+### 🐛 Bug fixes
+
+- On `iOS`, fixed crash when opening an invalid URL in the web browser. ([#22986](https://github.com/expo/expo/pull/23084) by [@hirbod](https://github.com/hirbod))
+
+## 12.3.0 — 2023-06-21
+
+### 📚 3rd party library updates
+
+- Updated `robolectric` to `4.10`. ([#22395](https://github.com/expo/expo/pull/22395) by [@josephyanks](https://github.com/josephyanks))
+
+### 🐛 Bug fixes
+
+- On `iOS` fix browser session being kept alive after view controller is dismissed. ([#22415](https://github.com/expo/expo/pull/22415) by [@alanjhughes](https://github.com/alanjhughes))
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+
 ## 12.2.0 — 2023-05-08
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.2.0'
+version = '12.3.1'
 
 
 buildscript {
@@ -36,19 +36,11 @@ buildscript {
   }
 }
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -71,15 +63,21 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.modules.webbrowser"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 18
-    versionName '12.2.0'
+    versionName '12.3.1'
   }
   lintOptions {
     abortOnError false
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 dependencies {
@@ -93,5 +91,5 @@ dependencies {
   if (project.findProject(':expo-modules-test-core')) {
     testImplementation project(':expo-modules-test-core')
   }
-  testImplementation "org.robolectric:robolectric:4.3.1"
+  testImplementation "org.robolectric:robolectric:4.10"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="expo.modules.webbrowser">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <queries>
     <intent>
       <!-- Required for opening tabs if targeting API 30 -->

package/ios/WebBrowserExceptions.swift

@@ -7,3 +7,9 @@ final class WebBrowserAlreadyOpenException: Exception {
     "Another web browser is already open"
   }
 }
+
+final class WebBrowserInvalidURLException: Exception {
+  override var reason: String {
+    return "The provided URL is not valid."
+  }
+}

package/ios/WebBrowserModule.swift

@@ -8,21 +8,34 @@ final public class WebBrowserModule: Module {
   private var currentWebBrowserSession: WebBrowserSession?
   private var currentAuthSession: WebAuthSession?
 
+  private func isValid(url: URL) -> Bool {
+    return url.scheme == "http" || url.scheme == "https"
+  }
+
   public func definition() -> ModuleDefinition {
     Name("ExpoWebBrowser")
 
-    AsyncFunction("openBrowserAsync") { (url: URL, options: WebBrowserOptions, promise: Promise) throws in
-      guard self.currentWebBrowserSession?.isOpen != true else {
+    AsyncFunction("openBrowserAsync") { (url: URL, options: WebBrowserOptions, promise: Promise) in
+      guard self.currentWebBrowserSession == nil else {
         throw WebBrowserAlreadyOpenException()
       }
-      self.currentWebBrowserSession = WebBrowserSession(url: url, options: options)
-      self.currentWebBrowserSession?.open(promise)
+
+      guard self.isValid(url: url) else {
+        throw WebBrowserInvalidURLException()
+      }
+
+      self.currentWebBrowserSession = WebBrowserSession(url: url, options: options) { [promise] type in
+        promise.resolve(["type": type])
+        self.currentWebBrowserSession = nil
+      }
+
+      self.currentWebBrowserSession?.open()
     }
     .runOnQueue(.main)
 
     AsyncFunction("dismissBrowser") {
-      self.currentWebBrowserSession?.dismiss()
-      self.currentWebBrowserSession = nil
+      currentWebBrowserSession?.dismiss()
+      currentWebBrowserSession = nil
     }
     .runOnQueue(.main)
 

package/ios/WebBrowserSession.swift

@@ -5,12 +5,11 @@ import ExpoModulesCore
 
 internal class WebBrowserSession: NSObject, SFSafariViewControllerDelegate, UIAdaptivePresentationControllerDelegate {
   let viewController: SFSafariViewController
-  var promise: Promise?
-  var isOpen: Bool {
-    promise != nil
-  }
+  let onDismiss: (String) -> Void
+
+  init(url: URL, options: WebBrowserOptions, onDismiss: @escaping (String) -> Void) {
+    self.onDismiss = onDismiss
 
-  init(url: URL, options: WebBrowserOptions) {
     let configuration = SFSafariViewController.Configuration()
     configuration.barCollapsingEnabled = options.enableBarCollapsing
     configuration.entersReaderIfAvailable = options.readerMode
@@ -26,14 +25,12 @@ internal class WebBrowserSession: NSObject, SFSafariViewControllerDelegate, UIAd
     viewController.presentationController?.delegate = self
   }
 
-  func open(_ promise: Promise) {
+  func open() {
     var currentViewController = UIApplication.shared.keyWindow?.rootViewController
     while currentViewController?.presentedViewController != nil {
       currentViewController = currentViewController?.presentedViewController
     }
     currentViewController?.present(viewController, animated: true, completion: nil)
-
-    self.promise = promise
   }
 
   func dismiss() {
@@ -57,7 +54,6 @@ internal class WebBrowserSession: NSObject, SFSafariViewControllerDelegate, UIAd
   // MARK: - Private
 
   private func finish(type: String) {
-    promise?.resolve(["type": type])
-    promise = nil
+    onDismiss(type)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-web-browser",
-  "version": "12.2.0",
+  "version": "12.3.1",
   "description": "Provides access to the system's web browser and supports handling redirects. On iOS, it uses SFSafariViewController or SFAuthenticationSession, depending on the method you call, and on Android it uses ChromeCustomTabs. As of iOS 11, SFSafariViewController no longer shares cookies with Safari, so if you are using WebBrowser for authentication you will want to use WebBrowser.openAuthSessionAsync, and if you just want to open a webpage (such as your app privacy policy), then use WebBrowser.openBrowserAsync.",
   "main": "build/WebBrowser.js",
   "types": "build/WebBrowser.d.ts",
@@ -45,5 +45,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "aa6bda733cef821234c77a19bbe6008b72c1c594"
 }