Handle about:blank cases (#230)

Shopify · Oct 18, 2024 · 773e42b · 773e42b
1 parent 02d796b
commit 773e42b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.1 - October 18, 2024
+
+- Ignore "about:blank" URLs
+
 ## 3.1.0 - October 16, 2024
 
 - Ignore cancelled redirects

diff --git a/ShopifyCheckoutSheetKit.podspec b/ShopifyCheckoutSheetKit.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.name    = "ShopifyCheckoutSheetKit"
   s.summary = "Enables Swift apps to embed the Shopify's highest converting, customizable, one-page checkout."

diff --git a/Sources/ShopifyCheckoutSheetKit/CheckoutURL.swift b/Sources/ShopifyCheckoutSheetKit/CheckoutURL.swift
@@ -48,8 +48,12 @@ public struct CheckoutURL {
 		return false
 	}
 
+	public func isBlank() -> Bool {
+		return url.scheme == "about" || url.absoluteString == "about:blank"
+	}
+
 	public func isDeepLink() -> Bool {
-		guard let scheme = url.scheme else {
+		guard let scheme = url.scheme, !isBlank() else {
 			return false
 		}
 

diff --git a/Sources/ShopifyCheckoutSheetKit/ShopifyCheckoutSheetKit.swift b/Sources/ShopifyCheckoutSheetKit/ShopifyCheckoutSheetKit.swift
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO
 import UIKit
 
 /// The version of the `ShopifyCheckoutSheetKit` library.
-public let version = "3.1.0"
+public let version = "3.1.1"
 
 internal var invalidateOnConfigurationChange = true
 

diff --git a/Tests/ShopifyCheckoutSheetKitTests/CheckoutURLTests.swift b/Tests/ShopifyCheckoutSheetKitTests/CheckoutURLTests.swift
@@ -45,12 +45,22 @@ class CheckoutURLTests: XCTestCase {
     }
 
     func testIsDeepLink() {
+		/// Invalid cases
         let secureURL = URL(string: "https://shopify.com")!
         let nonSecureURL = URL(string: "http://shopify.com")!
+        let blank = URL(string: "about:blank")!
+
+		/// Valid cases
         let deeplink = URL(string: "app://deep/link")!
+        let deeplink2 = URL(string: "notes-app://")!
+        let deeplink3 = URL(string: "maps://?q=Cupertino")!
 
         XCTAssertFalse(CheckoutURL(from: secureURL).isDeepLink())
         XCTAssertFalse(CheckoutURL(from: nonSecureURL).isDeepLink())
+        XCTAssertFalse(CheckoutURL(from: blank).isDeepLink())
+
         XCTAssertTrue(CheckoutURL(from: deeplink).isDeepLink())
+        XCTAssertTrue(CheckoutURL(from: deeplink2).isDeepLink())
+        XCTAssertTrue(CheckoutURL(from: deeplink3).isDeepLink())
     }
 }