Merge pull request #35 from Adyen/cancel-or-refund

#34 support for specific skin requests without the need to change the…

Author: rikterbeek

src/main/java/com/adyen/model/hpp/DirectoryLookupRequest.java

@@ -28,6 +28,10 @@ public class DirectoryLookupRequest {
     private String sessionValidity;
     private String merchantReference;
     private String countryCode;
+    private String skinCode;
+    private String merchantAccount;
+    private String hmacKey;
+
 
     public DirectoryLookupRequest() {
         sessionValidity = Util.calculateSessionValidity();
@@ -77,4 +81,31 @@ public DirectoryLookupRequest setCountryCode(String countryCode) {
         this.countryCode = countryCode;
         return this;
     }
+
+    public String getSkinCode() {
+        return skinCode;
+    }
+
+    public DirectoryLookupRequest setSkinCode(String skinCode) {
+        this.skinCode = skinCode;
+        return this;
+    }
+
+    public String getMerchantAccount() {
+        return merchantAccount;
+    }
+
+    public DirectoryLookupRequest setMerchantAccount(String merchantAccount) {
+        this.merchantAccount = merchantAccount;
+        return this;
+    }
+
+    public String getHmacKey() {
+        return hmacKey;
+    }
+
+    public DirectoryLookupRequest setHmacKey(String hmacKey) {
+        this.hmacKey = hmacKey;
+        return this;
+    }
 }

src/main/java/com/adyen/service/HostedPaymentPages.java

@@ -64,9 +64,21 @@ public SortedMap<String, String> getPostParametersFromDLRequest(DirectoryLookupR
         // Set HTTP Post variables
         final SortedMap<String, String> postParameters = new TreeMap<>();
         postParameters.put(CURRENCY_CODE, request.getCurrencyCode());
-        postParameters.put(MERCHANT_ACCOUNT, config.getMerchantAccount());
+
+        if (request.getMerchantAccount() != null) {
+            postParameters.put(MERCHANT_ACCOUNT, request.getMerchantAccount());
+        } else {
+            postParameters.put(MERCHANT_ACCOUNT, config.getMerchantAccount());
+        }
+
         postParameters.put(PAYMENT_AMOUNT, request.getPaymentAmount());
-        postParameters.put(SKIN_CODE, config.getSkinCode());
+
+        if (request.getSkinCode() != null) {
+            postParameters.put(SKIN_CODE, request.getSkinCode());
+        } else {
+            postParameters.put(SKIN_CODE, config.getSkinCode());
+        }
+
         postParameters.put(MERCHANT_REFERENCE, request.getMerchantReference());
         postParameters.put(SESSION_VALIDITY, request.getSessionValidity());
         postParameters.put(COUNTRY_CODE, request.getCountryCode());
@@ -75,7 +87,14 @@ public SortedMap<String, String> getPostParametersFromDLRequest(DirectoryLookupR
 
         String dataToSign = hmacValidator.getDataToSign(postParameters);
 
-        String merchantSig = hmacValidator.calculateHMAC(dataToSign, config.getHmacKey());
+        String hmacKey;
+        if (request.getHmacKey() != null) {
+            hmacKey = request.getHmacKey();
+        } else {
+            hmacKey = config.getHmacKey();
+        }
+
+        String merchantSig = hmacValidator.calculateHMAC(dataToSign, hmacKey);
         postParameters.put(MERCHANT_SIG, merchantSig);
 
         return postParameters;