Increased version to 2.2.1

Updated SKD with fixed warnings in headers.

MobilePay-AppSwitch-SDK.podspec

@@ -1,17 +1,18 @@
 Pod::Spec.new do |spec|
     spec.name                 = 'MobilePay-AppSwitch-SDK'
-    spec.version              = '2.2.0'
+    spec.version              = '2.2.1'
     spec.license              = { :type => 'MobilePay License Terms', :file => 'LICENSE' }
     spec.homepage             = 'http://www.mobilepay.dk/da-dk/erhverv/Pages/mobilepay-appswitch.aspx'
     spec.authors              = { 'MobilePay' => '[email protected]' }
     spec.summary              = 'MobilePay-AppSwitch-SDK'
     spec.description          = 'The MobilePay SDK enables your app to receive payments through the MobilePay app.'
-    spec.source               = { :git => 'https://github.com/MobilePayDev/MobilePay-AppSwitch-SDK.git', :tag => '2.2.0' }
-    spec.source_files         = 'sdk/iOS/2.2.0/MobilePayManager/*.{h}'
-    spec.public_header_files  = 'sdk/iOS/2.2.0/MobilePayManager/*.{h}'
-    spec.vendored_libraries   = 'sdk/iOS/2.2.0/MobilePayManager/*.{a}'
+    spec.source               = { :git => 'https://github.com/MobilePayDev/MobilePay-AppSwitch-SDK.git', :tag => '2.2.1' }
+    spec.source_files         = 'sdk/iOS/2.2.1/MobilePayManager/*.{h}'
+    spec.public_header_files  = 'sdk/iOS/2.2.1/MobilePayManager/*.{h}'
+    spec.vendored_libraries   = 'sdk/iOS/2.2.1/MobilePayManager/*.{a}'
     spec.documentation_url    = 'https://github.com/MobilePayDev/MobilePay-AppSwitch-SDK/wiki'
     spec.platform             = :ios
+    spec.ios.deployment_target  = '9.0'
     spec.requires_arc         = true
   end
 

sdk/iOS/2.2.1/MobilePayManager/MobilePayCancelledPayment.h

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+
+@interface MobilePayCancelledPayment : NSObject
+
+@property (nonatomic, strong, readonly, nullable) NSString *orderId;
+
+- (nonnull instancetype)initWithOrderId:(nullable NSString *)orderId;
+
+@end

sdk/iOS/2.2.1/MobilePayManager/MobilePayErrorPayment.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+@interface MobilePayErrorPayment : NSObject
+
+@property (nonatomic, strong, readonly) NSString *orderId;
+@property (nonatomic, strong, readonly) NSError *error;
+
+- (instancetype)initWithOrderId:(NSString *)orderId error:(NSError *)error;
+
+@end

sdk/iOS/2.2.1/MobilePayManager/MobilePayManager.h

@@ -0,0 +1,235 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <CoreGraphics/CoreGraphics.h>
+#import <CoreImage/CoreImage.h>
+
+#import "MobilePayPayment.h"
+#import "MobilePaySuccessfulPayment.h"
+#import "MobilePayErrorPayment.h"
+#import "MobilePayCancelledPayment.h"
+
+typedef NS_ENUM(NSInteger, MobilePayErrorCode) {
+    // Unknown error occurred
+    MobilePayErrorCodeUnknown = 0,
+    // Invalid parameters sent to MobilePay app
+    MobilePayErrorCodeInvalidParameters = 1,
+    // VerifyMerchant request failed - validation af merchant failed.
+    MobilePayErrorCodeMerchantValidationFailed = 2,
+    // MobilePay app is out of date and should be updated
+    MobilePayErrorCodeUpdateApp = 3,
+    // Merchant is not valid
+    MobilePayErrorCodeMerchantNotValid = 4,
+    // Hmac parameter is not valid
+    MobilePayErrorCodeHMACNotValid = 5,
+    // MobilePay timeout, the purchase took more than 5 minutes
+    MobilePayErrorCodeTimeOut = 6,
+    // MobilePay amount limits exceeded. Open MobilePay 'Beløbsgrænser' to see your status.
+    MobilePayErrorCodeLimitsExceeded = 7,
+    // Timeout set in merchant app exceeded
+    MobilePayErrorCodeMerchantTimeout = 8,
+    // Invalid signature
+    MobilePayErrorCodeInvalidSignature = 9,
+    // MobilePay SDK version is outdated
+    MobilePayErrorCodeSDKIsOutdated = 10,
+    // The given OrderId is already used. An OrderId has to be unique.
+    MobilePayErrorCodeOrderIdAlreadyUsed = 11,
+    // The payment was rejected due to an unexpected error related to the MobilePay user.
+    MobilePayErrorCodePaymentRejected = 12,
+};
+
+
+typedef NS_ENUM(NSInteger, MobilePayCaptureType)
+{
+    MobilePayCaptureType_Reserve = 1,          // Reserve
+    MobilePayCaptureType_PartialCapture = 2    // Partial capture
+};
+
+typedef NS_ENUM(NSInteger, MobilePayCountry)
+{
+    MobilePayCountry_Denmark = 0,
+    MobilePayCountry_Finland = 2,
+};
+
+typedef void(^MobilePayCallbackSuccessBlock)(NSString * __nullable orderId, NSString * __nullable transactionId, NSString * __nullable signature);
+typedef void(^MobilePayCallbackErrorBlock)(NSString * __nullable orderId, int errorCode, NSString * __nullable errorMessage);
+typedef void(^MobilePayCallbackCancelBlock)(NSString * __nullable orderId);
+
+typedef void(^MobilePayPaymentSuccessBlock)(MobilePaySuccessfulPayment * __nullable mobilePaySuccessfulPayment);
+typedef void(^MobilePayPaymentErrorBlock)(MobilePayErrorPayment * __nullable mobilePayErrorPayment);
+typedef void(^MobilePayPaymentCancelledBlock)(MobilePayCancelledPayment * __nullable mobilePayCancelledPayment);
+
+@interface MobilePayManager : NSObject
+
++ (MobilePayManager * __nonnull) sharedInstance;
+
+/**
+ * @param merchantId: merchant id delivered from MobilePay through your MobilePay business agreement
+ * @param urlscheme: urlscheme for your app setup under UrlIdentifier in your info.plist (this needs to be done to enable app switching in general)
+ * @param Country: The country / version of MobilePay you wish your app to work with - Denmark (DK - mobilepay:// - which also is the default), Finland (FI - mobilepayfi://)
+ */
+-(void)setupWithMerchantId:(NSString * __nonnull)merchantId merchantUrlScheme:(NSString * __nonnull)merchantUrlScheme country:(MobilePayCountry)country;
+
+
+/**
+ * @param merchantId: merchant id delivered from MobilePay through your MobilePay business agreement
+ * @param urlscheme: urlscheme for your app setup under UrlIdentifier in your info.plist (this needs to be done to enable app switching in general)
+ * @param timeoutseconds: seconds that you allow the user to spend in the MobilePay app before returning to the merchant app, if exceeded when you try to swipe in Mobile Pay errorcode 8 is returned. Default is 0 = never timeout
+ */
+-(void) setupWithMerchantId:(NSString * __nonnull)merchantId merchantUrlScheme:(NSString * __nonnull)merchantUrlScheme timeoutSeconds:(int)timeoutSeconds;
+
+/**
+ * @param merchantId: merchant id delivered from MobilePay through your MobilePay business agreement
+ * @param urlscheme: urlscheme for your app setup under UrlIdentifier in your info.plist (this needs to be done to enable app switching in general)
+ * @param timeoutseconds: seconds that you allow the user to spend in the MobilePay app before returning to the merchant app, if exceeded when you try to swipe in Mobile Pay errorcode 8 is returned. Default is 0 = never timeout
+ * @param capture: Determines if the payment is a reservation or instant capture - default is Yes for instant capture
+ * @param country: The country / version of MobilePay you wish your app to work with - Denmark (DK - mobilepay:// - which also is the default), Finland (FI - mobilepayfi://)
+ */
+-(void) setupWithMerchantId:(NSString * __nonnull)merchantId merchantUrlScheme:(NSString * __nonnull)merchantUrlScheme timeoutSeconds:(int)timeoutSeconds captureType:(MobilePayCaptureType)captureType country:(MobilePayCountry)country;
+
+/**
+ * will start the MobilePay payment flow by swithing to the MobilePay app
+ *
+ * @param orderId: Text with a max length of 50 characters. Sent through the purchase flow and returned to your app when the payment is completed so that you are able to deliver the right product.
+ * @param productPrice: price of the product
+ * @param errorBlock : An error will occur if mobile pay isn't installed
+ */
+-(void) beginMobilePaymentWithOrderId:(NSString * __nonnull)orderId productPrice:(NSDecimalNumber * __nonnull)productPrice error:(__nullable MobilePayPaymentErrorBlock)errorBlock;
+
+/**
+ * will start the MobilePay payment flow by swithing to the MobilePay app
+ *
+ * @param payment: payment object for creating order in mobilepay
+ */
+-(void) beginMobilePaymentWithPayment:(MobilePayPayment * __nonnull)payment error:(__nullable MobilePayPaymentErrorBlock)errorBlock;
+
+/**
+ *  This method handles all callbacks coming from MobilePay after having app switced to it.
+ *
+ *  @discussion
+ *  This method must be added to your AppDelegate in:
+ *  @code
+ *  - (BOOL)application:(nonnull UIApplication *)app openURL:(nonnull NSURL *)url options:(nonnull NSDictionary<NSString *,id> *)options
+ *  @endcode
+ *  or
+ *  @code
+ *  - (BOOL)application:(nonnull UIApplication *)application openURL:(nonnull NSURL *)url sourceApplication:(nullable NSString *)sourceApplication annotation:(nonnull id)annotation
+ *  @endcode
+ *  if you are developing with a deployment target prior to iOS 9.
+ *
+ * @param url : the callback url provided by the AppDelegate method
+ * @param success:
+ * orderId: the SDK has validated that the orderId is the same as the one sent to MobilePay
+ * transactionId: MobilePay transactionId that can be found in the MobilePay activity list
+ * signature: this is the payment signature that the SDK validates against to ensure the payment authenticity
+ * @param error:
+ * errorCodes:
+ *  1 = Invalid parameters sent to MobilePay app.
+ *  2 = VerifyMerchant request failed - validation af merchant failed.
+ *  3 = MobilePay app is out of date and should be updated
+ *  4 = Merchant is not valid
+ *  5 = Hmac parameter is not valid
+ *  6 = MobilePay timeout, the purchase took more than 5 minutes
+ *  7 = MobilePay amount limits exceeded. Open MobilePay 'Beløbsgrænser' to see your status.
+ *  8 = Timeout set in merchant app exceeded
+ *  9 = Invalid signature
+ * 10 = MobilePay SDK version is outdated
+ * 11 = The given OrderId is already used. An OrderId has to be unique.
+ * 12 = The payment was rejected because the user is chosen for fraud validation.
+ * @param cancel :
+ * orderId: the SDK has validated that the orderId is the same as the one sent to MobilePay
+ *
+ * Most of there errors are technical errors (1,2,4,5,9,10,11) that must be presented as a generic error message without details to the user, where others SHOULD BE HANDLED BY YOUR APP (3,6,7,8,12) to guide the user in the right direction.
+ */
+
+-(void)handleMobilePayPaymentWithUrl:(NSURL * __nonnull)url success:(__nullable MobilePayPaymentSuccessBlock)successfulBlock error:(__nullable MobilePayPaymentErrorBlock)errorBlock cancel:(__nullable MobilePayPaymentCancelledBlock)cancelBlock;
+
+
+/**
+ *Checks if url can be opened, and it will only for check for the appstore version of MobilePay
+ *
+ *Currently the mobilepay app is available in three countries, and each 'Country' has it's own urlscheme:
+ *
+ *Denmark: mobilepay://
+ *Finland: mobilepayfi://
+ *
+ * When running iOS9 SDK / Xcode7 you need to whitelist the MobilePay URL, before you can use this method.
+ *
+ *if you want to check for the Danish version of MobilePay, then add the following:
+ * <key>LSApplicationQueriesSchemes</key>
+ * <array>
+ * <string>mobilepay</string>
+ * <string>yourotherurlschemes</string>
+ * </array>
+ *
+ *if you want to check for the Norwegian version of MobilePay, then add the following:
+ * <key>LSApplicationQueriesSchemes</key>
+ * <array>
+ * <string>mobilepayno</string>
+ * <string>yourotherurlschemes</string>
+ * </array>
+ *
+ *if you want to check for the Finish version of MobilePay, then add the following:
+ * <key>LSApplicationQueriesSchemes</key>
+ * <array>
+ * <string>mobilepayfi</string>
+ * <string>yourotherurlschemes</string>
+ * </array>
+ */
+-(BOOL)isMobilePayInstalled:(MobilePayCountry)country;
+
+/**
+ * capture: Determines if the payment is a reservation or partial capture  - default is "Reserve" for reservation
+ */
+@property (nonatomic) MobilePayCaptureType captureType;
+
+/**
+ * Country
+ */
+@property (nonatomic) MobilePayCountry country;
+
+/**
+ * ErrorCode
+ */
+@property (nonatomic, readonly) MobilePayErrorCode mobilePayErrorCode;
+
+/**
+ * The version of the SDK
+ */
+@property (nonatomic, readonly) NSString * __nonnull sdkVersion;
+
+/**
+ * merchant id delivered from MobilePay through your MobilePay business agreement
+ */
+@property (nonatomic) NSString * __nullable merchantId;
+
+/**
+ * a time limit you set for which the user must have swiped in MobilePay to confirm the purchase. if exceeded errorcode 8 is returned. Default is 0 = never timeout
+ */
+@property (nonatomic) int timeoutSeconds;
+
+/*
+ * the urls for the different versions of MobilePay in AppStore
+ */
+@property (nonatomic, readonly) NSString * __nonnull mobilePayAppStoreLinkDK;
+
+@property (nonatomic, readonly) NSString * __nonnull mobilePayAppStoreLinkNO;
+
+@property (nonatomic, readonly) NSString * __nonnull mobilePayAppStoreLinkFI;
+
+/**
+ * isAppSwitchInProgress = YES after calling beginMobilePaymentWithOrderId and set to NO after calling handleMobilePayPaymentWithUrl
+ */
+@property (nonatomic, readonly) BOOL isAppSwitchInProgress;
+
+/**
+ * returns the version of signature. This can be used to make specific logic for each version, which can be useful for example when validating different signatures
+ */
+@property (nonatomic, readonly) NSString * __nonnull signatureVersion;
+
+/**
+ * for internal development purpose only
+ */
+-(void)setMobilePayUrlScheme:(NSString * __nonnull)mobilePayUrlScheme;
+
+
+@end

