Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use STPAPIClient.shared by default #1469

Merged
merged 13 commits into from
Jan 22, 2020
Merged

Use STPAPIClient.shared by default #1469

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0620281
Fix typo in STPCustomerContext
yuki-stripe Dec 17, 2019
5f33a47
Make STPCustomerContext use STPAPIClient.shared instead of initing a …
yuki-stripe Dec 18, 2019
cf8da80
Refactor to pass addt'l, overwriting authorization header from APICli…
yuki-stripe Jan 7, 2020
af876b1
Update tests
yuki-stripe Jan 7, 2020
af707ae
Refactor PinManagementService, PushProvisioningContext to use APIClie…
yuki-stripe Jan 7, 2020
9401876
Fix STPPushProvisioningDetailsFunctionalTest
yuki-stripe Jan 7, 2020
a5f9a24
Remove unused apiClient from STPPaymentOptionsViewController
yuki-stripe Jan 9, 2020
fbb0842
Switch APIClient(withConfig:) to APIClient.shared in AddCardVC, BankS…
yuki-stripe Jan 10, 2020
4afca06
Switch APIClient(publishableKey:) to APIClient.shared in PaymentContext
yuki-stripe Jan 10, 2020
ce8739d
Make api client properties public and document that they default to […
yuki-stripe Jan 10, 2020
8d2f86b
Refactor Customer APIs to be instance methods, expose apiClient prope…
yuki-stripe Jan 10, 2020
4935914
Add apiClient to PaymentOptionsVC, PaymentOptionsInternalVC. Even th…
yuki-stripe Jan 14, 2020
ae32e57
Add nullability to STPAPIRequest.h
yuki-stripe Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions Stripe/STPAPIClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ @interface STPAPIClient()

@property (nonatomic, strong, readwrite) NSMutableDictionary<NSString *,NSObject *> *sourcePollers;
@property (nonatomic, strong, readwrite) dispatch_queue_t sourcePollersQueue;
@property (nonatomic, strong, readwrite) STPEphemeralKey *ephemeralKey;
/// If YES, the ephemeralKey will be sent as the authorization bearer for the next API request
@property (nonatomic, assign, readwrite) BOOL useEphemeralKeyForNextRequest;
@property (nonatomic, strong, readwrite) NSString *apiKey;

// See STPAPIClient+Private.h
Expand Down Expand Up @@ -163,7 +166,12 @@ - (NSMutableURLRequest *)configuredRequestForURL:(NSURL *)url {
NSMutableDictionary *additionalHeaders = [NSMutableDictionary new];
additionalHeaders[@"X-Stripe-User-Agent"] = [self.class stripeUserAgentDetailsWithAppInfo:self.appInfo];
additionalHeaders[@"Stripe-Version"] = APIVersion;
additionalHeaders[@"Authorization"] = [@"Bearer " stringByAppendingString:self.apiKey ?: @""];
NSString *authorizationBearer = self.apiKey ?: @"";
if (self.useEphemeralKeyForNextRequest && self.ephemeralKey.secret) {
self.useEphemeralKeyForNextRequest = NO;
yuki-stripe marked this conversation as resolved.
Show resolved Hide resolved
authorizationBearer = self.ephemeralKey.secret;
}
additionalHeaders[@"Authorization"] = [@"Bearer " stringByAppendingString:authorizationBearer];
additionalHeaders[@"Stripe-Account"] = self.stripeAccount;
return [additionalHeaders copy];
}
Expand Down Expand Up @@ -538,8 +546,9 @@ - (void)stopPollingSourceWithId:(NSString *)identifier {
@implementation STPAPIClient (Customers)

+ (STPAPIClient *)apiClientWithEphemeralKey:(STPEphemeralKey *)key {
STPAPIClient *client = [[self alloc] init];
client.apiKey = key.secret;
STPAPIClient *client = [STPAPIClient sharedClient];
client.ephemeralKey = key;
client.useEphemeralKeyForNextRequest = YES;
return client;
}

Expand Down
1 change: 0 additions & 1 deletion Stripe/STPCustomerContext.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

@interface STPCustomerContext ()

@property (nonatomic) STPAPIClient *apiClient;
@property (nonatomic) STPCustomer *customer;
@property (nonatomic) NSDate *customerRetrievedDate;
@property (nonatomic, copy) NSArray<STPPaymentMethod *> *paymentMethods;
Expand Down