Make card token passing more intuitive

You can pass it via *Params.Token or via *Params.CardParams.Token to avoid confusion Fixes issue #4
stripe · Sep 2, 2014 · 0c6a077 · 0c6a077
1 parent fff3ee8
commit 0c6a077
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/charges.go b/charges.go
@@ -233,7 +233,11 @@ func (c *ChargeClient) Create(params *ChargeParams) (*Charge, error) {
 	} else if len(params.Token) > 0 {
 		body.Add("card", params.Token)
 	} else if params.Card != nil {
-		params.Card.appendTo(body, true)
+		if len(params.Card.Token) > 0 {
+			body.Add("card", params.Card.Token)
+		} else {
+			params.Card.appendTo(body, true)
+		}
 	} else {
 		err := errors.New("Invalid charge params: either customer, card token or card need to be set")
 		return nil, err

diff --git a/customers.go b/customers.go
@@ -134,7 +134,11 @@ func (c *CustomerClient) Update(id string, params *CustomerParams) (*Customer, e
 		if len(params.Token) > 0 {
 			body.Add("card", params.Token)
 		} else if params.Card != nil {
-			params.Card.appendTo(body, true)
+			if len(params.Card.Token) > 0 {
+				body.Add("card", params.Card.Token)
+			} else {
+				params.Card.appendTo(body, true)
+			}
 		}
 
 		if len(params.Desc) > 0 {

diff --git a/subscriptions.go b/subscriptions.go
@@ -143,7 +143,11 @@ func (c *SubscriptionClient) Update(id string, params *SubParams) (*Subscription
 	if len(params.Token) > 0 {
 		body.Add("card", params.Token)
 	} else if params.Card != nil {
-		params.Card.appendTo(body, true)
+		if len(params.Card.Token) > 0 {
+			body.Add("card", params.Card.Token)
+		} else {
+			params.Card.appendTo(body, true)
+		}
 	}
 
 	if len(params.Coupon) > 0 {