From 256eff0c62072a301fd3ce8c17bcd386da1427fe Mon Sep 17 00:00:00 2001
From: Justin Leider <justin@bondlink.com>
Date: Wed, 25 Jan 2017 13:35:41 -0500
Subject: [PATCH 1/3] Update card and bank account interfaces, rename for
 consistency.

---
 stripe/index.d.ts      | 31 +++++++++++++++----------------
 stripe/stripe-tests.ts |  4 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/stripe/index.d.ts b/stripe/index.d.ts
index a7d887c747..918f5c8551 100644
--- a/stripe/index.d.ts
+++ b/stripe/index.d.ts
@@ -12,13 +12,13 @@ interface StripeStatic {
     validateExpiry(month: string, year: string): boolean;
     validateCVC(cardCVC: string): boolean;
     cardType(cardNumber: string): StripeCardDataBrand;
-    getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
-    card: StripeCardData;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    getToken(token: string, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    card: StripeCard;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
     bankAccount: StripeBankAccount;
 }
 
-interface StripeTokenData {
+interface StripeCardTokenData {
     number: string;
     exp_month?: number;
     exp_year?: number;
@@ -35,7 +35,6 @@ interface StripeTokenData {
 
 interface StripeTokenResponse {
     id: string;
-    card: StripeCardData;
     created: number;
     livemode: boolean;
     object: string;
@@ -44,6 +43,10 @@ interface StripeTokenResponse {
     error?: StripeError;
 }
 
+interface StripeCardTokenResponse extends StripeTokenResponse {
+    card: StripeCard;
+}
+
 interface StripeError {
     type: string;
     code: string;
@@ -53,7 +56,7 @@ interface StripeError {
 
 type StripeCardDataBrand = 'Visa' | 'American Express' | 'MasterCard' | 'Discover' | 'JCB' | 'Diners Club' | 'Unknown';
 
-interface StripeCardData {
+interface StripeCard {
     object: string;
     last4: string;
     exp_month: number;
@@ -67,7 +70,10 @@ interface StripeCardData {
     address_zip?: string;
     address_country?: string;
     brand?: StripeCardDataBrand;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    validateCardNumber(cardNumber: string): boolean;
+    validateExpiry(month: string, year: string): boolean;
+    validateCVC(cardCVC: string): boolean;
 }
 
 interface StripeBankAccount {
@@ -85,8 +91,7 @@ interface StripeBankTokenParams {
     account_holder_type: string;
 }
 
-interface StripeBankTokenResponse {
-    id: string;
+interface StripeBankTokenResponse extends StripeTokenResponse {
     bank_account: {
         country: string;
         bank_name: string;
@@ -94,12 +99,6 @@ interface StripeBankTokenResponse {
         validated: boolean;
         object: string;
     };
-    created: number;
-    livemode: boolean;
-    type: string;
-    object: string;
-    used: boolean;
-    error?: StripeError;
 }
 
 interface StripeApplePay {
@@ -134,7 +133,7 @@ interface StripeApplePayLineItem {
 }
 
 interface StripeApplePaySessionResult {
-    token: StripeTokenResponse;
+    token: StripeCardTokenResponse;
     shippingContact?: StripeApplePayPaymentContact;
     shippingMethod?: StripeApplePayShippingMethod;
 }
diff --git a/stripe/stripe-tests.ts b/stripe/stripe-tests.ts
index 44aa09d216..56e6343f5c 100644
--- a/stripe/stripe-tests.ts
+++ b/stripe/stripe-tests.ts
@@ -1,4 +1,4 @@
-function success(card: StripeCardData) {
+function success(card: StripeCard) {
     console.log(card.brand && card.brand.toString());
 }
 
@@ -6,7 +6,7 @@ const cardNumber = '4242424242424242';
 
 const isValid = Stripe.validateCardNumber(cardNumber);
 if (isValid) {
-    const tokenData: StripeTokenData = {
+    const tokenData: StripeCardTokenData = {
         number: cardNumber,
         exp_month: 1,
         exp_year: 2100,

From 842692a5bd25af26d5d9855804f5aad475d05222 Mon Sep 17 00:00:00 2001
From: Justin Leider <justin@bondlink.com>
Date: Wed, 25 Jan 2017 13:51:39 -0500
Subject: [PATCH 2/3] Update attribution and version

---
 stripe/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stripe/index.d.ts b/stripe/index.d.ts
index 918f5c8551..78092b8b1e 100644
--- a/stripe/index.d.ts
+++ b/stripe/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for stripe 0.0
+// Type definitions for stripe.js v2.x
 // Project: https://stripe.com/
-// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>, Adam Cmiel <https://github.com/adamcmiel>
+// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>, Adam Cmiel <https://github.com/adamcmiel>, Justin Leider <https://github.com/jleider>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare const Stripe: StripeStatic;

From da9dee33353a7eaef280df64616441af52d2462c Mon Sep 17 00:00:00 2001
From: Justin Leider <justin@bondlink.com>
Date: Wed, 25 Jan 2017 13:56:06 -0500
Subject: [PATCH 3/3] Fix package and version

---
 stripe/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stripe/index.d.ts b/stripe/index.d.ts
index 78092b8b1e..2563af9882 100644
--- a/stripe/index.d.ts
+++ b/stripe/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stripe.js v2.x
+// Type definitions for stripe 2.x
 // Project: https://stripe.com/
 // Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>, Adam Cmiel <https://github.com/adamcmiel>, Justin Leider <https://github.com/jleider>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped