Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ReactNativePaymentsModule.java #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update ReactNativePaymentsModule.java #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a96c31a
Update ReactNativePaymentsModule.java
AppWerft Oct 8, 2017
ea26ed6
Update ReactNativePaymentsModule.java
AppWerft Oct 13, 2017
3b688e9
Update ReactNativePaymentsModule.java
AppWerft Oct 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 105 additions & 32 deletions ...ive-payments/android/src/main/java/com/reactnativepayments/ReactNativePaymentsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,19 @@
import com.google.android.gms.common.api.ResultCallback;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.identity.intents.model.UserAddress;
import com.google.android.gms.wallet.*;
import com.google.android.gms.wallet.Cart;
import com.google.android.gms.wallet.FullWallet;
import com.google.android.gms.wallet.FullWalletRequest;
import com.google.android.gms.wallet.MaskedWallet;
import com.google.android.gms.wallet.MaskedWalletRequest;
import com.google.android.gms.wallet.PaymentMethodTokenizationParameters;
import com.google.android.gms.wallet.PaymentMethodTokenizationType;
import com.google.android.gms.wallet.Wallet;
import com.google.android.gms.wallet.WalletConstants;
import com.google.android.gms.wallet.IsReadyToPayRequest;
import com.google.android.gms.wallet.LineItem;



import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.BaseActivityEventListener;
Expand Down Expand Up @@ -54,6 +66,10 @@ public class ReactNativePaymentsModule extends ReactContextBaseJavaModule implem

public static final String REACT_CLASS = "ReactNativePayments";

private int theme = WalletConstants.THEME_LIGHT;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you confirm that this is the default theme?


private ArrayList<Integer> cardNetworks = new ArrayList<Integer>();

private static ReactApplicationContext reactContext = null;

private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
Expand Down Expand Up @@ -141,8 +157,52 @@ public String getName() {
return REACT_CLASS;
}



@Override public Map<String, Object> getConstants() {
final Map<String, Object> constants = new HashMap<>();
constants.put("ENVIRONMENT_TEST", WalletConstants.ENVIRONMENT_TEST);
constants.put("ENVIRONMENT_PRODUCTION", WalletConstants.ENVIRONMENT_PRODUCTION);

constants.put("THEME_DARK", WalletConstants.THEME_DARK);
constants.put("THEME_LIGHT", WalletConstants.THEME_LIGHT);

constants.put("CARD_NETWORK_AMEX", WalletConstants.CardNetwork.AMEX);
constants.put("CARD_NETWORK_MASTERCARD", WalletConstants.CardNetwork.MASTERCARD);
constants.put("CARD_NETWORK_VISA", WalletConstants.CardNetwork.VISA);
constants.put("CARD_NETWORK_DISCOVER", WalletConstants.CardNetwork.DISCOVER);
constants.put("CARD_NETWORK_INTERAC", WalletConstants.CardNetwork.INTERAC);
constants.put("CARD_NETWORK_JCB", WalletConstants.CardNetwork.JCB);
constants.put("CARD_NETWORK_OTHER", WalletConstants.CardNetwork.OTHER);

constants.put("PAYMENT_METHOD_TOKENIZATION_TYPE_PAYMENT_GATEWAY", PaymentMethodTokenizationType.PAYMENT_GATEWAY); // Adyen,Braintree,Stripe,Vantiv
constants.put("PAYMENT_METHOD_TOKENIZATION_TYPE_NETWORK_TOKEN", PaymentMethodTokenizationType.NETWORK_TOKEN);
// constants.put("PAYMENT_METHOD_TOKENIZATION_TYPE_DIRECT", WalletConstants.PAYMENT_METHOD_TOKENIZATION_TYPE_DIRECT);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still needed?


return constants;
}


// Public Methods
// ---------------------------------------------------------------------------------------------
@ReactMethod
public void setTheme(int theme) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Developers shouldn't have to interactive with the native module to set the theme.

Instead, I'd expose this via the configuration data on paymentMethodData. That way users decide the theme prior to initializing the PaymentRequest.

if (theme == WalletConstants.THEME_LIGHT || theme == WalletConstants.THEME_DARK);
this.theme = theme;
}
@ReactMethod
public void setLightTheme(int theme) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's drop the theme parameter here since it isn't being used.

this.theme = WalletConstants.THEME_LIGHT;
}
@ReactMethod
public void setDarkTheme(int theme) {
this.theme = WalletConstants.THEME_DARK;
}
@ReactMethod
public void addAllowedCardNetwork(int network) {
cardNetworks.add(network);
}

