Merge pull request #14 from bprokopc/master

Use Flex Web Client SDK

Author: bprokopc

java/flex-sdk-spring-boot/pom.xml

@@ -53,7 +53,14 @@
         <dependency>
             <groupId>com.cybersource</groupId>
             <artifactId>flex-server-sdk</artifactId>
-            <version>0.1.0</version>
+            <version>0.1.1</version>
+        </dependency>
+        
+        <!-- Flex Web SDK -->
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>cybersource__flex-sdk-web</artifactId>
+            <version>0.1.2</version>
         </dependency>
     </dependencies>
-</project>
+</project>

java/flex-sdk-spring-boot/src/main/java/com/cybersource/flex/application/FlexConfigurationCGK.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2017 by CyberSource
+ * Governing licence: https://github.com/CyberSource/cybersource-flex-samples/blob/master/LICENSE.md
+ */
+package com.cybersource.flex.application;
+
+import com.cybersource.flex.sdk.FlexService;
+import com.cybersource.flex.sdk.FlexServiceFactory;
+import com.cybersource.flex.sdk.authentication.CGKCredentials;
+import com.cybersource.flex.sdk.exception.FlexException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FlexConfigurationCGK {
+
+    @Value("${cgk.mid}")
+    private String mid;
+    @Value("${cgk.keyId}")
+    private String keyId;
+    @Value("${cgk.shared-secret}")
+    private char[] sharedSecret;
+
+    @Bean
+    public FlexService flexService() {
+        try {
+            CGKCredentials cgkCredentials = new CGKCredentials(CGKCredentials.Environment.CAS, mid, keyId, sharedSecret);
+            return FlexServiceFactory.createInstance(cgkCredentials);
+        } catch (FlexException flexException) {
+            throw new RuntimeException("Error when configuring Flex Server SDK", flexException);
+        }
+    }
+
+}

…/flex/application/FlexConfiguration.java …ex/application/FlexConfigurationVDP.javajava/flex-sdk-spring-boot/src/main/java/com/cybersource/flex/application/FlexConfiguration.java renamed to java/flex-sdk-spring-boot/src/main/java/com/cybersource/flex/application/FlexConfigurationVDP.java java/flex-sdk-spring-boot/src/main/java/com/cybersource/flex/application/FlexConfiguration.java renamed to java/flex-sdk-spring-boot/src/main/java/com/cybersource/flex/application/FlexConfigurationVDP.java

@@ -5,14 +5,19 @@
 package com.cybersource.flex.application;
 
 import com.cybersource.flex.sdk.FlexService;
+import com.cybersource.flex.sdk.FlexServiceFactory;
 import com.cybersource.flex.sdk.authentication.VDPCredentials;
-import com.cybersource.flex.sdk.impl.FlexKeyServiceImpl;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
-public class FlexConfiguration {
+/**
+ * Please uncomment Configuration annotation below to enable Visa Developer
+ * Platform. You must also comment out Configuration annotation in corresponding
+ * FlexConfigurationVDP.java to disable CGK.
+ */
+//@Configuration
+public class FlexConfigurationVDP {
 
     @Value("${vdp.api-key}")
     private String apiKey;
@@ -22,7 +27,7 @@ public class FlexConfiguration {
     @Bean
     public FlexService flexService() {
         VDPCredentials vdpCredentials = new VDPCredentials(VDPCredentials.Environment.SANDBOX, apiKey, sharedSecret);
-        return new FlexKeyServiceImpl(vdpCredentials);
+        return FlexServiceFactory.createInstance(vdpCredentials);
     }
 
 }

java/flex-sdk-spring-boot/src/main/resources/application.properties

@@ -1,11 +1,17 @@
-# VISA Developer Platform credentials - https://developer.visa.com/
+# Cybersource GateKeeper credentials - https://developer.cybersource.com/
 #
 # This property file is for demonstartion purposes only.
 # You MUST take proper precautions to protect your credentials, such as
 # NEVER storing your credentials unencrypted with application code.
 #
-vdp.api-key=_YOUR_APPLICATION_SPECIFIC_API_KEY_
-vdp.shared-secret=_YOUR_APPLICATION_SPECIFIC_SHARED_SECRET_
+cgk.mid=_YOUR_MID_
+cgk.keyId=_YOUR_HMAC_KEY_ID_
+cgk.shared-secret=_YOUR_SHARED_SECRET_
+
+# VISA Developer Platform credentials - https://developer.visa.com/
+# To use the VDP you need to disable CGK properties above and edit FlexConfigurationVDP.java
+#vdp.api-key=_YOUR_APPLICATION_SPECIFIC_API_KEY_
+#vdp.shared-secret=_YOUR_APPLICATION_SPECIFIC_SHARED_SECRET_
 
 # Embedded Tomcat configuration properties
 #