Fix iOS crush on show3DS call

README.md

@@ -20,26 +20,35 @@ react-native link react-native-cloudpayments
 ```
 
 # Methods
-### isValidCard()
-Validate card.
+### isValidNumber()
+Validate card number.
 Returns a `Promise` that resolve card status (`Boolean`).
 
 __Arguments__
 - `cardNumber` - `String` Number of payment card.
-- `cardExp` - `String` Expire date of payment card.
-- `cardCvv` - `String` CVV code of payment card.
 
 __Examples__
 ```js
 import RNCloudPayment from 'react-native-cloudpayments';
 
-const demoCard = {
-  number: '5105105105105100',
-  extDate: '10/18',
-  cvvCode: '123',
-};
+RNCloudPayment.isValidNumber('5105105105105100')
+  .then(cardStatus => {
+    console.log(cardStatus); // true
+  });
+```
+
+### isValidExpired()
+Validate card expired.
+Returns a `Promise` that resolve card status (`Boolean`).
+
+__Arguments__
+- `cardExp` - `String` Expire date of payment card.
+
+__Examples__
+```js
+import RNCloudPayment from 'react-native-cloudpayments';
 
-RNCloudPayment.isValidCard(demoCard.number, demoCard.extDate, demoCard.cvvCode)
+RNCloudPayment.isValidExpired('11/21')
   .then(cardStatus => {
     console.log(cardStatus); // true
   });
