Merge pull request #72 from Shopify/runmad.improve-safari-checkout-handling

Sample app Safari view controller checkout logic improvements

Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/CheckoutViewController.m

@@ -141,11 +141,11 @@ NSString * const MerchantId = @"";
 - (void)addCreditCardToCheckout:(void (^)(BOOL success))callback
 {
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-
+    
     [self.client storeCreditCard:[self creditCard] checkout:self.checkout completion:^(BUYCheckout *checkout, NSString *paymentSessionId, NSError *error) {
         
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-
+        
         if (error == nil && checkout) {
             
             NSLog(@"Successfully added credit card to checkout");
@@ -195,7 +195,13 @@ NSString * const MerchantId = @"";
 
 - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller
 {
-    [self.navigationController popToRootViewControllerAnimated:YES];
+    [self getCompletedCheckout:^{
+        if (self.checkout.order) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self showCheckoutConfirmation];
+            });
+        }
+    }];
 }
 
 #pragma mark Native Checkout
@@ -210,7 +216,7 @@ NSString * const MerchantId = @"";
         if (success) {
             
             [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-
+            
             // Upon successfully adding the credit card to the checkout, complete checkout must be called immediately
             [welf.client completeCheckout:welf.checkout completion:^(BUYCheckout *checkout, NSError *error) {
                 
@@ -221,7 +227,7 @@ NSString * const MerchantId = @"";
                     
                     GetCompletionStatusOperation *completionOperation = [[GetCompletionStatusOperation alloc] initWithClient:welf.client withCheckout:welf.checkout];
                     completionOperation.delegate = welf;
-
+                    
                     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
                     [[NSOperationQueue mainQueue] addOperation:completionOperation];
                 }
@@ -237,16 +243,16 @@ NSString * const MerchantId = @"";
 - (void)operation:(GetCompletionStatusOperation *)operation didReceiveCompletionStatus:(BUYStatus)completionStatus
 {
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-
+    
     NSLog(@"Successfully got completion status: %lu", (unsigned long)completionStatus);
     
-    [self getCompletedCheckout];
+    [self getCompletedCheckout:NULL];
 }
 
 - (void)operation:(GetCompletionStatusOperation *)operation failedToReceiveCompletionStatus:(NSError *)error
 {
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-
+    
     NSLog(@"Error getting completion status: %@", error);
 }
 
@@ -265,15 +271,15 @@ NSString * const MerchantId = @"";
      *  Alternatively we can set the delegate to self.applePayHelper.
      *  If you do not care about any PKPaymentAuthorizationViewControllerDelegate callbacks
      *  uncomment the code below to let BUYApplePayHelpers take care of them automatically.
-     *  You can then also safely remove the PKPaymentAuthorizationViewControllerDelegate 
+     *  You can then also safely remove the PKPaymentAuthorizationViewControllerDelegate
      *  methods below.
      *
      *  // paymentController.delegate = self.applePayHelper
      *
-     *  If you keep self as the delegate, you have a chance to intercept the 
-     *  PKPaymentAuthorizationViewControllerDelegate callbacks and add any additional logging 
-     *  and method calls as you need. Ensure that you forward them to the BUYApplePayHelpers 
-     *  class by calling the delegate methods on BUYApplePayHelpers which already implements 
+     *  If you keep self as the delegate, you have a chance to intercept the
+     *  PKPaymentAuthorizationViewControllerDelegate callbacks and add any additional logging
+     *  and method calls as you need. Ensure that you forward them to the BUYApplePayHelpers
+     *  class by calling the delegate methods on BUYApplePayHelpers which already implements
      *  the PKPaymentAuthorizationViewControllerDelegate protocol.
      *
      */
@@ -306,9 +312,9 @@ NSString * const MerchantId = @"";
 {
     // Add additional methods if needed and forward the callback to BUYApplePayHelpers
     [self.applePayHelper paymentAuthorizationViewController:controller didAuthorizePayment:payment completion:completion];
-
+    
     self.checkout = self.applePayHelper.checkout;
-    [self getCompletedCheckout];
+    [self getCompletedCheckout:NULL];
 }
 
 - (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
@@ -340,7 +346,7 @@ NSString * const MerchantId = @"";
 - (void)checkoutOnWeb
 {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveCallbackURLNotification:) name:CheckoutCallbackNotification object:nil];
-
+    
     // On iOS 9+ we should use the SafariViewController to display the checkout in-app
     if ([SFSafariViewController class]) {
         
@@ -358,27 +364,42 @@ NSString * const MerchantId = @"";
 {
     NSURL *url = notification.userInfo[@"url"];
     
-    __weak CheckoutViewController *welf = self;
+    if ([self.presentedViewController isKindOfClass:[SFSafariViewController class]]) {
+        [self dismissViewControllerAnimated:self.presentedViewController completion:^{
+            [self getCompletionStatusAndCompletedCheckoutWithURL:url];
+        }];
+    } else {
+        [self getCompletionStatusAndCompletedCheckoutWithURL:url];
+    }
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:CheckoutCallbackNotification object:nil];
+}
 
+- (void)getCompletionStatusAndCompletedCheckoutWithURL:(NSURL*)url
+{
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-
+    
+    __weak CheckoutViewController *welf = self;
+    
     [self.client getCompletionStatusOfCheckoutURL:url completion:^(BUYStatus status, NSError *error) {
         
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-
+        
         if (error == nil && status == BUYStatusComplete) {
             NSLog(@"Successfully completed checkout");
-            [welf getCompletedCheckout];
+            [welf getCompletedCheckout:^{
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self showCheckoutConfirmation];
+                });
+            }];
         }
         else {
             NSLog(@"Error completing checkout: %@", error);
         }
     }];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:CheckoutCallbackNotification object:nil];
 }
 
-- (void)getCompletedCheckout
+- (void)getCompletedCheckout:(void (^)(void))completionBlock
 {
     __weak CheckoutViewController *welf = self;
     
@@ -394,9 +415,12 @@ NSString * const MerchantId = @"";
         }
         if (checkout) {
             welf.checkout = checkout;
-            [welf showCheckoutConfirmation];
             NSLog(@"%@", checkout);
         }
+        
+        if (completionBlock) {
+            completionBlock();
+        }
     }];
 }