Add address and email to PAYONE form (#167)

Author: cmaier

CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 
 ## UNRELEASED
 ### Added
+* Address and email input fields for credit cards via PAYONE
+
 ### Changed 
 ### Removed
 ### Fixed

core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java

@@ -40,6 +40,7 @@
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.payment.data.GiropayAuthorizationData;
 import io.snabble.sdk.payment.data.GiropayData;
+import io.snabble.sdk.payment.data.PayoneData;
 import io.snabble.sdk.payment.externalbilling.data.ExternalBillingPaymentCredentials;
 import io.snabble.sdk.payment.payone.sepa.PayoneSepaData;
 import io.snabble.sdk.utils.GsonHolder;
@@ -153,18 +154,6 @@ 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;
-    }
-
     private static class TegutEmployeeCard {
         private String cardNumber;
     }
@@ -470,18 +459,23 @@ public static PaymentCredentials fromDatatrans(String token, Brand brand, String
     /**
      * Encrypts and stores a payone pseudo card pan.
      */
-    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();
+    @Nullable
+    public static PaymentCredentials fromPayone(
+            @NonNull final String pseudoCardPan,
+            @NonNull final String truncatedCardPan,
+            @NonNull final PaymentCredentials.Brand brand,
+            @NonNull final String cardExpiryDate,
+            @NonNull final String lastname,
+            @NonNull final String street,
+            @NonNull final String zip,
+            @NonNull final String city,
+            @NonNull final String country,
+            @Nullable final String state,
+            @NonNull final String email,
+            @Nullable final String userId,
+            @NonNull final String projectId
+    ) {
+        final PaymentCredentials pc = new PaymentCredentials();
         pc.generateId();
         if (brand == Brand.MASTERCARD || brand == Brand.AMEX || brand == Brand.VISA) {
             pc.type = Type.PAYONE_CREDITCARD;
@@ -490,22 +484,32 @@ public static PaymentCredentials fromPayone(String pseudocardpan,
         }
         pc.projectId = projectId;
 
-        List<X509Certificate> certificates = Snabble.getInstance().getPaymentCertificates();
-        if (certificates.size() == 0) {
+        final List<X509Certificate> certificates = Snabble.getInstance().getPaymentCertificates();
+        if (certificates == null || certificates.isEmpty()) {
             return null;
         }
 
-        PayoneData payoneData = new PayoneData(pseudocardpan, lastname, userId);
+        final PayoneData payoneData = new PayoneData(
+                pseudoCardPan,
+                lastname,
+                email,
+                street,
+                zip,
+                city,
+                country,
+                state,
+                userId
+        );
 
-        String json = GsonHolder.get().toJson(payoneData, PayoneData.class);
+        final String json = GsonHolder.get().toJson(payoneData, PayoneData.class);
 
-        X509Certificate certificate = certificates.get(0);
+        final 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);
+        pc.obfuscatedId = truncatedCardPan;
+        pc.validTo = parseValidTo("yyMM", cardExpiryDate);
 
         if (pc.rsaEncryptedData == null) {
             return null;

core/src/main/java/io/snabble/sdk/payment/data/PayoneData.kt

@@ -0,0 +1,35 @@
+package io.snabble.sdk.payment.data
+
+import com.google.gson.annotations.SerializedName
+
+@Suppress(
+    "LongParameterList",
+    "unused", // Fields are used for serialization
+)
+internal class PayoneData internal constructor(
+    @SerializedName("pseudoCardPAN") private val pseudoCardPan: String,
+    @SerializedName("name") private val name: String,
+    @SerializedName("email") private val email: String,
+    street: String,
+    zip: String,
+    city: String,
+    country: String,
+    state: String?,
+    @SerializedName("userID") private val userId: String?
+) {
+
+    @SerializedName("address")
+    private val address: Address
+
+    init {
+        address = Address(street, zip, city, country, state)
+    }
+
+    private class Address(
+        @SerializedName("street") val street: String,
+        @SerializedName("zip") val zip: String,
+        @SerializedName("city") val city: String,
+        @SerializedName("country") val country: String,
+        @SerializedName("state") val state: String?
+    )
+}

ui/src/main/java/io/snabble/sdk/ui/payment/Payone.kt

@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import com.google.gson.annotations.SerializedName
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
+import io.snabble.sdk.ui.payment.creditcard.data.CreditCardInfo
 import io.snabble.sdk.utils.Dispatch
 import io.snabble.sdk.utils.Logger
 import io.snabble.sdk.utils.SimpleJsonCallback
@@ -41,9 +43,20 @@ object Payone {
     ) : Parcelable
 
     data class PreAuthRequest(
-        val pseudoCardPAN: String,
-        val lastname: String,
-    )
+        @SerializedName("pseudoCardPAN") val pseudoCardPan: String,
+        @SerializedName("lastName") val name: String,
+        @SerializedName("email") val email: String,
+        @SerializedName("address") val address: Address
+    ) {
+
+        data class Address(
+            @SerializedName("street") val street: String,
+            @SerializedName("zip") val zip: String,
+            @SerializedName("city") val city: String,
+            @SerializedName("country") val country: String,
+            @SerializedName("state") val state: String?,
+        )
+    }
 
     data class PreAuthResponse(
         val status: AuthStatus,