Skip to content

S
shopify_iossdk
Commit 67665b95 by Dima Bart
Options

Rename to BUYPaymentToken protocol and associated classes.

parent cce5f56f
Showing with 50 additions and 61 deletions
Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj
...@@ -401,14 +401,14 @@ ...@@ -401,14 +401,14 @@
90F5930B1B0D5F4C0026B382 /* BUYObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F592FF1B0D5F4C0026B382 /* BUYObjectTests.m */; }; 90F5930B1B0D5F4C0026B382 /* BUYObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F592FF1B0D5F4C0026B382 /* BUYObjectTests.m */; };
9A102D1B1CDD1F960026CC43 /* BUYErrorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A102D1A1CDD1F960026CC43 /* BUYErrorTests.m */; }; 9A102D1B1CDD1F960026CC43 /* BUYErrorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A102D1A1CDD1F960026CC43 /* BUYErrorTests.m */; };
9A102D1E1CDD25980026CC43 /* BUYOptionValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A102D1D1CDD25980026CC43 /* BUYOptionValueTests.m */; }; 9A102D1E1CDD25980026CC43 /* BUYOptionValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A102D1D1CDD25980026CC43 /* BUYOptionValueTests.m */; };
9A47CEFD1CE39F6000A6D5BA /* BUYCreditCardSessionProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.m */; }; 9A47CEFD1CE39F6000A6D5BA /* BUYCreditCardToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardToken.m */; };
9A47CEFE1CE39F6100A6D5BA /* BUYCreditCardSessionProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.m */; }; 9A47CEFE1CE39F6100A6D5BA /* BUYCreditCardToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardToken.m */; };
9A47CEFF1CE39F6400A6D5BA /* BUYCreditCardSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.h */; }; 9A47CEFF1CE39F6400A6D5BA /* BUYCreditCardToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardToken.h */; };
9A47CF001CE39F6400A6D5BA /* BUYCreditCardSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.h */; }; 9A47CF001CE39F6400A6D5BA /* BUYCreditCardToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardToken.h */; };
9A47CF031CE3A24600A6D5BA /* BUYApplePaySessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF011CE3A24600A6D5BA /* BUYApplePaySessionProvider.h */; }; 9A47CF031CE3A24600A6D5BA /* BUYApplePayToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF011CE3A24600A6D5BA /* BUYApplePayToken.h */; };
9A47CF041CE3A24600A6D5BA /* BUYApplePaySessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF011CE3A24600A6D5BA /* BUYApplePaySessionProvider.h */; }; 9A47CF041CE3A24600A6D5BA /* BUYApplePayToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CF011CE3A24600A6D5BA /* BUYApplePayToken.h */; };
9A47CF051CE3A24600A6D5BA /* BUYApplePaySessionProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CF021CE3A24600A6D5BA /* BUYApplePaySessionProvider.m */; }; 9A47CF051CE3A24600A6D5BA /* BUYApplePayToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CF021CE3A24600A6D5BA /* BUYApplePayToken.m */; };
9A47CF061CE3A24600A6D5BA /* BUYApplePaySessionProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CF021CE3A24600A6D5BA /* BUYApplePaySessionProvider.m */; }; 9A47CF061CE3A24600A6D5BA /* BUYApplePayToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A47CF021CE3A24600A6D5BA /* BUYApplePayToken.m */; };
9A47CF071CE3ACE000A6D5BA /* BUYPaymentSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A47CF071CE3ACE000A6D5BA /* BUYPaymentSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
9A47CF081CE3ACE100A6D5BA /* BUYPaymentSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A47CF081CE3ACE100A6D5BA /* BUYPaymentSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
9A6B03791CDA5D4F0054C26E /* BUYAccountCredentialsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */; }; 9A6B03791CDA5D4F0054C26E /* BUYAccountCredentialsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */; };
...@@ -748,10 +748,10 @@ ...@@ -748,10 +748,10 @@
9A102D1A1CDD1F960026CC43 /* BUYErrorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYErrorTests.m; sourceTree = "<group>"; }; 9A102D1A1CDD1F960026CC43 /* BUYErrorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYErrorTests.m; sourceTree = "<group>"; };
9A102D1D1CDD25980026CC43 /* BUYOptionValueTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionValueTests.m; sourceTree = "<group>"; }; 9A102D1D1CDD25980026CC43 /* BUYOptionValueTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionValueTests.m; sourceTree = "<group>"; };
9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BUYPaymentSessionProvider.h; sourceTree = "<group>"; }; 9A47CEF81CE39EC200A6D5BA /* BUYPaymentSessionProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BUYPaymentSessionProvider.h; sourceTree = "<group>"; };
9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCreditCardSessionProvider.h; sourceTree = "<group>"; }; 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCreditCardToken.h; sourceTree = "<group>"; };
9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYCreditCardSessionProvider.m; sourceTree = "<group>"; }; 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYCreditCardToken.m; sourceTree = "<group>"; };
9A47CF011CE3A24600A6D5BA /* BUYApplePaySessionProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYApplePaySessionProvider.h; sourceTree = "<group>"; }; 9A47CF011CE3A24600A6D5BA /* BUYApplePayToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYApplePayToken.h; sourceTree = "<group>"; };
9A47CF021CE3A24600A6D5BA /* BUYApplePaySessionProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYApplePaySessionProvider.m; sourceTree = "<group>"; }; 9A47CF021CE3A24600A6D5BA /* BUYApplePayToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYApplePayToken.m; sourceTree = "<group>"; };
9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYAccountCredentialsTests.m; sourceTree = "<group>"; }; 9A6B03781CDA5D4F0054C26E /* BUYAccountCredentialsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYAccountCredentialsTests.m; sourceTree = "<group>"; };
BE1007991B6165EC0031CEE7 /* BUYOptionValueCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYOptionValueCell.h; sourceTree = "<group>"; }; BE1007991B6165EC0031CEE7 /* BUYOptionValueCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYOptionValueCell.h; sourceTree = "<group>"; };
BE10079A1B6165EC0031CEE7 /* BUYOptionValueCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionValueCell.m; sourceTree = "<group>"; }; BE10079A1B6165EC0031CEE7 /* BUYOptionValueCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionValueCell.m; sourceTree = "<group>"; };
...@@ -1150,10 +1150,10 @@ ...@@ -1150,10 +1150,10 @@
9A47CEF91CE39F1F00A6D5BA /* Payment Session Providers */ = { 9A47CEF91CE39F1F00A6D5BA /* Payment Session Providers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.h */, 9A47CEFA1CE39F5B00A6D5BA /* BUYCreditCardToken.h */,
9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardSessionProvider.m */, 9A47CEFB1CE39F5B00A6D5BA /* BUYCreditCardToken.m */,
9A47CF011CE3A24600A6D5BA /* BUYApplePaySessionProvider.h */, 9A47CF011CE3A24600A6D5BA /* BUYApplePayToken.h */,
9A47CF021CE3A24600A6D5BA /* BUYApplePaySessionProvider.m */, 9A47CF021CE3A24600A6D5BA /* BUYApplePayToken.m */,
); );
name = "Payment Session Providers"; name = "Payment Session Providers";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1388,7 +1388,7 @@ ...@@ -1388,7 +1388,7 @@
841ADE101CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */, 841ADE101CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */,
841ADE1C1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */, 841ADE1C1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */,
841ADE181CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */, 841ADE181CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */,
9A47CEFF1CE39F6400A6D5BA /* BUYCreditCardSessionProvider.h in Headers */, 9A47CEFF1CE39F6400A6D5BA /* BUYCreditCardToken.h in Headers */,
841ADE0C1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */, 841ADE0C1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */,
84980F331CB75C2900CFAB58 /* NSEntityDescription+BUYAdditions.h in Headers */, 84980F331CB75C2900CFAB58 /* NSEntityDescription+BUYAdditions.h in Headers */,
901931491BC5B9BC00D1134E /* BUYGiftCard.h in Headers */, 901931491BC5B9BC00D1134E /* BUYGiftCard.h in Headers */,
...@@ -1427,7 +1427,7 @@ ...@@ -1427,7 +1427,7 @@
901931681BC5B9BC00D1134E /* BUYProductViewController.h in Headers */, 901931681BC5B9BC00D1134E /* BUYProductViewController.h in Headers */,
901931691BC5B9BC00D1134E /* BUYProduct.h in Headers */, 901931691BC5B9BC00D1134E /* BUYProduct.h in Headers */,
9019316A1BC5B9BC00D1134E /* BUYSerializable.h in Headers */, 9019316A1BC5B9BC00D1134E /* BUYSerializable.h in Headers */,
9A47CF041CE3A24600A6D5BA /* BUYApplePaySessionProvider.h in Headers */, 9A47CF041CE3A24600A6D5BA /* BUYApplePayToken.h in Headers */,
9019316B1BC5B9BC00D1134E /* BUYProductVariant.h in Headers */, 9019316B1BC5B9BC00D1134E /* BUYProductVariant.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -1505,7 +1505,7 @@ ...@@ -1505,7 +1505,7 @@
841ADDFF1CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */, 841ADDFF1CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */,
841ADE1B1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */, 841ADE1B1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */,
841ADE171CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */, 841ADE171CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */,
9A47CF001CE39F6400A6D5BA /* BUYCreditCardSessionProvider.h in Headers */, 9A47CF001CE39F6400A6D5BA /* BUYCreditCardToken.h in Headers */,
841ADE0B1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */, 841ADE0B1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */,
84980F321CB75C2900CFAB58 /* NSEntityDescription+BUYAdditions.h in Headers */, 84980F321CB75C2900CFAB58 /* NSEntityDescription+BUYAdditions.h in Headers */,
BE9A64571B503CCC0033E558 /* BUYGiftCard.h in Headers */, BE9A64571B503CCC0033E558 /* BUYGiftCard.h in Headers */,
...@@ -1544,7 +1544,7 @@ ...@@ -1544,7 +1544,7 @@
BEB74A2D1B554E870005A300 /* BUYProductViewController.h in Headers */, BEB74A2D1B554E870005A300 /* BUYProductViewController.h in Headers */,
BE9A64611B503CEF0033E558 /* BUYProduct.h in Headers */, BE9A64611B503CEF0033E558 /* BUYProduct.h in Headers */,
BE9A64651B503CFE0033E558 /* BUYSerializable.h in Headers */, BE9A64651B503CFE0033E558 /* BUYSerializable.h in Headers */,
9A47CF031CE3A24600A6D5BA /* BUYApplePaySessionProvider.h in Headers */, 9A47CF031CE3A24600A6D5BA /* BUYApplePayToken.h in Headers */,
BE9A64631B503CF70033E558 /* BUYProductVariant.h in Headers */, BE9A64631B503CF70033E558 /* BUYProductVariant.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -1765,7 +1765,7 @@ ...@@ -1765,7 +1765,7 @@
901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */, 901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */,
901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */, 901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */,
901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */, 901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */,
9A47CEFE1CE39F6100A6D5BA /* BUYCreditCardSessionProvider.m in Sources */, 9A47CEFE1CE39F6100A6D5BA /* BUYCreditCardToken.m in Sources */,
901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */, 901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */,
901930F41BC5B9BC00D1134E /* BUYProductViewHeaderBackgroundImageView.m in Sources */, 901930F41BC5B9BC00D1134E /* BUYProductViewHeaderBackgroundImageView.m in Sources */,
901930F51BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.m in Sources */, 901930F51BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.m in Sources */,
...@@ -1799,7 +1799,7 @@ ...@@ -1799,7 +1799,7 @@
84DD12C21CC63FEE00A2442D /* _BUYCheckout.m in Sources */, 84DD12C21CC63FEE00A2442D /* _BUYCheckout.m in Sources */,
901931091BC5B9BC00D1134E /* BUYCart.m in Sources */, 901931091BC5B9BC00D1134E /* BUYCart.m in Sources */,
9019310A1BC5B9BC00D1134E /* BUYPaymentButton.m in Sources */, 9019310A1BC5B9BC00D1134E /* BUYPaymentButton.m in Sources */,
9A47CF061CE3A24600A6D5BA /* BUYApplePaySessionProvider.m in Sources */, 9A47CF061CE3A24600A6D5BA /* BUYApplePayToken.m in Sources */,
84D915521CC03F1600D334FB /* BUYModelManager.m in Sources */, 84D915521CC03F1600D334FB /* BUYModelManager.m in Sources */,
84DD129C1CC63FE600A2442D /* _BUYCartLineItem.m in Sources */, 84DD129C1CC63FE600A2442D /* _BUYCartLineItem.m in Sources */,
841ADE121CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */, 841ADE121CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */,
...@@ -1917,7 +1917,7 @@ ...@@ -1917,7 +1917,7 @@
BEB74A741B5564380005A300 /* BUYProductViewHeader.m in Sources */, BEB74A741B5564380005A300 /* BUYProductViewHeader.m in Sources */,
BEB74A681B55640F0005A300 /* BUYNavigationController.m in Sources */, BEB74A681B55640F0005A300 /* BUYNavigationController.m in Sources */,
BEB74A7E1B5564890005A300 /* BUYVariantSelectionViewController.m in Sources */, BEB74A7E1B5564890005A300 /* BUYVariantSelectionViewController.m in Sources */,
9A47CEFD1CE39F6000A6D5BA /* BUYCreditCardSessionProvider.m in Sources */, 9A47CEFD1CE39F6000A6D5BA /* BUYCreditCardToken.m in Sources */,
90E83BC51B9F550E00C95A1B /* BUYOrder.m in Sources */, 90E83BC51B9F550E00C95A1B /* BUYOrder.m in Sources */,
BEB74A761B55643E0005A300 /* BUYProductViewHeaderBackgroundImageView.m in Sources */, BEB74A761B55643E0005A300 /* BUYProductViewHeaderBackgroundImageView.m in Sources */,
9078749A1B7276BA0023775B /* BUYProductViewHeaderOverlay.m in Sources */, 9078749A1B7276BA0023775B /* BUYProductViewHeaderOverlay.m in Sources */,
...@@ -1951,7 +1951,7 @@ ...@@ -1951,7 +1951,7 @@
84DD12B41CC63FEE00A2442D /* _BUYCheckout.m in Sources */, 84DD12B41CC63FEE00A2442D /* _BUYCheckout.m in Sources */,
BE9A644A1B503C980033E558 /* BUYCart.m in Sources */, BE9A644A1B503C980033E558 /* BUYCart.m in Sources */,
BE9A64831B503DB10033E558 /* BUYPaymentButton.m in Sources */, BE9A64831B503DB10033E558 /* BUYPaymentButton.m in Sources */,
9A47CF051CE3A24600A6D5BA /* BUYApplePaySessionProvider.m in Sources */, 9A47CF051CE3A24600A6D5BA /* BUYApplePayToken.m in Sources */,
84D915511CC03F1600D334FB /* BUYModelManager.m in Sources */, 84D915511CC03F1600D334FB /* BUYModelManager.m in Sources */,
84DD12841CC63FE600A2442D /* _BUYCartLineItem.m in Sources */, 84DD12841CC63FE600A2442D /* _BUYCartLineItem.m in Sources */,
841ADE111CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */, 841ADE111CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */,
......
Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient.h
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
@class BUYOrder; @class BUYOrder;
@class BUYModelManager; @class BUYModelManager;
@protocol BUYPaymentSessionProvider; @protocol BUYPaymentToken;
/** /**
* The sort order for products in a collection * The sort order for products in a collection
...@@ -119,10 +119,10 @@ typedef NS_ENUM(NSUInteger, BUYStatus) { ...@@ -119,10 +119,10 @@ typedef NS_ENUM(NSUInteger, BUYStatus) {
* Return block containing a BUYCheckout, id<BUYPaymentSessionProvider> and/or an NSError * Return block containing a BUYCheckout, id<BUYPaymentSessionProvider> and/or an NSError
* *
* @param checkout The returned BUYCheckout * @param checkout The returned BUYCheckout
* @param sessionProvider An opaque session provider type that wraps necessary credentials for payment * @param paymentToken An opaque payment token type that wraps necessary credentials for payment
* @param error Optional NSError * @param error Optional NSError
*/ */
typedef void (^BUYDataCreditCardBlock)(BUYCheckout *checkout, id<BUYPaymentSessionProvider> sessionProvider, NSError *error); typedef void (^BUYDataCreditCardBlock)(BUYCheckout *checkout, id<BUYPaymentToken> paymentToken, NSError *error);
/** /**
* Return block containing a BUYCheckout and/or an NSError * Return block containing a BUYCheckout and/or an NSError
...@@ -454,11 +454,12 @@ typedef void (^BUYDataGiftCardBlock)(BUYGiftCard *giftCard, NSError *error); ...@@ -454,11 +454,12 @@ typedef void (^BUYDataGiftCardBlock)(BUYGiftCard *giftCard, NSError *error);
* We recommended using the BUYCheckout returned in the block. * We recommended using the BUYCheckout returned in the block.
* *
* @param checkout The BUYCheckout to complete * @param checkout The BUYCheckout to complete
* @param paymentToken Opaque payment token object
* @param block (^BUYDataCheckoutBlock)(BUYCheckout *checkout, NSError *error); * @param block (^BUYDataCheckoutBlock)(BUYCheckout *checkout, NSError *error);
* *
* @return The associated NSURLSessionDataTask * @return The associated NSURLSessionDataTask
*/ */
- (NSURLSessionDataTask*)completeCheckout:(BUYCheckout *)checkout sessionProvider:(id<BUYPaymentSessionProvider>)sessionProvider completion:(BUYDataCheckoutBlock)block; - (NSURLSessionDataTask*)completeCheckout:(BUYCheckout *)checkout paymentToken:(id<BUYPaymentToken>)paymentToken completion:(BUYDataCheckoutBlock)block;
/** /**
* Retrieve the status of a BUYCheckout. This checks the status of the current payment processing job for the provided checkout. * Retrieve the status of a BUYCheckout. This checks the status of the current payment processing job for the provided checkout.
......
Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient.m
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#import "BUYCart.h" #import "BUYCart.h"
#import "BUYCheckout.h" #import "BUYCheckout.h"
#import "BUYCreditCard.h" #import "BUYCreditCard.h"
#import "BUYCreditCardSessionProvider.h" #import "BUYCreditCardToken.h"
#import "BUYCollection.h" #import "BUYCollection.h"
#import "BUYError.h" #import "BUYError.h"
#import "BUYGiftCard.h" #import "BUYGiftCard.h"
...@@ -441,10 +441,9 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token ...@@ -441,10 +441,9 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token
return task; return task;
} }
- (NSURLSessionDataTask*)completeCheckout:(BUYCheckout *)checkout sessionProvider:(id<BUYPaymentSessionProvider>)sessionProvider completion:(BUYDataCheckoutBlock)block - (NSURLSessionDataTask*)completeCheckout:(BUYCheckout *)checkout paymentToken:(id<BUYPaymentToken>)paymentToken completion:(BUYDataCheckoutBlock)block
{ {
NSAssert(sessionProvider, @"Failed to complete checkout. BUYPaymentSessionProvider must not be nil."); NSAssert(checkout, @"Failed to complete checkout. Checkout must not be nil");
NSAssert(checkout, @"Failed to complete checkout. BUYCheckout must not be nil");
NSURLSessionDataTask *task = nil; NSURLSessionDataTask *task = nil;
...@@ -453,8 +452,8 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token ...@@ -453,8 +452,8 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token
BOOL isFree = (checkout.paymentDue && checkout.paymentDue.floatValue == 0); BOOL isFree = (checkout.paymentDue && checkout.paymentDue.floatValue == 0);
NSData *data = nil; NSData *data = nil;
if ([sessionProvider hasPaymentSessionID]) { if (paymentToken) {
data = [NSJSONSerialization dataWithJSONObject:[sessionProvider jsonRepresentation] options:0 error:nil]; data = [NSJSONSerialization dataWithJSONObject:[paymentToken jsonRepresentation] options:0 error:nil];
} }
if (data || isFree) { if (data || isFree) {
...@@ -563,7 +562,7 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token ...@@ -563,7 +562,7 @@ NSString *const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token
NSData *data = [NSJSONSerialization dataWithJSONObject:@{ @"checkout" : json } options:0 error:nil]; NSData *data = [NSJSONSerialization dataWithJSONObject:@{ @"checkout" : json } options:0 error:nil];
if (data) { if (data) {
return [self postPaymentRequestWithCheckout:checkout body:data completion:^(BUYCheckout *checkout, NSString *paymentSessionId, NSError *error) { return [self postPaymentRequestWithCheckout:checkout body:data completion:^(BUYCheckout *checkout, NSString *paymentSessionId, NSError *error) {
id<BUYPaymentSessionProvider> provider = [[BUYCreditCardSessionProvider alloc] initWithPaymentSessionID:paymentSessionId]; id<BUYPaymentToken> provider = [[BUYCreditCardToken alloc] initWithPaymentSessionID:paymentSessionId];
completion(checkout, provider, error); completion(checkout, provider, error);
}]; }];
......
Mobile Buy SDK/Mobile Buy SDK/Models/BUYApplePaySessionProvider.h → Mobile Buy SDK/Mobile Buy SDK/Models/BUYApplePayToken.h
// //
// BUYApplePaySessionProvider.h // BUYApplePayToken.h
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
@class PKPaymentToken; @class PKPaymentToken;
@interface BUYApplePaySessionProvider : NSObject <BUYPaymentSessionProvider> @interface BUYApplePayToken : NSObject <BUYPaymentToken>
@property (nonatomic, strong, readonly) PKPaymentToken *paymentToken; @property (nonatomic, strong, readonly) PKPaymentToken *paymentToken;
......
Mobile Buy SDK/Mobile Buy SDK/Models/BUYApplePaySessionProvider.m → Mobile Buy SDK/Mobile Buy SDK/Models/BUYApplePayToken.m
// //
// BUYApplePaySessionProvider.m // BUYApplePayToken.m
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#import <PassKit/PassKit.h> #import <PassKit/PassKit.h>
#endif #endif
#import "BUYApplePaySessionProvider.h" #import "BUYApplePayToken.h"
@implementation BUYApplePaySessionProvider @implementation BUYApplePayToken
#pragma mark - Init - #pragma mark - Init -
...@@ -49,11 +49,6 @@ ...@@ -49,11 +49,6 @@
#pragma mark - BUYPaymentSessionProvider - #pragma mark - BUYPaymentSessionProvider -
- (BOOL)hasPaymentSessionID
{
return self.paymentToken.paymentData.length > 0;
}
- (NSDictionary *)jsonRepresentation - (NSDictionary *)jsonRepresentation
{ {
return @{ return @{
......
Mobile Buy SDK/Mobile Buy SDK/Models/BUYCreditCardSessionProvider.h → Mobile Buy SDK/Mobile Buy SDK/Models/BUYCreditCardToken.h
// //
// BUYCreditCardSessionProvider.h // BUYCreditCardToken.h
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYPaymentSessionProvider.h" #import "BUYPaymentSessionProvider.h"
@interface BUYCreditCardSessionProvider : NSObject <BUYPaymentSessionProvider> @interface BUYCreditCardToken : NSObject <BUYPaymentToken>
@property (nonatomic, strong, readonly) NSString *paymentSessionID; @property (nonatomic, strong, readonly) NSString *paymentSessionID;
......
Mobile Buy SDK/Mobile Buy SDK/Models/BUYCreditCardSessionProvider.m → Mobile Buy SDK/Mobile Buy SDK/Models/BUYCreditCardToken.m
// //
// BUYCreditCardSessionProvider.m // BUYCreditCardToken.m
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYCreditCardSessionProvider.h" #import "BUYCreditCardToken.h"
@implementation BUYCreditCardSessionProvider @implementation BUYCreditCardToken
#pragma mark - Init - #pragma mark - Init -
...@@ -41,11 +41,6 @@ ...@@ -41,11 +41,6 @@
#pragma mark - BUYPaymentSessionProvider - #pragma mark - BUYPaymentSessionProvider -
- (BOOL)hasPaymentSessionID
{
return self.paymentSessionID.length > 0;
}
- (NSDictionary *)jsonRepresentation - (NSDictionary *)jsonRepresentation
{ {
return @{ return @{
......
Mobile Buy SDK/Mobile Buy SDK/Models/BUYPaymentSessionProvider.h
// //
// BUYPaymentSessionProvider.h // BUYPaymentToken.h
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
@protocol BUYPaymentSessionProvider <NSObject> @protocol BUYPaymentToken <NSObject>
- (BOOL)hasPaymentSessionID;
- (NSDictionary *)jsonRepresentation; - (NSDictionary *)jsonRepresentation;
@end @end
Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#import "BUYModelManager.h" #import "BUYModelManager.h"
#import "BUYShop.h" #import "BUYShop.h"
#import "BUYShopifyErrorCodes.h" #import "BUYShopifyErrorCodes.h"
#import "BUYApplePaySessionProvider.h" #import "BUYApplePayToken.h"
const NSTimeInterval PollDelay = 0.5; const NSTimeInterval PollDelay = 0.5;
...@@ -114,10 +114,10 @@ const NSTimeInterval PollDelay = 0.5; ...@@ -114,10 +114,10 @@ const NSTimeInterval PollDelay = 0.5;
if (checkout && error == nil) { if (checkout && error == nil) {
self.checkout = checkout; self.checkout = checkout;
id<BUYPaymentSessionProvider> provider = [[BUYApplePaySessionProvider alloc] initWithPaymentToken:payment.token]; id<BUYPaymentToken> token = [[BUYApplePayToken alloc] initWithPaymentToken:payment.token];
//Now that the checkout is up to date, call complete. //Now that the checkout is up to date, call complete.
[self.client completeCheckout:checkout sessionProvider:provider completion:^(BUYCheckout *checkout, NSError *error) { [self.client completeCheckout:checkout paymentToken:token completion:^(BUYCheckout *checkout, NSError *error) {
if (checkout && error == nil) { if (checkout && error == nil) {
self.checkout = checkout; self.checkout = checkout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment