Merge pull request #55 from payu-intrepos/HotFix/RemovedUIWebViewUIAl…

…ertView

Removed UIWebview and UIAlertView from SDKs

Dependencies/CB/PayUCustomBrowser.framework/Headers/CBConstant.h

@@ -9,14 +9,6 @@
 #ifndef iOSCustomeBrowser_CBConstant_h
 #define iOSCustomeBrowser_CBConstant_h
 
-
-
-typedef NS_OPTIONS(NSUInteger, PUCBBankSimulator) {
-    PUCBDefault = 0,
-    PUCBBankSimulatorLocal = 1,
-    PUCBBankSimulatorRemote = 2,
-};
-
 //Macros To prevent instantiation of class by standard methods
 #define ATTRIBUTE_ALLOC __attribute__((unavailable("alloc not available, call sharedSingletonInstance instead")))
 #define ATTRIBUTE_INIT __attribute__((unavailable("init not available, call sharedSingletonInstance instead")))

Dependencies/CB/PayUCustomBrowser.framework/Headers/CBWKConnection.h

@@ -64,7 +64,7 @@ decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse
 
 // Displaying UI Panels
 
-- (void)payUwebView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler;
+- (void)payUwebView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler;
 
 - (void)payUwebView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL result))completionHandler;
 

Dependencies/CB/PayUCustomBrowser.framework/Headers/PUCBBaseConnection.h

@@ -20,19 +20,14 @@
 - (instancetype) init ATTRIBUTE_INIT;
 - (instancetype) new ATTRIBUTE_NEW;
 
-@property (nonatomic, assign) BOOL isMagicRetry;
 @property (nonatomic, copy) NSString *txnID;
 @property (nonatomic, copy) NSString *merchantKey;
 @property (weak, nonatomic) id <PayUCBWebViewResponseDelegate> cbWebViewResponseDelegate;
 @property (nonatomic, assign) BOOL isAutoOTPSelect;
-@property (nonatomic, assign) PUCBBankSimulator bankSimulatorType;
 @property (nonatomic, strong) PUCBConfiguration *cbConfig;
 
 /*!
  * This method is called from Merchant's App to initialize CB.
- * @param  view UIView on which WebView needs to be displayed
- * @param  webView instance of WebView (It can be either WKWebView or UIWebView)
- * @return obj instance of PUCBBaseConnection (or instance of its subclass, depending upon class on which it is called)
  */
 -(instancetype)init:(UIView *)view webView:(id)webView;
 

Dependencies/CB/PayUCustomBrowser.framework/Headers/PUCBConfiguration.h

@@ -18,7 +18,6 @@
 
 /*!
  * This method returns singleton object. Use this to configure features provided by CB
- * @return obj The singleton sintance of PUCBConfiguration class
  */
 +(instancetype)getSingletonInstance;
 
@@ -29,11 +28,8 @@
 
 @property (nonatomic, strong) NSString *merchantKey;
 @property (nonatomic, strong) NSString *transactionId;
-@property (nonatomic, assign) BOOL isMagicRetry;
 @property (nonatomic, assign) BOOL isAutoOTPSelect;
 @property (nonatomic, assign) BOOL shouldShowPayULoader;
-@property (nonatomic, assign) BOOL enableWKWebView;
-@property (nonatomic, assign) PUCBBankSimulator bankSimulatorType;
 @property (nonatomic, strong) PUCBReviewOrderConfig *reviewOrderConfig;
 @property (nonatomic, assign) NSUInteger surePayCount;
 @property (nonatomic, strong) NSString *paymentURL, *paymentPostParam;

Dependencies/CB/PayUCustomBrowser.framework/Headers/PUCBWebVC.h

@@ -13,7 +13,6 @@
 NS_ENUM(NSInteger) {
     PUCBNilArgument = 100,
     PUCBInvalidMerchantKey = 101,
-    PUCBBankSimulatorNotSupported = 102
 };
 
 
@@ -22,9 +21,6 @@ NS_ENUM(NSInteger) {
 @required
 /*!
  * This method gets called when transaction is successfull.
- * @param response
- * Response sent by PayU on successful completion of Payment.
- *
  * @note Hash inside response should be compared with server calculated hash to rule out possibility of tampering of data.
  * This should be done at server's end.
  *
@@ -33,15 +29,11 @@ NS_ENUM(NSInteger) {
 
 /*!
  * This method gets called when transaction fails. It logs txn_fail event.
- * @param response
- * Response sent by PayU when the transaction gets failed
  */
 - (void)PayUFailureResponse:(id)response;
 
 /*!
  * This method gets called in case of network error
- * @param notification
- * An NSDictionary containing details about the network error
  */
 - (void)PayUConnectionError:(NSDictionary *)notification;
 
@@ -53,21 +45,13 @@ NS_ENUM(NSInteger) {
 /*!
  * If the merchant intentends to receive response from her own server, this method shoudld be implemented.
  * This method is called when merchant's Success URL passes data to the custom browser.
- * @param payUResponse
- * Response sent by PayU on successful completion of Payment.
- * @param surlResponse
- * Response sent by merchant's server on successful completion of the payment.
  */
 - (void)PayUSuccessResponse:(id) payUResponse SURLResponse:(id) surlResponse;
 
 
 /*!
  * If the merchant intentends to receive response from her own server, this method shoudld be implemented.
  * This method is called when merchant's Failure URL passes data to the custom browser.
- * @param payUResponse
- * Response sent by PayU when the transaction gets failed.
- * @param furlResponse
- * Response sent by merchant's server on failure of the payment.
  */
 - (void)PayUFailureResponse:(id) payUResponse FURLResponse:(id) furlResponse;
 
@@ -92,9 +76,8 @@ NS_ENUM(NSInteger) {
 @end
 
 
-@interface PUCBWebVC : UIViewController <UIWebViewDelegate, WKNavigationDelegate, WKScriptMessageHandler, WKUIDelegate>
+@interface PUCBWebVC : UIViewController <WKNavigationDelegate, WKScriptMessageHandler, WKUIDelegate>
 
-@property (strong, nonatomic) UIWebView *vwWebView;
 @property (strong, nonatomic) WKWebView *vwWKWebView;
 @property (weak, nonatomic) id <PUCBWebVCDelegate> cbWebVCDelegate;
 
@@ -108,15 +91,6 @@ NS_ENUM(NSInteger) {
 
 /*!
  * This method is one of the two designated initializer of PUCBWebVC class
- * @param postParam
- * Post parmamters required by the payment server
- * @param url
- * This is the payment URL, the first URL which gets loaded in payment journey
- * @param key
- * This is the merchant key which she gets after onbaording PayU
- * @param error
- * Error is retured if the other parmaters fails validation checks
- @see -initWithNSURLRequest:merchantKey:error
  */
 
 - (instancetype)initWithPostParam:(NSString*)postParam
@@ -126,12 +100,6 @@ NS_ENUM(NSInteger) {
 
 /*!
  * This method is one of the two designated initializer of PUCBWebVC class
- * @param request
- * This is the NSURLRequest which should ideally contain post params along with the payment URL
- * @param key
- * This is the merchant key which she gets after onbaording PayU
- * @param error
- * Error is retured if the other parmaters fails validation checks
  */
 - (instancetype)initWithNSURLRequest:(NSURLRequest*)request
                          merchantKey:(NSString*)key

Dependencies/CB/PayUCustomBrowser.framework/Headers/PayUCBWebViewResponseDelegate.h

@@ -16,21 +16,13 @@
 
 /*!
  * This method gets called when transaction is successfull.
- * @param response Response sent by PayU on successful completion of Payment.
- *
  * @note Hash inside response should be compared with server calculated hash to rule out possibility of tampering of data.
  * This should be done at server's end.
  */
 - (void)PayUSuccessResponse:(id)response;
 
-/*!
- * @param response Response sent by PayU when the transaction gets failed
- */
 - (void)PayUFailureResponse:(id)response;
 
-/*!
- * @param notification An NSDictionary containing details about the network error
- */
 - (void)PayUConnectionError:(NSDictionary *)notification;
 
 @optional

Dependencies/CB/PayUCustomBrowser.framework/Headers/PayUCustomBrowser.h

@@ -16,7 +16,6 @@ FOUNDATION_EXPORT const unsigned char PayUCustomBrowserVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <PayUCustomBrowser/PublicHeader.h>
 #import "CBWKConnection.h"
-#import "CBConnection.h"
 #import "CBConstant.h"
 #import "PUCBWebVC.h"
 

Dependencies/CB/PayUCustomBrowser.framework/Headers/PayU_CB_SDK.h

@@ -10,7 +10,6 @@
 #define iOSCustomeBrowser_PayU_CB_SDK_h
 
 #import "CBWKConnection.h"
-#import "CBConnection.h"
 #import "CBConstant.h"
 #import "PUCBWebVC.h"
 

PayUmoney_CoreSDK.podspec

@@ -9,21 +9,21 @@
 Pod::Spec.new do |s|
 
   s.name         = "PayUmoney_CoreSDK"
-  s.version      = "3.8"
+  s.version      = "4.0"
   s.summary      = "PayUmoney iOS SDK"
   s.description  = "This is a native SDK to integrate PayUmoney services with iOS apps"
 
   s.homepage     = "https://github.com/payu-intrepos/PayUMoney-IOS-SDK"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Umang Arya" => "[email protected]" }
-  s.source       = { :git => "https://github.com/payu-intrepos/PayUMoney-IOS-SDK.git", :tag => "PayUmoney_CoreSDK.3.8" }
+  s.source       = { :git => "https://github.com/payu-intrepos/PayUMoney-IOS-SDK.git", :tag => "PayUmoney_CoreSDK.4.0" }
 
   s.ios.deployment_target = '8.0'
   s.requires_arc     = true
 
   s.ios.preserve_paths   = '**'
   s.vendored_frameworks  = 'CoreSDK/PayUMoneyCoreSDK.framework'
 
-  s.dependency 'PayUIndia-Custom-Browser', '~> 5.8.1'
+  s.dependency 'PayUIndia-Custom-Browser', '~> 5.9'
 
 end

PayUmoney_PnP.podspec

@@ -9,14 +9,14 @@
 Pod::Spec.new do |s|
 
   s.name         = "PayUmoney_PnP"
-  s.version      = "2.5.1"
+  s.version      = "2.5.2"
   s.summary      = "Native iOS integration & easy to integrate and use library."
   s.description  = "Provides a ready to use, drop in set of User Screens to enable payments with iOS Apps. Provide an end to end payment experience with all the features offered by the Citrus SDK. Reduces integration friction as merchants do not have to worry about designing the checkout screen, bank assets, or deal with complexity required to handle different payments methods."
 
   s.homepage     = "https://github.com/payu-intrepos/PayUMoney-IOS-SDK"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Umang Arya" => "[email protected]" }
-  s.source       = { :git => "https://github.com/payu-intrepos/PayUMoney-IOS-SDK.git", :tag => "PayUmoney_PnP.2.5.1" }
+  s.source       = { :git => "https://github.com/payu-intrepos/PayUMoney-IOS-SDK.git", :tag => "PayUmoney_PnP.2.5.2" }
 
   s.ios.deployment_target = '8.0'
   s.requires_arc     = true

PlugNPlay/Objective-C SampleApp/PlugNPlayFrameworkExample.xcodeproj/project.pbxproj

@@ -161,6 +161,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -199,7 +200,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nAPP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"\n\n# This script loops through the frameworks embedded in the application and\n# removes unused architectures.\nfind \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK\ndo\nFRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)\nFRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"\necho \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"\n\nEXTRACTED_ARCHS=()\n\nfor ARCH in $ARCHS\ndo\necho \"Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME\"\nlipo -extract \"$ARCH\" \"$FRAMEWORK_EXECUTABLE_PATH\" -o \"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\"\nEXTRACTED_ARCHS+=(\"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\")\ndone\n\necho \"Merging extracted architectures: ${ARCHS}\"\nlipo -o \"$FRAMEWORK_EXECUTABLE_PATH-merged\" -create \"${EXTRACTED_ARCHS[@]}\"\nrm \"${EXTRACTED_ARCHS[@]}\"\n\necho \"Replacing original executable with thinned version\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_EXECUTABLE_PATH-merged\" \"$FRAMEWORK_EXECUTABLE_PATH\"\n\ndone\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -328,12 +329,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../**";
 				INFOPLIST_FILE = PlugNPlayFrameworkExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.payumoney.sdkuiexampleframework;
+				PRODUCT_BUNDLE_IDENTIFIER = com.citruspay.plugnplay.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -347,12 +349,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../**";
 				INFOPLIST_FILE = PlugNPlayFrameworkExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.payumoney.sdkuiexampleframework;
+				PRODUCT_BUNDLE_IDENTIFIER = com.citruspay.plugnplay.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";