@ReactMethod
public void getSupportedGateways(Callback errorCallback, Callback successCallback) {
WritableNativeArray supportedGateways = new WritableNativeArray();
Expand All @@ -153,10 +213,12 @@ public void getSupportedGateways(Callback errorCallback, Callback successCallbac
@ReactMethod
public void canMakePayments(ReadableMap paymentMethodData, Callback errorCallback, Callback successCallback) {
final Callback callback = successCallback;
IsReadyToPayRequest req = IsReadyToPayRequest.newBuilder()
.addAllowedCardNetwork(WalletConstants.CardNetwork.MASTERCARD)
.addAllowedCardNetwork(WalletConstants.CardNetwork.VISA)
.build();

IsReadyToPayRequest.Builder builder = IsReadyToPayRequest.newBuilder();
for (int network :cardNetworks) {
builder.addAllowedCardNetwork(network);
}
IsReadyToPayRequest req = builder.build();

int environment = getEnvironmentFromPaymentMethodData(paymentMethodData);
if (mGoogleApiClient == null) {
Expand Down Expand Up @@ -251,33 +313,44 @@ public void getFullWalletAndroid(
// ---------------------------------------------------------------------------------------------
private static PaymentMethodTokenizationParameters buildTokenizationParametersFromPaymentMethodData(ReadableMap paymentMethodData) {
ReadableMap tokenizationParameters = paymentMethodData.getMap("paymentMethodTokenizationParameters");
String tokenizationType = tokenizationParameters.getString("tokenizationType");


if (tokenizationType.equals("GATEWAY_TOKEN")) {
ReadableMap parameters = tokenizationParameters.getMap("parameters");
PaymentMethodTokenizationParameters.Builder parametersBuilder = PaymentMethodTokenizationParameters.newBuilder()
.setPaymentMethodTokenizationType(PaymentMethodTokenizationType.PAYMENT_GATEWAY)
.addParameter("gateway", parameters.getString("gateway"));

ReadableMapKeySetIterator iterator = parameters.keySetIterator();

while (iterator.hasNextKey()) {
String key = iterator.nextKey();

parametersBuilder.addParameter(key, parameters.getString(key));
}

return parametersBuilder.build();
String publicKey = "";
switch( tokenizationParameters.getString("tokenizationType")) {
/*case WalletConstants.PAYMENT_METHOD_TOKENIZATION_TYPE_DIRECT:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't realize there was a Direct Type.

Is it worth uncommenting and adding it to the PR?

publicKey = tokenizationParameters.getMap("parameters").getString("publicKey");
return PaymentMethodTokenizationParameters.newBuilder()
.setPaymentMethodTokenizationType(PaymentMethodTokenizationType.PAYMENT_DIRECT)
.addParameter("publicKey", publicKey)
.build();

break;*/
case PaymentMethodTokenizationType.PAYMENT_GATEWAY:
ReadableMap parameters = tokenizationParameters.getMap("parameters");
PaymentMethodTokenizationParameters.Builder parametersBuilder = PaymentMethodTokenizationParameters.newBuilder()
.setPaymentMethodTokenizationType(PaymentMethodTokenizationType.PAYMENT_GATEWAY)
.addParameter("gateway", parameters.getString("gateway"));

ReadableMapKeySetIterator iterator = parameters.keySetIterator();
while (iterator.hasNextKey()) {
String key = iterator.nextKey();

parametersBuilder.addParameter(key, parameters.getString(key));
}

return parametersBuilder.build();
break;
case PaymentMethodTokenizationType.NETWORK_TOKEN:
publicKey = tokenizationParameters.getMap("parameters").getString("publicKey");

return PaymentMethodTokenizationParameters.newBuilder()
.setPaymentMethodTokenizationType(PaymentMethodTokenizationType.NETWORK_TOKEN)
.addParameter("publicKey", publicKey)
.build();
break;
default:
// TODO warning
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you have planned for a warning?

}

} else {
String publicKey = tokenizationParameters.getMap("parameters").getString("publicKey");

return PaymentMethodTokenizationParameters.newBuilder()
.setPaymentMethodTokenizationType(PaymentMethodTokenizationType.NETWORK_TOKEN)
.addParameter("publicKey", publicKey)
.build();
}
}

private static List buildLineItems(ReadableArray displayItems) {
Expand Down Expand Up @@ -331,7 +404,7 @@ private void sendEvent(
}

private int getEnvironmentFromPaymentMethodData(ReadableMap paymentMethodData) {
return paymentMethodData.hasKey("environment") && paymentMethodData.getString("environment").equals("TEST")
return paymentMethodData.hasKey("environment") && paymentMethodData.getInt("environment") == WalletConstants.ENVIRONMENT_TEST
? WalletConstants.ENVIRONMENT_TEST
: WalletConstants.ENVIRONMENT_PRODUCTION;
}
Expand All @@ -344,7 +417,7 @@ private void buildGoogleApiClient(Activity currentActivity, int environment) {
.addOnConnectionFailedListener(this)
.addApi(Wallet.API, new Wallet.WalletOptions.Builder()
.setEnvironment(environment)
.setTheme(WalletConstants.THEME_LIGHT)
.setTheme(theme)
.build())
.build();
mGoogleApiClient.connect();
Expand Down