Merge pull request #1363 from stripe/yuki-update-examples

Update examples
stripe · Sep 13, 2019 · c26fffa · c26fffa
2 parents cf587b9 + 287b126
commit c26fffa
Show file tree

Hide file tree

Showing 21 changed files with 590 additions and 457 deletions.
diff --git a/Example/Custom Integration.xcodeproj/project.pbxproj b/Example/Custom Integration.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
 		36D4EA6422DFEF1300619BA8 /* CardSetupIntentBackendExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 36D4EA6322DFEF1300619BA8 /* CardSetupIntentBackendExampleViewController.m */; };
 		8BBD79C6207FD2F900F85BED /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8BBD79C8207FD2F900F85BED /* Localizable.strings */; };
 		B3BDCADD20EF03010034F7F5 /* CardAutomaticConfirmationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B3BDCADB20EF03010034F7F5 /* CardAutomaticConfirmationViewController.m */; };
+		B607FFBD2321DA99004203E0 /* MyAPIClient.m in Sources */ = {isa = PBXBuildFile; fileRef = B607FFBC2321DA99004203E0 /* MyAPIClient.m */; };
 		B65E8FCC22FA078A0057E64A /* WeChatPayExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B65E8FCB22FA078A0057E64A /* WeChatPayExampleViewController.m */; };
 		B66AC61E22CAAB8F0064C551 /* CardSetupIntentExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66AC61D22CAAB8F0064C551 /* CardSetupIntentExampleViewController.m */; };
 		C12C50DD1E57B3C800EC6D58 /* BrowseExamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C12C50DC1E57B3C800EC6D58 /* BrowseExamplesViewController.m */; };
@@ -59,7 +60,7 @@
 		04533F181A688A0A00C7E52E /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
 		31A8934B230F6ABD007ABE37 /* FPXExampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPXExampleViewController.h; sourceTree = "<group>"; };
 		31A8934C230F6ABD007ABE37 /* FPXExampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FPXExampleViewController.m; sourceTree = "<group>"; };
-		366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Standard Integration/README.md"; sourceTree = "<group>"; };
+		366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Custom Integration/README.md"; sourceTree = "<group>"; };
 		36D4EA6222DFEF1300619BA8 /* CardSetupIntentBackendExampleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CardSetupIntentBackendExampleViewController.h; sourceTree = "<group>"; };
 		36D4EA6322DFEF1300619BA8 /* CardSetupIntentBackendExampleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CardSetupIntentBackendExampleViewController.m; sourceTree = "<group>"; };
 		8BBD79C7207FD2F900F85BED /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -74,6 +75,8 @@
 		8BBD79D1207FD35200F85BED /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B3BDCADB20EF03010034F7F5 /* CardAutomaticConfirmationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardAutomaticConfirmationViewController.m; sourceTree = "<group>"; };
 		B3BDCADC20EF03010034F7F5 /* CardAutomaticConfirmationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardAutomaticConfirmationViewController.h; sourceTree = "<group>"; };
+		B607FFBB2321DA99004203E0 /* MyAPIClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyAPIClient.h; sourceTree = "<group>"; };
+		B607FFBC2321DA99004203E0 /* MyAPIClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyAPIClient.m; sourceTree = "<group>"; };
 		B65E8FCA22FA078A0057E64A /* WeChatPayExampleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeChatPayExampleViewController.h; sourceTree = "<group>"; };
 		B65E8FCB22FA078A0057E64A /* WeChatPayExampleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WeChatPayExampleViewController.m; sourceTree = "<group>"; };
 		B66AC61C22CAAB8F0064C551 /* CardSetupIntentExampleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CardSetupIntentExampleViewController.h; sourceTree = "<group>"; };
@@ -105,10 +108,10 @@
 		04533E7E1A687F5D00C7E52E = {
 			isa = PBXGroup;
 			children = (
-				366F93AF225FF2A2005CFBF6 /* README.md */,
 				04533E891A687F5D00C7E52E /* Custom Integration */,
 				04533F0E1A68813100C7E52E /* Frameworks */,
 				04533E881A687F5D00C7E52E /* Products */,
+				366F93AF225FF2A2005CFBF6 /* README.md */,
 			);
 			sourceTree = "<group>";
 		};
@@ -139,12 +142,14 @@
 				B66AC61D22CAAB8F0064C551 /* CardSetupIntentExampleViewController.m */,
 				04533F171A688A0A00C7E52E /* Constants.h */,
 				04533F181A688A0A00C7E52E /* Constants.m */,
+				31A8934B230F6ABD007ABE37 /* FPXExampleViewController.h */,
+				31A8934C230F6ABD007ABE37 /* FPXExampleViewController.m */,
 				04533E971A687F5D00C7E52E /* Images.xcassets */,
 				8BBD79C8207FD2F900F85BED /* Localizable.strings */,
+				B607FFBB2321DA99004203E0 /* MyAPIClient.h */,
+				B607FFBC2321DA99004203E0 /* MyAPIClient.m */,
 				04533EB01A68802E00C7E52E /* ShippingManager.h */,
 				04533EB11A68802E00C7E52E /* ShippingManager.m */,