@@ -106,5 +115,24 @@ RNCloudPayment.createCryptogram(demoCard.number, demoCard.extDate, demoCard.cvvC
   });
 ```
 
+### show3DS()
+Show 3ds secure.
+Returns a `Promise` that resolve cryptogram (`Object`).
+
+__Arguments__
+- `url` - `String` Url redirect.
+- `transactionId` - `String` Transaction ID.
+- `token` - `String` Token.
+
+__Examples__
+```js
+import RNCloudPayment from 'react-native-cloudpayments';
+
+RNCloudPayment.show3DS('https://demo.cloudpayments.ru', '1237618734', '....1d3d22r..')
+  .then(result => {
+    console.log(result); 
+  });
+```
+
 # License
 Licensed under the MIT License.

android/build.gradle

@@ -12,12 +12,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion "27.0.3"
+  compileSdkVersion 28
+  buildToolsVersion = "28.0.3"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 27
+    targetSdkVersion 28
     versionCode 1
     versionName "1.0"
   }
@@ -32,5 +32,5 @@ repositories {
 
 dependencies {
   implementation "com.facebook.react:react-native:+"
-  implementation files('src/main/libs/CloudPayments.aar')
+  implementation 'ru.cloudpayments.android:sdk:1.0.3'
 }

android/src/main/AndroidManifest.xml

@@ -1,9 +1,12 @@
-<manifest
-    package="com.rncloudpayments"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.rncloudpayments">
 
     <application
-        android:allowBackup="false"
-        tools:replace="android:allowBackup"/>
-</manifest>
+            android:allowBackup="false"
+            tools:replace="android:allowBackup">
+        <activity android:name=".CheckoutActivity" />
+    </application>
+
+</manifest>

android/src/main/java/com/rncloudpayments/CheckoutActivity.java

@@ -0,0 +1,66 @@
+package com.rncloudpayments;
+
+import android.app.Activity;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableMap;
+import ru.cloudpayments.sdk.three_ds.ThreeDSDialogListener;
+import ru.cloudpayments.sdk.three_ds.ThreeDsDialogFragment;
+
+public class CheckoutActivity extends Activity implements ThreeDSDialogListener {
+
+    static String acsUrl;
+    static String paReq;
+    static String transactionId;
+    static Promise promise;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        FragmentManager fm = getFragmentManager();
+
+        final ThreeDsDialogFragment dialog = ThreeDsDialogFragment.newInstance(acsUrl, transactionId, paReq);
+        dialog.show(fm, "3DS");
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                dialog.getView().addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                    @Override
+                    public void onViewAttachedToWindow(View v) {
+                    }
+
+                    @Override
+                    public void onViewDetachedFromWindow(View v) {
+                        promise.reject("Cancel");
+
+                        promise = null;
+
+                        finish();
+                    }
+                });
+            }
+        },50);
+
+    }
+
+    @Override
+    public void onAuthorizationCompleted(String md, String paRes) {
+        WritableMap map = Arguments.createMap();
+
+        map.putString("MD", md);
+        map.putString("PaRes", paRes);
+
+        promise.resolve(map);
+    }
+
+    @Override
+    public void onAuthorizationFailed(String html) {
+        promise.reject(html);
+    }
+}

android/src/main/java/com/rncloudpayments/CloudPayments.java

@@ -1,12 +1,13 @@
 package com.rncloudpayments;
 
+import android.content.Intent;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import ru.cloudpayments.sdk.cp_card.CPCard;
+import ru.cloudpayments.sdk.three_ds.ThreeDsDialogFragment;
 
-import ru.cloudpayments.cpcard.CPCard;
-import ru.cloudpayments.cpcard.CPCardFactory;
 
 public class CloudPayments extends ReactContextBaseJavaModule {
   public CloudPayments(ReactApplicationContext reactContext) {
@@ -19,22 +20,33 @@ public String getName() {
   }
 
   @ReactMethod
-  public void isValidNumber(String cardNumber, String cardExp, String cardCvv, Promise promise) {
+  public void isValidNumber(String cardNumber, Promise promise) {
     try {
-      CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
-
-      boolean numberStatus = card.isValidNumber();
+      String validFormatNumber = cardNumber.replace(" ", "");
+      boolean numberStatus = CPCard.isValidNumber(validFormatNumber);
 
       promise.resolve(numberStatus);
     } catch (Exception e) {
       promise.reject(e.getMessage());
     }
   }
 
+  @ReactMethod
+  public void isValidExpired(String cardExpired, Promise promise) {
+    try {
+      String validFormatExp = cardExpired.replace("/", "");
+      boolean expiredStatus = CPCard.isValidExpDate(validFormatExp);
+
+      promise.resolve(expiredStatus);
+    } catch (Exception e) {
+      promise.reject(e.getMessage());
+    }
+  }
+
   @ReactMethod
   public void getType(String cardNumber, String cardExp, String cardCvv, Promise promise) {
     try {
-      CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
+      CPCard card = new CPCard(cardNumber, cardExp, cardCvv);
 
       String cardType = card.getType();
 
@@ -47,7 +59,10 @@ public void getType(String cardNumber, String cardExp, String cardCvv, Promise p
   @ReactMethod
   public void createCryptogram(String cardNumber, String cardExp, String cardCvv, String publicId, Promise promise) {
     try {
-      CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
+      String validFormatNumber = cardNumber.replace(" ", "");
+      String validFormatExp = cardExp.replace("/", "");
+
+      CPCard card = new CPCard(validFormatNumber, validFormatExp, cardCvv);
 
       String cryptoprogram = card.cardCryptogram(publicId);
 
@@ -57,4 +72,22 @@ public void createCryptogram(String cardNumber, String cardExp, String cardCvv,
       promise.reject(e.getMessage());
     }
   }
+
+  @ReactMethod
+  public void show3DS(String acsUrl, String paReq, String transactionId, Promise promise) {
+    try {
+      Intent intent = new Intent(getReactApplicationContext(), CheckoutActivity.class);
+
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+      CheckoutActivity.acsUrl = acsUrl;
+      CheckoutActivity.paReq = paReq;
+      CheckoutActivity.transactionId = transactionId;
+      CheckoutActivity.promise = promise;
+
+      getReactApplicationContext().startActivity(intent);
+    } catch (Exception e) {
+      promise.reject(e.getMessage());
+    }
+  }
 }

android/src/main/res/values/strings.xml

@@ -0,0 +1,2 @@
+<resources>
+</resources>

index.js

@@ -3,14 +3,22 @@ import { NativeModules } from 'react-native';
 const RNCloudPaymentsModule = NativeModules.RNCloudPayments;
 
 export default class RNCloudPayments {
-  static async isValidCard(cardNumber, cardExp, cardCvv) {
+  static async isValidNumber(cardNumber) {
     try {
-      return await RNCloudPaymentsModule.isValidNumber(cardNumber, cardExp, cardCvv);
+      return await RNCloudPaymentsModule.isValidNumber(cardNumber);
     } catch(error) {
       return createError(error);
     }
   }
 
+  static async isValidExpired(cardExp) {
+	try {
+		return await RNCloudPaymentsModule.isValidExpired(cardExp);
+	} catch(error) {
+		return createError(error);
+	}
+  }
+
   static async getType(cardNumber, cardExp, cardCvv) {
     try {
       return await RNCloudPaymentsModule.getType(cardNumber, cardExp, cardCvv);
@@ -26,6 +34,14 @@ export default class RNCloudPayments {
       return createError(error);
     }
   }
+
+  static async show3DS(acsUrl, paReq, transactionId) {
+	try {
+		return await RNCloudPaymentsModule.show3DS(acsUrl, paReq, transactionId);
+	} catch(error) {
+		return createError(error);
+	}
+  }
 }
 
 class RNCloudPaymentsError extends Error {

ios/Extensions/NSString+URLEncoding.h

@@ -0,0 +1,15 @@
+//
+//  NSString+URLEncoding.h
+//
+//  Created by Dmitry Sytsevich on 5/30/19.
+//  Copyright © 2019 Dmitry Sytsevich. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (URLEncoding)
+
+- (NSString *)stringByURLEncoding;
+- (NSString*)stringBetweenString:(NSString *)start andString:(NSString *)end;
+
+@end

ios/Extensions/NSString+URLEncoding.m

@@ -0,0 +1,34 @@
+//
+//  NSString+URLEncoding.m
+//
+//  Created by Dmitry Sytsevich on 5/30/19.
+//  Copyright © 2019 Dmitry Sytsevich. All rights reserved.
+//
+
+#import "NSString+URLEncoding.h"
+
+@implementation NSString (URLEncoding)
+
+- (NSString *)stringByURLEncoding {
+    return (__bridge NSString *)CFURLCreateStringByAddingPercentEscapes(NULL,
+                                                                        (CFStringRef)self,
+                                                                        NULL,
+                                                                        (CFStringRef)@"!*'\"();:@+$,/?%#[]% ", CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding));
+}
+
+- (NSString*)stringBetweenString:(NSString *)start andString:(NSString *)end {
+    NSScanner* scanner = [NSScanner scannerWithString:(__bridge NSString * _Nonnull)((__bridge CFStringRef)self)];
+    [scanner setCharactersToBeSkipped:nil];
+    [scanner scanUpToString:start intoString:nil];
+    if ([scanner scanString:start intoString:nil])
+    {
+        NSString* result = nil;
+        if ([scanner scanUpToString:end intoString:&result])
+        {
+            return result;
+        }
+    }
+    return nil;
+}
+
+@end

ios/RNCloudPayments.h

@@ -1,4 +1,5 @@
 #import <React/RCTBridgeModule.h>
 
 @interface RNCloudPayments : NSObject <RCTBridgeModule>
+
 @end