Merge pull request #311 from mohssenfathi/remove-swift-sdk

Remove legacy SwiftSDK sample app

Sources/UberCore/ConfigurationProvider.swift

@@ -19,18 +19,22 @@ public protocol ConfigurationProviding {
 }
 
 public struct ConfigurationProvider: ConfigurationProviding {
-
+
+    // MARK: Public Properties
+
+    public static var plistName: String = "Info"
+
     // MARK: Private Properties
 
     private let parser: PlistParser
 
     // MARK: Initializers
 
     public init() {
-        let parser = PlistParser(plistName: "Info")
+        let parser = PlistParser(plistName: Self.plistName)
         self.parser = parser
 
-        guard let contents: [String: String] = parser[ConfigurationKey.base] else {
+        guard let contents: [String: Any] = parser[ConfigurationKey.base] else {
             preconditionFailure("Configuration item not found: \(ConfigurationKey.base)")
         }
 
@@ -44,8 +48,8 @@ public struct ConfigurationProvider: ConfigurationProviding {
 
         self.clientID = clientID
         self.redirectURI = redirectURI
-        Self.isSandbox = Bool(contents[ConfigurationKey.sandbox] ?? "") ?? false
-        self.serverToken = contents[ConfigurationKey.serverToken]
+        Self.isSandbox = (contents[ConfigurationKey.sandbox] as? Bool) ?? false
+        self.serverToken = contents[ConfigurationKey.serverToken] as? String
     }
 
     // MARK: ConfigurationProviding
@@ -90,7 +94,7 @@ public struct ConfigurationProvider: ConfigurationProviding {
         static let base = "Uber"
         static let clientID = "ClientID"
         static let redirectURI = "RedirectURI"
-        static let serverToken = "RedirectURI"
+        static let serverToken = "ServerToken"
         static let sandbox = "Sandbox"
     }
 }

Sources/UberRides/RidesCore/Utilities/RidesUtil.swift

@@ -98,7 +98,6 @@ class RequestURLUtil {
         case Dropoff = "dropoff"
     }
 
-    private static let configurationProvider = ConfigurationProvider()
     static let actionKey = "action"
     static let setPickupValue = "setPickup"
     static let clientIDKey = "client_id"
@@ -110,7 +109,7 @@ class RequestURLUtil {
     static let formattedAddressKey = "[formatted_address]"
     static let userAgentKey = "user-agent"
 
-    static func buildRequestQueryParameters(_ rideParameters: RideParameters) -> [URLQueryItem] {
+    static func buildRequestQueryParameters(_ rideParameters: RideParameters, configurationProvider: ConfigurationProviding = ConfigurationProvider()) -> [URLQueryItem] {
 
         var queryItems = [URLQueryItem]()
         queryItems.append(URLQueryItem(name: RequestURLUtil.actionKey, value: RequestURLUtil.setPickupValue))