-				31A8934B230F6ABD007ABE37 /* FPXExampleViewController.h */,
-				31A8934C230F6ABD007ABE37 /* FPXExampleViewController.m */,
 				C1CACE921E5E3DF6002D0821 /* SofortExampleViewController.h */,
 				C1CACE931E5E3DF6002D0821 /* SofortExampleViewController.m */,
 				04533E8A1A687F5D00C7E52E /* Supporting Files */,
@@ -286,6 +291,7 @@
 				04533E901A687F5D00C7E52E /* AppDelegate.m in Sources */,
 				B65E8FCC22FA078A0057E64A /* WeChatPayExampleViewController.m in Sources */,
 				C1CACE891E5DF7A9002D0821 /* ApplePayExampleViewController.m in Sources */,
+				B607FFBD2321DA99004203E0 /* MyAPIClient.m in Sources */,
 				04533E8D1A687F5D00C7E52E /* main.m in Sources */,
 				31A8934D230F6ABD007ABE37 /* FPXExampleViewController.m in Sources */,
 				C12C50DD1E57B3C800EC6D58 /* BrowseExamplesViewController.m in Sources */,

diff --git a/Example/Custom Integration/AppDelegate.m b/Example/Custom Integration/AppDelegate.m
@@ -26,6 +26,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
+/**
+ This method is implemented to route returnURLs back to the Stripe SDK.
+ 
+ @see https://stripe.com/docs/mobile/ios/authentication#return-url
+ */
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
     BOOL stripeHandled = [Stripe handleStripeURLCallbackWithURL:url];
     if (stripeHandled) {

diff --git a/Example/Custom Integration/ApplePayExampleViewController.m b/Example/Custom Integration/ApplePayExampleViewController.m
@@ -7,10 +7,12 @@
 //
 
 #import <Stripe/Stripe.h>
+
 #import "ApplePayExampleViewController.h"
 #import "BrowseExamplesViewController.h"
 #import "Constants.h"
 #import "ShippingManager.h"
+#import "MyAPIClient.h"
 
 /**
  This example demonstrates creating a payment using Apple Pay. First, we configure a PKPaymentRequest 
@@ -169,8 +171,8 @@ - (void)_createAndConfirmPaymentIntentWithPaymentMethod:(STPPaymentMethod *)paym
     };
 
     // 1. Create a PaymentIntent on the backend. This is typically done at the beginning of the checkout flow.
-    [self.delegate createBackendPaymentIntentWithAmount:@(1000) completion:^(STPBackendResult status, NSString *clientSecret, NSError *error) {
-        if (status == STPBackendResultFailure || error) {
+    [[MyAPIClient sharedClient] createPaymentIntentWithCompletion:^(MyAPIClientResult status, NSString *clientSecret, NSError *error) {
+        if (status == MyAPIClientResultFailure || error) {
             self.applePayError = error;
             finishWithStatus(PKPaymentAuthorizationStatusFailure);
             return;

diff --git a/Example/Custom Integration/BrowseExamplesViewController.h b/Example/Custom Integration/BrowseExamplesViewController.h
@@ -9,35 +9,11 @@
 #import <UIKit/UIKit.h>
 #import <Stripe/Stripe.h>
 
-typedef NS_ENUM(NSInteger, STPBackendResult) {
-    STPBackendResultSuccess,
-    STPBackendResultFailure,
-};
-
-typedef void (^STPPaymentIntentCreationHandler)(STPBackendResult status, NSString *clientSecret, NSError *error);
-typedef void (^STPPaymentIntentCreateAndConfirmHandler)(STPBackendResult status, NSString *clientSecret, NSError *error);
-typedef void (^STPConfirmPaymentIntentCompletionHandler)(STPBackendResult status, NSString *clientSecret, NSError *error);
-typedef void (^STPCreateSetupIntentCompletionHandler)(STPBackendResult status, NSString *clientSecret, NSError *error);
-
-
 @protocol ExampleViewControllerDelegate <STPAuthenticationContext>
 
 - (void)exampleViewController:(UIViewController *)controller didFinishWithMessage:(NSString *)message;
 - (void)exampleViewController:(UIViewController *)controller didFinishWithError:(NSError *)error;
 
-- (void)createBackendPaymentIntentWithAmount:(NSNumber *)amount completion:(STPPaymentIntentCreationHandler)completion;
-- (void)createAndConfirmPaymentIntentWithAmount:(NSNumber *)amount
-                                  paymentMethod:(NSString *)paymentMethodID
-                                      returnURL:(NSString *)returnURL
-                                     completion:(STPPaymentIntentCreateAndConfirmHandler)completion;
-- (void)confirmPaymentIntent:(STPPaymentIntent *)paymentIntent completion:(STPConfirmPaymentIntentCompletionHandler)completion;
-
-
-// if paymentMethodID != nil, this will also confirm on the backend
-- (void)createSetupIntentWithPaymentMethod:(NSString *)paymentMethodID
-                                 returnURL:(NSString *)returnURL
-                                completion:(STPCreateSetupIntentCompletionHandler)completion;
-
 @end
 
 @interface BrowseExamplesViewController : UITableViewController