orderId -> order_id

Sources/ShopifyCheckoutSheetKit/CheckoutBridge.swift

@@ -31,16 +31,17 @@ enum BridgeError: Swift.Error {
 enum CheckoutBridge {
 	static let schemaVersion = "8.1"
 	static let messageHandler = "mobileCheckoutSdk"
+	internal static let userAgent = "ShopifyCheckoutSDK/\(ShopifyCheckoutSheetKit.version)"
 	internal static var logger: ProductionLogger = InternalLogger()
 
 	static var applicationName: String {
 		let theme = ShopifyCheckoutSheetKit.configuration.colorScheme.rawValue
-		return "ShopifyCheckoutSDK/\(ShopifyCheckoutSheetKit.version) (\(schemaVersion);\(theme);standard)"
+		return "\(userAgent) (\(schemaVersion);\(theme);standard)"
 	}
 
 	static var recoveryAgent: String {
 		let theme = ShopifyCheckoutSheetKit.configuration.colorScheme.rawValue
-		return "ShopifyCheckoutSheetKitRecovery/\(ShopifyCheckoutSheetKit.version) (theme=\(theme))"
+		return "\(userAgent) (noconnect;\(theme);standard_recovery)"
 	}
 
 	static func instrument(_ webView: WKWebView, _ instrumentation: InstrumentationPayload) {

Sources/ShopifyCheckoutSheetKit/CheckoutWebView.swift

@@ -417,7 +417,7 @@ extension CheckoutWebView: WKNavigationDelegate {
 
 		let queryItems = urlComponents.queryItems ?? []
 
-		for item in queryItems where item.name == "orderId" {
+		for item in queryItems where item.name == "order_id" {
 			return item.value
 		}
 

Sources/ShopifyCheckoutSheetKit/CheckoutWebViewController.swift

@@ -187,7 +187,6 @@ class CheckoutWebViewController: UIViewController, UIAdaptivePresentationControl
 		checkoutView.load(checkout: url)
 		progressBar.startAnimating()
 	}
-
 }
 
 extension CheckoutWebViewController: CheckoutWebViewDelegate {

Tests/ShopifyCheckoutSheetKitTests/CheckoutWebViewTests.swift

@@ -54,7 +54,7 @@ class CheckoutWebViewTests: XCTestCase {
 		XCTAssertFalse(recovery.isBridgeAttached)
 		XCTAssertFalse(recovery.isPreloadingAvailable)
 		XCTAssertFalse(recovery.isBridgeAvailable)
-		XCTAssertEqual(recovery.configuration.applicationNameForUserAgent, "ShopifyCheckoutSheetKitRecovery/\(ShopifyCheckoutSheetKit.version) (theme=automatic)")
+		XCTAssertEqual(recovery.configuration.applicationNameForUserAgent, "ShopifyCheckoutSDK/\(ShopifyCheckoutSheetKit.version) (noconnect;automatic;standard_recovery)")
 		XCTAssertEqual(recovery.backgroundColor, backgroundColor)
 		XCTAssertFalse(recovery.isOpaque)
 	}
@@ -152,21 +152,28 @@ class CheckoutWebViewTests: XCTestCase {
 	}
 
 	func testObtainsOrderIDFromQuery() {
-		let url = URL(string: "http://shopify1.shopify.com/checkouts/c/12345/thank-you?orderId=1234")!
-		recovery = createRecoveryAgent()
-		recovery.load(checkout: url)
-		let didCompleteCheckoutExpectation = expectation(description: "checkoutViewDidCompleteCheckout was called")
+		let urls = [
+			"http://shopify1.shopify.com/checkouts/c/12345/thank-you?order_id=1234",
+			"http://shopify1.shopify.com/checkouts/c/12345/thank_you?order_id=1234",
+			"http://shopify1.shopify.com/checkouts/c/12345/thank_you/completed?order_id=1234"
+		]
 
-		mockDelegate.didEmitCheckoutCompletedEventExpectation = didCompleteCheckoutExpectation
-		recovery.viewDelegate = mockDelegate
+		for url in urls {
+			recovery = createRecoveryAgent()
+			recovery.load(checkout: URL(string: url)!)
+			let didCompleteCheckoutExpectation = expectation(description: "checkoutViewDidCompleteCheckout was called")
 
-		let urlResponse = HTTPURLResponse(url: url, statusCode: 200, httpVersion: nil, headerFields: nil)!
+			mockDelegate.didEmitCheckoutCompletedEventExpectation = didCompleteCheckoutExpectation
+			recovery.viewDelegate = mockDelegate
 
-		let policy = recovery.handleResponse(urlResponse)
-		XCTAssertEqual(policy, .allow)
+			let urlResponse = HTTPURLResponse(url: URL(string: url)!, statusCode: 200, httpVersion: nil, headerFields: nil)!
 
-		waitForExpectations(timeout: 5) { _ in
-			XCTAssertEqual(self.mockDelegate.completedEventReceived?.orderDetails.id, "1234")
+			let policy = recovery.handleResponse(urlResponse)
+			XCTAssertEqual(policy, .allow)
+
+			waitForExpectations(timeout: 5) { _ in
+				XCTAssertEqual(self.mockDelegate.completedEventReceived?.orderDetails.id, "1234")
+			}
 		}
 	}