Merge pull request #32 from vapor-community/2.0.2

2.0.2 Minor Fixes
vapor-community · Apr 8, 2018 · c614801 · c614801
2 parents 3daee49 + 4eff3bc
commit c614801
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Sources/Stripe/API/Routes/SubscriptionRoutes.swift b/Sources/Stripe/API/Routes/SubscriptionRoutes.swift
@@ -14,9 +14,9 @@ public protocol SubscriptionRoutes {
     associatedtype L: List
     associatedtype DO: DeletedObject
 
-    func create(customer: String, applicationFeePercent: Decimal?, billing: String?, billingCycleAnchor: Date?, coupon: String?, daysUntilDue: Int?, items: [String: Any]?, metadata: [String: String]?, source: Any?, taxPercent: Decimal?, trialEnd: Any?, trialPeriodDays: Int?) throws -> Future<SB>
+    func create(customer: String, applicationFeePercent: Decimal?, billing: String?, billingCycleAnchor: Date?, coupon: String?, daysUntilDue: Int?, items: [[String : Any]]?, metadata: [String: String]?, source: Any?, taxPercent: Decimal?, trialEnd: Any?, trialPeriodDays: Int?) throws -> Future<SB>
     func retrieve(id: String) throws -> Future<SB>
-    func update(subscription: String, applicationFeePercent: Decimal?, billing: String?, billingCycleAnchor: String?, coupon: String?, daysUntilDue: Int?, items: [String: Any]?, metadata: [String: String]?, prorate: Bool?, prorationDate: Date?, source: Any?, taxPercent: Decimal?, trialEnd: Any?) throws -> Future<SB>
+    func update(subscription: String, applicationFeePercent: Decimal?, billing: String?, billingCycleAnchor: String?, coupon: String?, daysUntilDue: Int?, items: [[String : Any]]?, metadata: [String: String]?, prorate: Bool?, prorationDate: Date?, source: Any?, taxPercent: Decimal?, trialEnd: Any?) throws -> Future<SB>
     func cancel(subscription: String, atPeriodEnd: Bool?) throws -> Future<SB>
     func listAll(filter: [String: Any]?) throws -> Future<L>
     func deleteDiscount(subscription: String) throws -> Future<DO>
@@ -37,7 +37,7 @@ public struct StripeSubscriptionRoutes: SubscriptionRoutes {
                        billingCycleAnchor: Date? = nil,
                        coupon: String? = nil,
                        daysUntilDue: Int? = nil,
-                       items: [String : Any]? = nil,
+                       items: [[String : Any]]? = nil,
                        metadata: [String : String]? = nil,
                        source: Any? = nil,
                        taxPercent: Decimal? = nil,
@@ -68,7 +68,9 @@ public struct StripeSubscriptionRoutes: SubscriptionRoutes {
         }
 
         if let items = items {
-            items.forEach { body["items[\($0)]"] = $1 }
+            for (index, item) in items.enumerated() {
+                item.forEach { body["items[\(index)][\($0)]"] = $1 }
+            }
         }
 
         if let metadata = metadata {
@@ -116,7 +118,7 @@ public struct StripeSubscriptionRoutes: SubscriptionRoutes {
                        billingCycleAnchor: String? = nil,
                        coupon: String? = nil,
                        daysUntilDue: Int? = nil,
-                       items: [String : Any]? = nil,
+                       items: [[String : Any]]? = nil,
                        metadata: [String : String]? = nil,
                        prorate: Bool? = nil,
                        prorationDate: Date? = nil,
@@ -146,7 +148,9 @@ public struct StripeSubscriptionRoutes: SubscriptionRoutes {
         }
 
         if let items = items {
-            items.forEach { body["items[\($0)]"] = $1 }
+            for (index, item) in items.enumerated() {
+                item.forEach { body["items[\(index)][\($0)]"] = $1 }
+            }
         }
 
         if let metadata = metadata {

diff --git a/Sources/Stripe/Provider/Provider.swift b/Sources/Stripe/Provider/Provider.swift
@@ -9,7 +9,7 @@
 import Vapor
 
 public struct StripeConfig: Service {
-    let apiKey: String
+    public let apiKey: String
     public init(apiKey: String) {
         self.apiKey = apiKey
     }