Merge pull request #16 from CyberSource/future

Future to Master

Author: shamirwasia

BaseClient/util.h

@@ -13,6 +13,24 @@
 extern "C" {
 #endif
 
+/* Please do not modify these values */
+#if defined(_WIN64)
+   static const wchar_t CLIENT_ENVIRONMENT_VALUE[] = L"Win64";
+#elif defined(_WIN32)
+   static const wchar_t CLIENT_ENVIRONMENT_VALUE[] = L"Win32";
+#else
+#if defined(__linux)
+  #if defined(__LP64__) || defined(_LP64)
+      static const wchar_t CLIENT_ENVIRONMENT_VALUE[] = L"Linux x86_64";
+  #else
+      static const wchar_t CLIENT_ENVIRONMENT_VALUE[] = L"Linux x86_32";
+  #endif
+#else
+    static const wchar_t CLIENT_ENVIRONMENT_VALUE[] = L"Unknown";
+#endif
+#endif
+
+
 #include <stdlib.h>
 
 
@@ -49,8 +67,10 @@ const char CYBS_SK_ERROR_INFO[]             = "_errorInfo";
 const char CYBS_C_USE_AKAMAI[]              = "sendToAkamai";
 
 
-/* clientLibraryVersion */
-static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.0";
+/* Please do not modify these values */
+static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.1";
+static const wchar_t CLIENT_LIBRARY_VALUE[] = L"C SOAP";
+static const wchar_t CLIENT_APPLICATION_VALUE[] = L"Simple Order API";
 
 typedef struct {
     const void *key;
@@ -102,4 +122,4 @@ void printdata(CybsMap *store);
 
 #endif /* #define __KVS_H__ */
 
-	
+	

Makefile

@@ -1,4 +1,4 @@
-API_VERSION    = 6.0.0
+API_VERSION    = 6.0.1
 PROD_NAME      = simapi-c
 ZIP_NAME       = $(PROD_NAME)-linux
 DIST_BASE      = builds

NVPClient/.NVPClient.cpp.swp

@@ -36,8 +36,11 @@ unsigned long pthreads_thread_id(void );
 	const char  akamaiCasserver[]   =    "https://ics2wstesta.ic3.com/commerce/1.x/transactionProcessor";
 
 char DEFAULT_CERT_FILE[]   = "ca-bundle";
-	char SERVER_PUBLIC_KEY_NAME[]          =    "CyberSource_SJC_US/serialNumber";
+char SERVER_PUBLIC_KEY_NAME[]  =    "CyberSource_SJC_US/serialNumber";
 static const wchar_t CLIENT_LIBRARY_VERSION[] = L"clientLibraryVersion";
+static const wchar_t CLIENT_LIBRARY[] = L"clientLibrary";
+static const wchar_t CLIENT_ENVIRONMENT[] = L"clientEnvironment";
+static const wchar_t CLIENT_APPLICATION[] = L"clientApplication";
 
 #define RETURN_ERROR( status, info ) \
 { \
@@ -570,6 +573,13 @@ int runTransaction(INVPTransactionProcessorProxy *proxy, CybsMap *configMap, std
 
 	req[CLIENT_LIBRARY_VERSION] = CLIENT_LIBRARY_VERSION_VALUE;
 
+	req[CLIENT_LIBRARY] = CLIENT_LIBRARY_VALUE;
+
+	req[CLIENT_ENVIRONMENT] = CLIENT_ENVIRONMENT_VALUE;
+
+	req[CLIENT_APPLICATION] = CLIENT_APPLICATION_VALUE;
+
+
 	if (cfg.isLogEnabled)
 	  cybs_log_NVP(cfg, req, CYBS_LT_REQUEST);
 

NVPClient/NVPClient.cpp

@@ -181,7 +181,6 @@ void runCapture( CybsMap* cfgMap, std::wstring authRequestID ) {
 	std::map <std::wstring, std::wstring> requestMap;
 	std::map <std::wstring, std::wstring> resMap;
 
-	requestMap[L"merchantID"] = L"cybs_test_ashish";
 	requestMap[L"ccCaptureService_run"] = L"true";
 	requestMap[L"merchantReferenceCode"] = L"your_merchant_reference_code";
 	requestMap[L"ccCaptureService_authRequestID"] = authRequestID;

NVPTest/NVPTest

@@ -560,6 +560,9 @@ int cybs_runTransaction(ITransactionProcessorProxy *proxy, ns2__RequestMessage *
 	// Set client library version in request
 	//std::string clientLibVersion (CLIENT_LIBRARY_VERSION_VALUE);
 	ns2__requestMessage->clientLibraryVersion = const_cast< wchar_t* >(CLIENT_LIBRARY_VERSION_VALUE);
+	ns2__requestMessage->clientLibrary = const_cast< wchar_t* >(CLIENT_LIBRARY_VALUE);
+	ns2__requestMessage->clientEnvironment = const_cast< wchar_t* >(CLIENT_ENVIRONMENT_VALUE);
+	ns2__requestMessage->clientApplication = const_cast< wchar_t* >(CLIENT_APPLICATION_VALUE);
 
 	/* converting ns2__requestMessage to xml */
 	std::stringstream ss;

NVPTest/NVPTest.cpp

@@ -5,7 +5,7 @@ rem This is the packaging batch file for Windows.
 rem For Linux, run "make" in the client subdirectory.
 rem *************************************************
 set platform=%1
-set CLIENT_LIBRARY_VERSION_VALUE=6.0.0
+set CLIENT_LIBRARY_VERSION_VALUE=6.0.1
 
 set BUILD_DIR=builds
 if "%platform%"=="win32" (
@@ -126,4 +126,4 @@ jar Mcf simapi-c-win64-%CLIENT_LIBRARY_VERSION_VALUE%.zip simapi-c-win64-%CLIENT
 echo Listing simapi-c-win32-%CLIENT_LIBRARY_VERSION_VALUE%...
 dir simapi-c-win32-%CLIENT_LIBRARY_VERSION_VALUE% 
 
-cd ..
+cd ..

NVPTest/NVPTest.o

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <requestMessage
 	xmlns:ns2="urn:schemas-cybersource-com:transaction-data-1.129">
-    <ns2:merchantID>merchantid</ns2:merchant>
+    <ns2:merchantID>cybs_test_ashish1</ns2:merchant>
 	<ns2:merchantReferenceCode>your_merchant_reference_code</ns2:merchantReferenceCode>
 	<ns2:billTo>
 		<ns2:firstName>John</ns2:firstName>