change callback to promise

gazaret · May 16, 2018 · 1946abd · 1946abd
1 parent 68e8994
commit 1946abd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 41 deletions.
diff --git a/android/src/main/java/com/rncloudpayments/CloudPayments.java b/android/src/main/java/com/rncloudpayments/CloudPayments.java
@@ -1,6 +1,6 @@
 package com.rncloudpayments;
 
-import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -19,42 +19,42 @@ public String getName() {
   }
 
   @ReactMethod
-  public void isValidNumber(String cardNumber, String cardExp, String cardCvv, Callback reactErrorCallback, Callback reactSuccessCallback) {
+  public void isValidNumber(String cardNumber, String cardExp, String cardCvv, Promise promise) {
     try {
       CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
 
       boolean numberStatus = card.isValidNumber();
 
-      reactSuccessCallback.invoke(numberStatus);
+      promise.resolve(numberStatus);
     } catch (Exception e) {
-      reactErrorCallback.invoke(e.getMessage());
+      promise.reject(e.getMessage());
     }
   }
 
   @ReactMethod
-  public void getType(String cardNumber, String cardExp, String cardCvv, Callback reactErrorCallback, Callback reactSuccessCallback) {
+  public void getType(String cardNumber, String cardExp, String cardCvv, Promise promise) {
     try {
       CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
 
       String cardType = card.getType();
 
-      reactSuccessCallback.invoke(cardType);
+      promise.resolve(cardType);
     } catch (Exception e) {
-      reactErrorCallback.invoke(e.getMessage());
+      promise.reject(e.getMessage());
     }
   }
 
   @ReactMethod
-  public void createCryptogram(String cardNumber, String cardExp, String cardCvv, String publicId, Callback reactErrorCallback, Callback reactSuccessCallback) {
+  public void createCryptogram(String cardNumber, String cardExp, String cardCvv, String publicId, Promise promise) {
     try {
       CPCard card = CPCardFactory.create(cardNumber, cardExp, cardCvv);
 
       String cryptoprogram = card.cardCryptogram(publicId);
 
-      reactSuccessCallback.invoke(cryptoprogram);
+      promise.resolve(cryptoprogram);
     } catch (Exception e) {
       e.printStackTrace();
-      reactErrorCallback.invoke(e.getMessage());
+      promise.reject(e.getMessage());
     }
   }
 }
diff --git a/index.js b/index.js
@@ -3,41 +3,28 @@ import { NativeModules } from 'react-native';
 const RNCloudPaymentsModule = NativeModules.RNCloudPayments;
 
 export default class RNCloudPayments {
-  static isValidNumber(cardNumber, cardExp, cardCvv) {
-    return new Promise((resolve, reject) => {
-      RNCloudPaymentsModule.isValidNumber(
-        cardNumber,
-        cardExp,
-        cardCvv,
-        error => reject(createError(error)),
-        numberStatus => resolve(numberStatus),
-      )
-    });
+  static async isValidNumber(cardNumber, cardExp, cardCvv) {
+    try {
+      return await RNCloudPaymentsModule.isValidNumber(cardNumber, cardExp, cardCvv);
+    } catch(error) {
+      return createError(error);
+    }
   }
 
-  static getType(cardNumber, cardExp, cardCvv) {
-    return new Promise((resolve, reject) => {
-      RNCloudPaymentsModule.getType(
-        cardNumber,
-        cardExp,
-        cardCvv,
-        error => reject(createError(error)),
-        type => resolve(type),
-      )
-    });
+  static async getType(cardNumber, cardExp, cardCvv) {
+    try {
+      return await RNCloudPaymentsModule.getType(cardNumber, cardExp, cardCvv);
+    } catch(error) {
+      return createError(error);
+    }
   }
 
-  static createCryptogram(cardNumber, cardExp, cardCvv, publicId) {
-    return new Promise((resolve, reject) => {
-      RNCloudPaymentsModule.createCryptogram(
-        cardNumber,
-        cardExp,
-        cardCvv,
-        publicId,
-        error => reject(createError(error)),
-        cryptogram => resolve(cryptogram),
-      )
-    });
+  static async createCryptogram(cardNumber, cardExp, cardCvv, publicId) {
+    try {
+      return await RNCloudPaymentsModule.createCryptogram(cardNumber, cardExp, cardCvv, publicId);
+    } catch(error) {
+      return createError(error);
+    }
   }
 }