Refactor HTTP header creation methods and update meal voucher tokenization logic for Edenred cards

Author: MasterSlave

src/main/java/io/craftgate/adapter/BaseAdapter.java

@@ -27,49 +27,30 @@ protected BaseAdapter(RequestOptions requestOptions) {
         this.requestOptions = requestOptions;
     }
 
-    protected Map<String, String> createHeaders(Object request, String path, RequestOptions requestOptions) {
-        return createHttpHeaders(request, path, requestOptions);
+    protected Map<String, String> createHeaders(Object request, String path) {
+        return createHttpHeaders(request, path, null);
     }
 
     protected Map<String, String> createHeaders(Object request, String path, RequestContext requestContext) {
         return createHttpHeaders(request, path, requestContext);
     }
 
-    protected Map<String, String> createHeaders(String path, RequestOptions requestOptions) {
-        return createHttpHeaders(null, path, requestOptions);
+    protected Map<String, String> createHeaders(String path) {
+        return createHttpHeaders(null, path, null);
     }
 
     protected Map<String, String> createHeaders(String path, RequestContext requestContext) {
         return createHttpHeaders(null, path, requestContext);
     }
 
-    private static Map<String, String> createHttpHeaders(Object request, String path, RequestOptions options) {
-        Map<String, String> headers = new HashMap<>();
-
-        String randomString = UUID.randomUUID().toString();
-        headers.put(API_KEY_HEADER_NAME, options.getApiKey());
-        headers.put(RANDOM_HEADER_NAME, randomString);
-        headers.put(AUTH_VERSION_HEADER_NAME, API_VERSION_HEADER_VALUE);
-        headers.put(CLIENT_VERSION_HEADER_NAME, CLIENT_VERSION_HEADER_VALUE + ":1.0.81");
-        headers.put(SIGNATURE_HEADER_NAME, prepareAuthorizationString(request, path, randomString, options));
-        if (Objects.nonNull(options.getLanguage())) {
-            headers.put(LANGUAGE_HEADER_NAME, options.getLanguage());
-        }
-        return headers;
-    }
-
-    private static String prepareAuthorizationString(Object request, String path, String randomString, RequestOptions options) {
-        return HashGenerator.generateHash(options.getBaseUrl(), options.getApiKey(), options.getSecretKey(), randomString, request, path);
-    }
-
     private Map<String, String> createHttpHeaders(Object request, String path, RequestContext requestContext) {
         Map<String, String> headers = new HashMap<>();
 
         String randomString = UUID.randomUUID().toString();
         headers.put(API_KEY_HEADER_NAME, requestOptions.getApiKey());
         headers.put(RANDOM_HEADER_NAME, randomString);
         headers.put(AUTH_VERSION_HEADER_NAME, API_VERSION_HEADER_VALUE);
-        headers.put(CLIENT_VERSION_HEADER_NAME, CLIENT_VERSION_HEADER_VALUE + ":1.0.79");
+        headers.put(CLIENT_VERSION_HEADER_NAME, CLIENT_VERSION_HEADER_VALUE + ":1.0.81");
         headers.put(SIGNATURE_HEADER_NAME, prepareAuthorizationString(request, path, randomString));
         if (Objects.nonNull(requestOptions.getLanguage())) {
             headers.put(LANGUAGE_HEADER_NAME, requestOptions.getLanguage());

src/main/java/io/craftgate/adapter/PaymentAdapter.java

@@ -458,7 +458,7 @@ public StoredCardListResponse retrieveProviderCards(RetrieveProviderCardRequest
     public IVRCardTokenizationResponse retrieveCardFromIvr(RetrieveCardFromIvrRequest retrieveCardFromIvrRequest) {
         String query = RequestQueryParamsBuilder.buildQueryParam(retrieveCardFromIvrRequest);
         String path = "/payment/v1/ivr-cards" + query;
-        return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), IVRCardTokenizationResponse.class);
+        return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path), IVRCardTokenizationResponse.class);
     }
 
     public CreateDepositToCardPaymentResponse depositToCard(CreateDepositToCardRequest createDepositToCardRequest) {

src/main/java/io/craftgate/request/dto/MealVoucherCardTokenizationData.java

@@ -10,54 +10,64 @@
 public class MealVoucherCardTokenizationData {
 
     private String cardNumber;
-
     private String userReferenceNumber;
-
     private String gsmNumber;
-
     private String callbackUrl;
 
+    public static MealVoucherCardTokenizationData buildForMultinet(String userReferenceNumber, String callbackUrl) {
+        return MealVoucherCardTokenizationData.builder()
+                .userReferenceNumber(userReferenceNumber)
+                .callbackUrl(callbackUrl)
+                .build();
+    }
+
+    public static MealVoucherCardTokenizationData buildForMultinet(String callbackUrl) {
+        return MealVoucherCardTokenizationData.builder()
+                .callbackUrl(callbackUrl)
+                .build();
+    }
 
-    public static MealVoucherCardTokenizationData buildForMultinet(String userReferenceNumber, String callbackUrl){
-       return MealVoucherCardTokenizationData.builder()
-               .userReferenceNumber(userReferenceNumber)
-               .callbackUrl(callbackUrl)
-               .build();
+    public static MealVoucherCardTokenizationData buildForEdenred(String userReferenceNumber, String callbackUrl) {
+        return MealVoucherCardTokenizationData.builder()
+                .userReferenceNumber(userReferenceNumber)
+                .callbackUrl(callbackUrl)
+                .build();
     }
-    public static MealVoucherCardTokenizationData buildForMultinet(String callbackUrl){
+
+    public static MealVoucherCardTokenizationData buildForEdenred(String callbackUrl) {
         return MealVoucherCardTokenizationData.builder()
                 .callbackUrl(callbackUrl)
                 .build();
     }
 
-    public static MealVoucherCardTokenizationData buildForSetcard(String callbackUrl){
+    public static MealVoucherCardTokenizationData buildForSetcard(String callbackUrl) {
         return MealVoucherCardTokenizationData.builder()
                 .callbackUrl(callbackUrl)
                 .build();
     }
 
-    public static MealVoucherCardTokenizationData buildForMetropol(String userReferenceNumber, String cardNumber, String gsmNumber){
+    public static MealVoucherCardTokenizationData buildForMetropol(String userReferenceNumber, String cardNumber, String gsmNumber) {
         return MealVoucherCardTokenizationData.builder()
                 .userReferenceNumber(userReferenceNumber)
                 .cardNumber(cardNumber)
                 .gsmNumber(gsmNumber)
                 .build();
     }
 
-    public static MealVoucherCardTokenizationData buildForMetropol(String cardNumber, String gsmNumber){
+    public static MealVoucherCardTokenizationData buildForMetropol(String cardNumber, String gsmNumber) {
         return MealVoucherCardTokenizationData.builder()
                 .cardNumber(cardNumber)
                 .gsmNumber(gsmNumber)
                 .build();
     }
 
-    public static MealVoucherCardTokenizationData buildForPluxee(String callbackUrl){
+    public static MealVoucherCardTokenizationData buildForPluxee(String callbackUrl) {
         return MealVoucherCardTokenizationData.builder()
                 .callbackUrl(callbackUrl)
                 .build();
     }
 
-    public static MealVoucherCardTokenizationData buildForTokenflex(String callbackUrl){
+    public static MealVoucherCardTokenizationData buildForTokenflex(String callbackUrl) {
         return MealVoucherCardTokenizationData.builder()
                 .callbackUrl(callbackUrl)
                 .build();