sdk/iOS/2.2.1/MobilePayManager/MobilePayPayment.h

@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+/**
+ * Contains information about the payment being processed.
+ */
+@interface MobilePayPayment : NSObject
+
+// Required
+@property (nonatomic, strong, nonnull) NSString *orderId;
+@property (nonatomic, nonnull) NSDecimalNumber *productPrice;
+
+@property (nonatomic, strong, nullable) NSString *bulkRef;
+
+/**
+ * Initialize payment object with required values
+ * orderId: Text with a max length of 50 characters. Sent through the purchase flow and returned to your app when the payment is completed so that you are able to deliver the right product.
+ * productPrice: price of the product
+ */
+- (nonnull MobilePayPayment *)initWithOrderId:(nonnull NSString *)orderId productPrice:(nonnull NSDecimalNumber *)productPrice;
+
+@end

sdk/iOS/2.2.1/MobilePayManager/MobilePaySuccessfulPayment.h

@@ -0,0 +1,15 @@
+#import <Foundation/Foundation.h>
+
+@interface MobilePaySuccessfulPayment : NSObject
+
+@property (nonatomic, strong, readonly, nullable) NSString *orderId;
+@property (nonatomic, strong, readonly, nullable) NSString *transactionId;
+@property (nonatomic, strong, readonly, nullable) NSString *signature;
+@property (nonatomic, readonly, nonnull) NSDecimalNumber *amountWithdrawnFromCard;
+
+- (nonnull instancetype)initWithOrderId:(nullable NSString *)orderId
+                  transactionId:(nullable NSString *)transactionId
+                      signature:(nullable NSString *)signature
+        amountWithdrawnFromCard:(nonnull NSDecimalNumber *)amountWithdrawnFromCard;
+
+@end