Merge pull request #878 from stripe/bg-redirectcontext-chargeable

update RedirectContext to accept pending or chargeable sources
stripe · Jan 5, 2018 · 6521f67 · 6521f67
2 parents ce14914 + ebce801
commit 6521f67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Stripe/STPRedirectContext.m b/Stripe/STPRedirectContext.m
@@ -36,7 +36,8 @@ - (nullable instancetype)initWithSource:(STPSource *)source
                              completion:(STPRedirectContextCompletionBlock)completion {
 
     if (source.flow != STPSourceFlowRedirect
-        || source.status != STPSourceStatusPending
+        || !(source.status == STPSourceStatusPending ||
+             source.status == STPSourceStatusChargeable)
         || source.redirect.returnURL == nil
         || (source.redirect.url == nil
             && [self nativeRedirectURLForSource:source] == nil)) {

diff --git a/Tests/Tests/STPRedirectContextTest.m b/Tests/Tests/STPRedirectContextTest.m
@@ -12,6 +12,7 @@
 #import "NSURLComponents+Stripe.h"
 #import "STPFixtures.h"
 #import "STPRedirectContext.h"
+#import "STPTestUtils.h"
 #import "STPURLCallbackHandler.h"
 #import "STPWeakStrongMacros.h"
 
@@ -66,6 +67,16 @@ - (void)testInitWithNonRedirectSourceReturnsNil {
     XCTAssertNil(sut);
 }
 
+- (void)testInitWithConsumedSourceReturnsNil {
+    NSMutableDictionary *json = [[STPTestUtils jsonNamed:STPTestJSONSourceCard] mutableCopy];
+    json[@"status"] = @"consumed";
+    STPSource *source = [STPSource decodedObjectFromAPIResponse:json];
+    STPRedirectContext *sut = [[STPRedirectContext alloc] initWithSource:source completion:^(__unused NSString *sourceID, __unused NSString *clientSecret, __unused NSError *error) {
+        XCTFail(@"completion was called");
+    }];
+    XCTAssertNil(sut);
+}
+
 /**
  After starting a SafariViewController redirect flow,
  when a WillEnterForeground notification is posted, RedirectContext's completion