Merge pull request #13 from lyft/fix-deeplinking

Fix deeplinking

Author: acityinohio

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 `LyftSDK` adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.6](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.6)
+
+- Fix deeplinking with parameters
+
 ## [1.0.5](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.5)
 
 - Fix User-Agent header field

LyftSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name            = 'LyftSDK'
-  s.version         = '1.0.5'
+  s.version         = '1.0.6'
   s.summary         = 'The official Lyft iOS SDK.'
   s.homepage        = 'https://github.com/lyft/lyft-iOS-sdk'
   s.license         = { :type => 'Apache', :file => 'LICENSE' }

Resources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/LyftUI/LyftDeepLink.swift

@@ -9,21 +9,21 @@ import UIKit
 public enum LyftDeepLinkBehavior {
     case native
     case web
-
+    
     fileprivate var baseUrl: URL? {
         switch self {
-            case .native:
-                return URL(string: "lyft://")
-
-            case .web:
-                return URL(string: "https://ride.lyft.com/")
+        case .native:
+            return URL(string: "lyft://ridetype")
+            
+        case .web:
+            return URL(string: "https://ride.lyft.com/u")
         }
     }
 }
 
 /// Collection of deep links into the main Lyft application
 public struct LyftDeepLink {
-
+    
     /// Prepares to request a ride with the given parameters
     ///
     /// - parameter behavior:       The deep linking mode to use for this deep link
@@ -36,59 +36,42 @@ public struct LyftDeepLink {
                                    to destination: CLLocationCoordinate2D? = nil,
                                    couponCode: String? = nil)
     {
-        let action: String
         var parameters = [String: Any]()
         parameters["partner"] = LyftConfiguration.developer?.clientId
         parameters["credits"] = couponCode
-
-        switch behavior {
-            case .native:
-                action = "ridetype"
-                parameters["id"] = kind.rawValue
-                parameters["pickup[latitude]"] = pickup.map { $0.latitude }
-                parameters["pickup[longitude]"] = pickup.map { $0.longitude }
-                parameters["destination[latitude]"] = destination.map { $0.latitude }
-                parameters["destination[longitude]"] = destination.map { $0.longitude }
-
-            case .web:
-                action = "request"
-                parameters["ride_type"] = kind.rawValue
-                parameters["pickup"] = pickup.map { "@\($0.latitude),\($0.longitude)" }
-                parameters["destination"] = destination.map { "@\($0.latitude),\($0.longitude)" }
-        }
-
-        self.launch(using: behavior, action: action, parameters: parameters)
+        parameters["id"] = kind.rawValue
+        parameters["pickup[latitude]"] = pickup.map { $0.latitude }
+        parameters["pickup[longitude]"] = pickup.map { $0.longitude }
+        parameters["destination[latitude]"] = destination.map { $0.latitude }
+        parameters["destination[longitude]"] = destination.map { $0.longitude }
+        
+        self.launch(using: behavior, parameters: parameters)
     }
-
-    private static func launch(using behavior: LyftDeepLinkBehavior, action: String,
-                               parameters: [String: Any])
+    
+    private static func launch(using behavior: LyftDeepLinkBehavior, parameters: [String: Any])
     {
-        guard let originalUrl = behavior.baseUrl.flatMap({ URL(string: action, relativeTo: $0) }) else {
-            return
-        }
-
-        let request = lyftURLEncodedInURL(request: URLRequest(url: originalUrl), parameters: parameters).0
+        let request = lyftURLEncodedInURL(request: URLRequest(url: behavior.baseUrl!), parameters: parameters).0
         guard let url = request.url else {
             return
         }
-
+        
         switch behavior {
-            case .native:
-                if #available(iOS 10.0, *) {
-                    UIApplication.shared.open(url, options: [:]) { success in
-                        if !success {
-                            self.launchAppStore()
-                        }
+        case .native:
+            if #available(iOS 10.0, *) {
+                UIApplication.shared.open(url, options: [:]) { success in
+                    if !success {
+                        self.launchAppStore()
                     }
-                } else {
-                    UIApplication.shared.openURL(url)
                 }
-
-            case .web:
-                Safari.openURL(url, from: UIApplication.shared.topViewController)
+            } else {
+                UIApplication.shared.openURL(url)
+            }
+            
+        case .web:
+            Safari.openURL(url, from: UIApplication.shared.topViewController)
         }
     }
-
+    
     @available(iOS 10.0, *)
     private static func launchAppStore() {
         let signUp = LyftConfiguration.signUpIdentifier
@@ -108,7 +91,7 @@ fileprivate extension UIApplication {
         while let viewController = topController?.presentedViewController {
             topController = viewController
         }
-
+        
         return topController
     }
 }