Merge branch 'payone' into 0.52.x

ajungg · ajungg · commit a3bda46a8824 · 2021-11-08T15:03:13.000+01:00
# Conflicts:
#	ui/src/main/res/values-de/strings.xml
#	ui/src/main/res/values-en/strings.xml
#	ui/src/main/res/values-hu/strings.xml
#	ui/src/main/res/values-sk/strings.xml
#	ui/src/main/res/values/strings.xml
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
@@ -16,7 +16,17 @@
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.MGF1ParameterSpec;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.OAEPParameterSpec;
@@ -39,7 +49,8 @@ public enum Type {
         PAYDIREKT(null, false, Collections.singletonList(PaymentMethod.PAYDIREKT)),
         TEGUT_EMPLOYEE_CARD("tegutEmployeeID", false, Collections.singletonList(PaymentMethod.TEGUT_EMPLOYEE_CARD)),
         DATATRANS("datatransAlias", true, Arrays.asList(PaymentMethod.TWINT, PaymentMethod.POST_FINANCE_CARD)),
-        DATATRANS_CREDITCARD("datatransCreditCardAlias", true, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX));
+        DATATRANS_CREDITCARD("datatransCreditCardAlias", true, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
+        PAYONE_CREDITCARD(null, true, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX));
 
         private String originType;
         private boolean requiresProject;
@@ -115,6 +126,18 @@ private static class DatatransData {
         private String expiryYear;
     }
 
+    private static class PayoneData {
+        PayoneData(String pseudoCardPAN, String name, String userID) {
+            this.pseudoCardPAN = pseudoCardPAN;
+            this.name = name;
+            this.userID = userID;
+        }
+
+        private final String pseudoCardPAN;
+        private final String name;
+        private final String userID;
+    }
+
     public static class PaydirektAuthorizationData {
         public String id;
         public String name;
@@ -247,18 +270,26 @@ public static PaymentCredentials fromCreditCardData(String name,
         return pc;
     }
 
+    @Deprecated
     private static long parseValidTo(String format, String expirationMonth, String expirationYear) {
         if (expirationMonth == null || expirationMonth.equals("")
          || expirationYear == null || expirationYear.equals("")) {
             return 0;
         }
 
+        return parseValidTo(format, expirationMonth + "/" + expirationYear);
+    }
+
+    private static long parseValidTo(String format, String expirationDate) {
+        if (expirationDate == null || expirationDate.trim().equals("")) {
+            return 0;
+        }
+
         try {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-            Date date = simpleDateFormat.parse(expirationMonth + "/" + expirationYear);
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format, Locale.getDefault());
 
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(date);
+            calendar.setTime(simpleDateFormat.parse(expirationDate));
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
 
             return calendar.getTimeInMillis();
@@ -355,6 +386,50 @@ public static PaymentCredentials fromDatatrans(String token, Brand brand, String
         return pc;
     }
 
+    public static PaymentCredentials fromPayone(String pseudocardpan,
+                                                String truncatedcardpan,
+                                                PaymentCredentials.Brand brand,
+                                                String cardexpiredate,
+                                                String lastname,
+                                                String userId,
+                                                String projectId) {
+        if (pseudocardpan == null) {
+            return null;
+        }
+
+        PaymentCredentials pc = new PaymentCredentials();
+        pc.generateId();
+        if (brand == Brand.MASTERCARD || brand == Brand.AMEX || brand == Brand.VISA) {
+            pc.type = Type.PAYONE_CREDITCARD;
+        } else {
+            return null;
+        }
+        pc.projectId = projectId;
+
+        List<X509Certificate> certificates = Snabble.getInstance().getPaymentSigningCertificates();
+        if (certificates.size() == 0) {
+            return null;
+        }
+
+        PayoneData payoneData = new PayoneData(pseudocardpan, lastname, userId);
+
+        String json = GsonHolder.get().toJson(payoneData, PayoneData.class);
+
+        X509Certificate certificate = certificates.get(0);
+        pc.rsaEncryptedData = pc.rsaEncrypt(certificate, json.getBytes());
+        pc.signature = pc.sha256Signature(certificate);
+        pc.appId = Snabble.getInstance().getConfig().appId;
+        pc.brand = brand;
+        pc.obfuscatedId = truncatedcardpan;
+        pc.validTo = parseValidTo("yyMM", cardexpiredate);
+
+        if (pc.rsaEncryptedData == null) {
+            return null;
+        }
+
+        return pc;
+    }
+
     public static PaymentCredentials fromTegutEmployeeCard(String obfuscatedId, String cardNumber, String projectId) {
         if (cardNumber == null || cardNumber.length() != 19
                 || (!cardNumber.startsWith("9280001621")
@@ -646,6 +721,12 @@ public PaymentMethod getPaymentMethod() {
                 case POST_FINANCE_CARD: return PaymentMethod.POST_FINANCE_CARD;
                 case TWINT: return PaymentMethod.TWINT;
             }
+        } else if (type == Type.PAYONE_CREDITCARD) {
+            switch (getBrand()) {
+                case VISA: return PaymentMethod.VISA;
+                case AMEX: return PaymentMethod.AMEX;
+                case MASTERCARD: return PaymentMethod.MASTERCARD;
+            }
         }
 
         return null;
diff --git a/java-sample/src/main/java/io/snabble/testapp/BaseActivity.java b/java-sample/src/main/java/io/snabble/testapp/BaseActivity.java
@@ -140,6 +140,9 @@ public void execute(SnabbleUI.Action action, Bundle args) {
             case SHOW_CREDIT_CARD_INPUT:
                 showCreditCardInput(args);
                 break;
+            case SHOW_PAYONE_INPUT:
+                showPayoneInput(args);
+                break;
             case SHOW_PAYDIREKT_INPUT:
                 showPaydirektInput();
                 break;
@@ -235,6 +238,12 @@ public void showCreditCardInput(Bundle args) {
         startActivity(intent);
     }
 
+    public void showPayoneInput(Bundle args) {
+        Intent intent = new Intent(this, PayoneInputActivity.class);
+        intent.putExtra("args", args);
+        startActivity(intent);
+    }
+
     public void showPaydirektInput() {
         Intent intent = new Intent(this, PaydirektInputActivity.class);
         startActivity(intent);
diff --git a/java-sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java b/java-sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java
@@ -11,5 +11,4 @@ public Fragment onCreateFragment() {
         fragment.setArguments(getIntent().getBundleExtra("args"));
         return fragment;
     }
-}
-
+}
diff --git a/java-sample/src/main/java/io/snabble/testapp/PayoneInputActivity.java b/java-sample/src/main/java/io/snabble/testapp/PayoneInputActivity.java
@@ -0,0 +1,14 @@
+package io.snabble.testapp;
+
+import androidx.fragment.app.Fragment;
+
+import io.snabble.sdk.ui.integration.PayoneInputFragment;
+
+public class PayoneInputActivity extends BaseActivity {
+    @Override
+    public Fragment onCreateFragment() {
+        PayoneInputFragment fragment =  new PayoneInputFragment();
+        fragment.setArguments(getIntent().getBundleExtra("args"));
+        return fragment;
+    }
+}
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PayoneInputFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PayoneInputFragment.kt
@@ -0,0 +1,36 @@
+package io.snabble.sdk.ui.integration
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.ui.payment.Payone
+import io.snabble.sdk.ui.payment.PayoneInputView
+
+open class PayoneInputFragment : Fragment() {
+    companion object {
+        const val ARG_PROJECT_ID = PayoneInputView.ARG_PROJECT_ID
+        const val ARG_PAYMENT_TYPE = PayoneInputView.ARG_PAYMENT_TYPE
+        const val ARG_TOKEN_DATA = PayoneInputView.ARG_TOKEN_DATA
+    }
+
+    private lateinit var projectId: String
+    private lateinit var paymentMethod: PaymentMethod
+    private lateinit var tokenizationData: Payone.PayoneTokenizationData
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+
+        projectId = requireNotNull(arguments?.getString(ARG_PROJECT_ID, null))
+        paymentMethod = requireNotNull(arguments?.getSerializable(ARG_PAYMENT_TYPE) as? PaymentMethod)
+        tokenizationData = requireNotNull(arguments?.getParcelable(ARG_TOKEN_DATA))
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
+        inflater.inflate(R.layout.snabble_fragment_cardinput_payone, container, false).apply {
+            findViewById<PayoneInputView>(R.id.user_payment_method_view).load(projectId, paymentMethod, tokenizationData)
+        }
+}
diff --git a/ui-integration/src/main/res/layout/snabble_fragment_cardinput_creditcard.xml b/ui-integration/src/main/res/layout/snabble_fragment_cardinput_creditcard.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<io.snabble.sdk.ui.payment.CreditCardInputView xmlns:android="http://schemas.android.com/apk/res/android"
+<io.snabble.sdk.ui.payment.CreditCardInputView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/user_payment_method_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</io.snabble.sdk.ui.payment.CreditCardInputView>
+    android:layout_height="match_parent"/>
diff --git a/ui-integration/src/main/res/layout/snabble_fragment_cardinput_payone.xml b/ui-integration/src/main/res/layout/snabble_fragment_cardinput_payone.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<io.snabble.sdk.ui.payment.PayoneInputView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/user_payment_method_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply from: '../scripts/maven.gradle'
 apply plugin: 'org.jetbrains.dokka'
+apply plugin: "org.jetbrains.kotlin.plugin.parcelize"
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -53,7 +54,7 @@ dependencies {
     implementation project(':utils')
     implementation project(':core')
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -65,10 +66,10 @@ dependencies {
     implementation 'me.relex:circleindicator:2.1.6'
     implementation 'ch.datatrans:android-sdk:1.4.2'
     implementation 'com.google.android.gms:play-services-wallet:18.1.3'
-    implementation 'eu.rekisoft.android.util:LazyWorker:2.0.2'
+    implementation 'eu.rekisoft.android.util:LazyWorker:2.1.0'
     implementation 'androidx.biometric:biometric:1.2.0-alpha03'
 
-    def camerax_version = "1.0.1"
+    def camerax_version = "1.0.2"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
diff --git a/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java b/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
@@ -27,6 +27,7 @@ public enum Action {
         SHOW_BARCODE_SEARCH,
         SHOW_SEPA_CARD_INPUT,
         SHOW_CREDIT_CARD_INPUT,
+        SHOW_PAYONE_INPUT,
         SHOW_PAYDIREKT_INPUT,
         SHOW_SHOPPING_CART,
         SHOW_PAYMENT_CREDENTIALS_LIST,
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
@@ -225,16 +225,10 @@ open class CheckoutBar @JvmOverloads constructor(
                             })
                 }
             } else {
-                var hasPaymentMethodThatRequiresCredentials = false
-                val paymentMethodsDescriptors = project.paymentMethodDescriptors
-                if (paymentMethodsDescriptors != null && paymentMethodsDescriptors.isNotEmpty()) {
-                    for (descriptor in paymentMethodsDescriptors) {
-                        if (descriptor.paymentMethod.isRequiringCredentials) {
-                            hasPaymentMethodThatRequiresCredentials = true
-                            break
-                        }
-                    }
-                }
+                val hasPaymentMethodThatRequiresCredentials =
+                    project.paymentMethodDescriptors?.any { descriptor ->
+                        descriptor.paymentMethod.isRequiringCredentials
+                    } ?: false
                 if (hasPaymentMethodThatRequiresCredentials) {
                     val activity = UIUtils.getHostActivity(context)
                     if (activity is FragmentActivity) {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/Datatrans.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/Datatrans.kt
@@ -38,14 +38,6 @@ object Datatrans {
         val isTesting: Boolean?,
     )
 
-    val datatransPaymentMethods = mapOf(
-        PaymentMethod.MASTERCARD to "ECA",
-        PaymentMethod.VISA to "VIS",
-        PaymentMethod.AMEX to "AMX",
-        PaymentMethod.TWINT to "TWI",
-        PaymentMethod.POST_FINANCE_CARD to "PFC"
-    )
-
     @JvmStatic
     fun registerCard(activity: FragmentActivity, project: Project, paymentMethod: PaymentMethod) {
         val descriptor = project.paymentMethodDescriptors.find { it.paymentMethod == paymentMethod }
@@ -77,8 +69,7 @@ object Datatrans {
             ).toRequestBody("application/json".toMediaType()))
             .build()
 
-        val okClient = project.okHttpClient
-        okClient.newCall(request).enqueue(object : SimpleJsonCallback<DatatransTokenizationResponse>(DatatransTokenizationResponse::class.java), Callback {
+        project.okHttpClient.newCall(request).enqueue(object : SimpleJsonCallback<DatatransTokenizationResponse>(DatatransTokenizationResponse::class.java), Callback {
             override fun success(response: DatatransTokenizationResponse) {
                 startDatatransTransaction(activity, response, paymentMethod, project)
             }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -183,6 +183,7 @@ public void onChanged() {
                     case CREDIT_CARD_PSD2:
                     case DATATRANS:
                     case DATATRANS_CREDITCARD:
+                    case PAYONE_CREDITCARD:
                         entries.add(new Entry(pm, getDrawableForBrand(pm.getBrand()), pm.getObfuscatedId()));
                         break;
                     case PAYDIREKT:
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.kt
@@ -1,7 +1,6 @@
 package io.snabble.sdk.ui.payment
 
 import android.content.Context
-import io.snabble.sdk.ui.payment.Datatrans.registerCard
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.ui.SnabbleUI
 import io.snabble.sdk.ui.utils.KeyguardUtils
@@ -22,15 +21,18 @@ object PaymentInputViewHelper {
         if (callback != null) {
             if (KeyguardUtils.isDeviceSecure()) {
                 val project = Snabble.getInstance().getProjectById(projectId)
-                val useDatatrans = project?.paymentMethodDescriptors
-                    ?.firstOrNull { it.paymentMethod == paymentMethod }?.acceptedOriginTypes
-                    ?.any { it == "datatransAlias" || it == "datatransCreditCardAlias" } ?: false
+                val acceptedOriginTypes = project?.paymentMethodDescriptors
+                    ?.firstOrNull { it.paymentMethod == paymentMethod }?.acceptedOriginTypes.orEmpty()
+                val useDatatrans = acceptedOriginTypes.any { it == "datatransAlias" || it == "datatransCreditCardAlias" }
+                val usePayone = acceptedOriginTypes.any { it == "payonePseudoCardPAN" }
 
                 val activity = UIUtils.getHostFragmentActivity(context)
                 val args = Bundle()
 
                 if (useDatatrans && paymentMethod != null) {
-                    registerCard(activity, project, paymentMethod)
+                    Datatrans.registerCard(activity, project, paymentMethod)
+                } else if (usePayone && paymentMethod != null) {
+                    Payone.registerCard(activity, project, paymentMethod, callback)
                 } else {
                     when (paymentMethod) {
                         PaymentMethod.VISA -> {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/Payone.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/Payone.kt
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PayoneInputView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PayoneInputView.kt
diff --git a/ui/src/main/res/raw/snabble_payoneform.html b/ui/src/main/res/raw/snabble_payoneform.html
diff --git a/ui/src/main/res/values-fr/strings.xml b/ui/src/main/res/values-fr/strings.xml
diff --git a/ui/src/main/res/values-it/strings.xml b/ui/src/main/res/values-it/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ public Fragment onCreateFragment() {`
`11`	`11`	`fragment.setArguments(getIntent().getBundleExtra("args"));`
`12`	`12`	`return fragment;`
`13`	`13`	`}`
`14`		`-}`
`15`		`-`
	`14`	`+}`