Merge branch 'master' into develop

Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest.m

@@ -101,6 +101,8 @@
 {
 	BUYCart *cart = [[BUYCart alloc] init];
 	BUYCheckout *checkout = [[BUYCheckout alloc] initWithCart:cart];
+	
+	XCTAssertThrows([checkout setPartialAddresses:NO]);
 
 	NSURLSessionDataTask *task = [self.client createCheckout:checkout completion:nil];
 	NSDictionary *json = [NSJSONSerialization JSONObjectWithData:task.originalRequest.HTTPBody options:0 error:nil];

Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj

@@ -1372,7 +1372,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1.2.2;
+				CURRENT_PROJECT_VERSION = 1.2.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1404,7 +1404,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.2.2;
+				CURRENT_PROJECT_VERSION = 1.2.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1524,7 +1524,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1.2.2;
+				CURRENT_PROJECT_VERSION = 1.2.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1556,7 +1556,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.2.2;
+				CURRENT_PROJECT_VERSION = 1.2.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;

Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient.m

@@ -53,7 +53,7 @@
 #define kMinSuccessfulStatusCode 200
 #define kMaxSuccessfulStatusCode 299
 
-NSString * const BUYVersionString = @"1.2.2";
+NSString * const BUYVersionString = @"1.2.3";
 
 @interface BUYClient () <NSURLSessionDelegate>
 

Mobile Buy SDK/Mobile Buy SDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h

@@ -250,6 +250,8 @@
 
 /**
  *  Flag used to inform server that the shipping address is partially filled, suitable to retrieve shipping rates
+ *  with partial shipping addresses provided by PKPaymentAuthorizationViewController.
+ *  Note: This should only ever be set to YES. Setting it to NO throws an exception.
  */
 @property (nonatomic, assign) BOOL partialAddresses;
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m

@@ -202,6 +202,14 @@
 	return @{ @"checkout" : json };
 }
 
+-(void)setPartialAddresses:(BOOL)partialAddresses
+{
+	if (partialAddresses == NO) {
+		@throw [NSException exceptionWithName:@"partialAddress" reason:@"partialAddresses can only be set to true and should never be set to false on a complete address" userInfo:nil];
+	}
+	_partialAddresses = partialAddresses;
+}
+
 - (BOOL)hasToken
 {
 	return (_token && [_token length] > 0);

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m

@@ -89,8 +89,7 @@ const NSTimeInterval PollDelay = 0.5;
 {
 	// Update the checkout with the rest of the information. Apple has now provided us with a FULL billing address and a FULL shipping address.
 	// We now update the checkout with our new found data so that you can ship the products to the right address, and we collect whatever else we need.
-	
-	self.checkout.partialAddresses = NO;
+
 	if ([payment respondsToSelector:@selector(shippingContact)]) {
 		self.checkout.email = payment.shippingContact.emailAddress;
 		self.checkout.shippingAddress = self.checkout.requiresShipping ? [BUYAddress buy_addressFromContact:payment.shippingContact] : nil;
@@ -165,8 +164,13 @@ const NSTimeInterval PollDelay = 0.5;
 #pragma mark -
 
 - (void)updateCheckoutWithAddressCompletion:(void (^)(PKPaymentAuthorizationStatus, NSArray *shippingMethods, NSArray *summaryItems))completion
-{	
-	self.checkout.partialAddresses = [self.checkout.shippingAddress isPartialAddress];
+{
+	// This method call is internal to selection of shipping address that are returned as partial from PKPaymentAuthorizationViewController
+	// However, to ensure we never set partialAddresses to NO, we want to guard the setter. Should PKPaymentAuthorizationViewController ever
+	// return a full address through it's delegate method, this will still function since a complete address can be used to calculate shipping rates
+	if ([self.checkout.shippingAddress isPartialAddress] == YES) {
+		self.checkout.partialAddresses = YES;
+	}
 	
 	if ([self.checkout.shippingAddress isValidAddressForShippingRates]) {
 		

Mobile-Buy-SDK.podspec

 Pod::Spec.new do |s|
   s.name         = 'Mobile-Buy-SDK'
-  s.version      = '1.2.2'
+  s.version      = '1.2.3'
   s.summary      = 'Sell with Shopify in iOS apps'
   s.description  = 'Shopify’s Mobile Buy SDK makes it simple to sell physical products inside your mobile app. With a few lines of code, you can connect your app with the Shopify platform and let your users buy your products using Apple Pay or their credit card.'
   s.homepage     = 'https://developers.shopify.com/mobile-buy-sdk'