Skip to content

Commit 20c7304

Browse files
gnongsiegnongsie
committed
Update to new version of SDK
1 parent 5e1cbc2 commit 20c7304

File tree

10 files changed

+18
-76
lines changed

10 files changed

+18
-76
lines changed

‎Source/Configuration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Configuration
1111

1212
public Dictionary<string, string> GetConfiguration()
1313
{
14-
_configurationDictionary.Add("authenticationType", "JWT");
14+
_configurationDictionary.Add("authenticationType", "HTTP_SIGNATURE");
1515
_configurationDictionary.Add("merchantID", "testrest");
1616
_configurationDictionary.Add("merchantsecretKey", "yBJxy6LjM2TmcPGu+GaJrHtkke25fPpUX+UY6/L/1tE=");
1717
_configurationDictionary.Add("merchantKeyId", "08c94330-f618-42a3-b09d-e1e43be5efda");
@@ -43,7 +43,7 @@ public Dictionary<string, string> GetConfiguration()
4343

4444
public Dictionary<string, string> GetAlternativeConfiguration()
4545
{
46-
_configurationDictionary.Add("authenticationType", "JWT");
46+
_configurationDictionary.Add("authenticationType", "HTTP_SIGNATURE");
4747
_configurationDictionary.Add("merchantID", "testrest_cpctv");
4848
_configurationDictionary.Add("merchantsecretKey", "JXm4dqKYIxWofM1TIbtYY9HuYo7Cg1HPHxn29f6waRo=");
4949
_configurationDictionary.Add("merchantKeyId", "e547c3d3-16e4-444c-9313-2a08784b906a");

‎Source/Resource/jwsToken.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJSUzI1NiIsInYtYy1tZXJjaGFudC1pZCI6InRlc3RyZXN0IiwieDVjIjpbIk1JSUNYekNDQWNpZ0F3SUJBZ0lXTlRjME5qWTBNalF6TURZNU1ERTNOekV3TnpBME5qQU5CZ2txaGtpRzl3MEJBUXNGQURBZU1Sd3dHZ1lEVlFRRERCTkRlV0psY2xOdmRYSmpaVU5sY25SQmRYUm9NQjRYRFRFNU1URXlOVEEyTkRRd00xb1hEVEl4TVRFeU5UQTJORFF3TTFvd05ERVJNQThHQTFVRUF3d0lkR1Z6ZEhKbGMzUXhIekFkQmdOVkJBVVRGalUzTkRZMk5ESTBNekEyT1RBeE56Y3hNRGN3TkRZd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMrQnRkTWNva2FLd1RlczlPK3NucWpXc2VoTzAvWTRDSnJ3bzRjZEdDYWZSTzZvd3MzbUMxeG1wU1l0dFRLSWRlR1IxcU9ZcFRTZVk5dUpoMmNDZmF5TUtYbWhRZjRkNXY4cE5Ebm1ZQk1HQndVMXdXamxZc01MRmJjUEZXamRQdEtsb3UyUklXWjU2NllXSWJXQ0JmK0c0ZEhrQTBEN0NzcDNGVDNsblVOMm1lNGxKa2x5c2ZxcDFYOHEzSkRxVklRRlZBZHVhbWhXQ1lNUlM1S2c4c0t3TWpsZEdRVWJ5ODhTK01Pd2NDQTNIT0hUNjRiYXJ2UElkMkV4cUFxdmZ5QkNQQVI0OVY2L3l3RFZzSDlTeUhld2cxMjFja01jQTlnNTV0SXFkc3lIR1JaTjlmczIwa015cUVQNzhMNGN4ZmlzdVZRQzhrbmxmWnRkY3FWQVk3RkFnTUJBQUV3RFFZSktvWklodmNOQVFFTEJRQURnWUVBdHBDL0VocS8yUDdWYXp6WTgxZ1ZucFBnRWpIWFB5S2t0emJSU1ZkUkcvTUdiVko1OVFWSmVMbnpnbXpIbXlxMGNKK1FTUVBWTzQ2YmxvTkYrMjlJWVErelZZWGFOZ3ZqcVlRU2hYUEM2bllJbkZDZk9uMXByUklJY0l0KzViWkpZRmtRR1R6OGprRUF2QlpsYjBsdm02S3REVWI5T0xPMzhIMDV5U0xpbDY4PSJdfQ.ewoiZGlnZXN0IjoiRkp6bDZnMUI2Nzh1OWc1Zy82MnFYSkIrTkVYY2tnSEkvb0hocmtnSkI5TT0iLCAiZGlnZXN0QWxnb3JpdGhtIjoiU0hBLTI1NiIsICJpYXQiOiJGcmksIDIxIEphbiAyMDIyIDA1OjQzOjI1IEdNVCJ9.q6vWvNuzSsuLsaWmBm9aez1DwjnaA9U4fgm4hmhM7ZfDzt1gvUt8rlDxYLplTJUsC1fDW9eZittAvSjqMJJszZO5VG8bPr4G3ypQ25NJkZl7d2lDtAbyyMeZGafFsUzQwy8UUQ1SdpwPwo5WyIcYxMu-yMnqhLNugh_JkFvnAtlYdfbbt58QkctIky3U4vebQY10S2B2W5xGasaOsaLQDd8TC2Grp3CdmaUy1XjA8k5Yu336QXKToi9_tWYgBfX2TMP8NIuk8twqXdgeIsg6zhxvjU9Db1gf6sbfoUIm4cYivkG2uffuNTN31lG2zoE2GhPEM3xugMU5Hs9XjlCRyQ
1+
eyJhbGciOiJSUzI1NiIsInYtYy1tZXJjaGFudC1pZCI6InRlc3RyZXN0IiwieDVjIjpbIk1JSUNYekNDQWNpZ0F3SUJBZ0lXTlRjME5qWTBNalF6TURZNU1ERTNOekV3TnpBME5qQU5CZ2txaGtpRzl3MEJBUXNGQURBZU1Sd3dHZ1lEVlFRRERCTkRlV0psY2xOdmRYSmpaVU5sY25SQmRYUm9NQjRYRFRFNU1URXlOVEEyTkRRd00xb1hEVEl4TVRFeU5UQTJORFF3TTFvd05ERVJNQThHQTFVRUF3d0lkR1Z6ZEhKbGMzUXhIekFkQmdOVkJBVVRGalUzTkRZMk5ESTBNekEyT1RBeE56Y3hNRGN3TkRZd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMrQnRkTWNva2FLd1RlczlPK3NucWpXc2VoTzAvWTRDSnJ3bzRjZEdDYWZSTzZvd3MzbUMxeG1wU1l0dFRLSWRlR1IxcU9ZcFRTZVk5dUpoMmNDZmF5TUtYbWhRZjRkNXY4cE5Ebm1ZQk1HQndVMXdXamxZc01MRmJjUEZXamRQdEtsb3UyUklXWjU2NllXSWJXQ0JmK0c0ZEhrQTBEN0NzcDNGVDNsblVOMm1lNGxKa2x5c2ZxcDFYOHEzSkRxVklRRlZBZHVhbWhXQ1lNUlM1S2c4c0t3TWpsZEdRVWJ5ODhTK01Pd2NDQTNIT0hUNjRiYXJ2UElkMkV4cUFxdmZ5QkNQQVI0OVY2L3l3RFZzSDlTeUhld2cxMjFja01jQTlnNTV0SXFkc3lIR1JaTjlmczIwa015cUVQNzhMNGN4ZmlzdVZRQzhrbmxmWnRkY3FWQVk3RkFnTUJBQUV3RFFZSktvWklodmNOQVFFTEJRQURnWUVBdHBDL0VocS8yUDdWYXp6WTgxZ1ZucFBnRWpIWFB5S2t0emJSU1ZkUkcvTUdiVko1OVFWSmVMbnpnbXpIbXlxMGNKK1FTUVBWTzQ2YmxvTkYrMjlJWVErelZZWGFOZ3ZqcVlRU2hYUEM2bllJbkZDZk9uMXByUklJY0l0KzViWkpZRmtRR1R6OGprRUF2QlpsYjBsdm02S3REVWI5T0xPMzhIMDV5U0xpbDY4PSJdfQ.eyJpYXQiOiJXZWQsIDAyIE1hciAyMDIyIDA3OjU0OjM3IEdNVCJ9.Mxko9nrb6kja6JH5zOna0SzEShZFgrsMxBNpl5bhA9loJNuEZ9IIR6Ij25uJoN6yFQ2IphlKaZKEwvuHkoQWPS_9SUu7Nq9Q4jhrJebNXfhyEew_NFs24LSwgrZvmfq7UOvNmIQX6gsNzNeSSmUgS1IB676mHeFpBIEN6GjuDu44SA-G1_J4MCYj3I-qFoijqOCLPbbZFTqI6De33oV8o5sLDjZ-LJg0xrwgJ4wlQCe5FwXIg9n9yvHswlAhYTq_EDYP_5r9fX7bGDy7KCMfJsADYgLE_SM5jV9ArRNHErXws3cvJop1dnH55V2Gjl3Lz2Lkk07HBiEFakJMGcF5Jg

‎Source/Resource/signatureHeaderValue.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
keyid="08c94330-f618-42a3-b09d-e1e43be5efda", algorithm="HmacSHA256", headers="host date (request-target) digest v-c-merchant-id", signature="uSkBBjN6ojmxWj1UL+FSPvVz8+IWUwr07iuhwlInxB4="
1+
keyid="08c94330-f618-42a3-b09d-e1e43be5efda", algorithm="HmacSHA256", headers="host date (request-target) digest v-c-merchant-id", signature="I/3BC76nsQmZGOlnsrvslZk/VLVaXA2Jb0iVtce++JE="

‎Source/SampleCode.cs‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.IO;
44
using System.Linq;
55
using System.Net;
6-
using System.Threading.Tasks;
76
using NLog;
87

98
namespace Cybersource_rest_samples_dotnet
@@ -65,40 +64,6 @@ public static void Main(string[] args)
6564
logger.Trace("PROGRAM EXECUTION ENDS");
6665
}
6766

68-
public static async Task MultiThreadedTogglingCredentials()
69-
{
70-
int taskCount = 10;
71-
72-
List<Task> tasks = new List<Task>();
73-
for (int i = 0; i < taskCount; i++)
74-
{
75-
string program = string.Empty;
76-
tasks.Add(new Task(() =>
77-
{
78-
for (int j = 0; j < taskCount; j++)
79-
{
80-
if (j % 2 == 0)
81-
{
82-
program = "SimpleAuthorizationInternet";
83-
}
84-
else
85-
{
86-
program = "IncrementalAuthorization";
87-
}
88-
89-
RunSample(program);
90-
}
91-
}));
92-
}
93-
94-
foreach (var task in tasks)
95-
{
96-
task.Start();
97-
}
98-
99-
await Task.WhenAll(tasks);
100-
}
101-
10267
public static void RunSample(string cmdLineArg = null)
10368
{
10469
try
@@ -122,10 +87,6 @@ public static void RunSample(string cmdLineArg = null)
12287

12388
Console.WriteLine("\n\nTotal number of Sample run : " + sampleCount);
12489
}
125-
else if (_sampleToRun.ToUpper().Contains("GAMWOR"))
126-
{
127-
MultiThreadedTogglingCredentials();
128-
}
12990
else
13091
{
13192
foreach (var path in SampleCodeClassesPathList)

‎Source/Samples/Authentication/GenerateHttpRequestHeaders/PutGenerateHeaders.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ public class PutGenerateHeaders
1111
// Report Details provided in the JSON File are sent along with the Request as Request Body
1212
// Below request subscribes 'TRR Report' for Organization ID: testrest
1313
private const string RequestTarget = "/reporting/v2/reportSubscriptions/TRRReport?organizationId=testrest";
14-
private const string RequestJsonFilePath = "../../../Source/Resource/TRRReport.json";
15-
1614
public static void Run()
1715
{
16+
string RequestJsonFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../../../", "Source/Resource/TRRReport.json");
1817
try
1918
{
2019
// Setting up Merchant Config

‎Source/Samples/Authentication/StandAloneHttpSignature.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public static StringBuilder GenerateSignature(string request, string digest, str
311311
signatureHeaderValue.Append(", signature=\"" + base64EncodedSignature + "\"");
312312

313313
// Writing Generated Token to file.
314-
File.WriteAllText(@"../../../Source/Resource/" + "signatureHeaderValue.txt", signatureHeaderValue.ToString());
314+
File.WriteAllText(AppDomain.CurrentDomain.BaseDirectory + @"../../../Source/Resource/" + "signatureHeaderValue.txt", signatureHeaderValue.ToString());
315315
}
316316
catch (Exception ex)
317317
{

‎cybersource-rest-samples-csharp.csproj‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,18 @@
3636
<Reference Include="ApiSdk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>Source\lib\net461\ApiSdk.dll</HintPath>
39+
</Reference>
40+
<Reference Include="AuthenticationSdk">
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>packages\CyberSource.Authentication.0.0.0.13\lib\AuthenticationSdk.dll</HintPath>
43+
</Reference>
44+
<Reference Include="cybersource-rest-client-dotnet">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>packages\CyberSource.Rest.Client.0.0.1.20\lib\cybersource-rest-client-dotnet.dll</HintPath>
3947
</Reference>
4048
<Reference Include="jose-jwt">
4149
<HintPath>packages\jose-jwt.2.4.0\lib\net461\jose-jwt.dll</HintPath>
4250
</Reference>
43-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4451
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4552
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4653
<Private>True</Private>
@@ -49,9 +56,6 @@
4956
<HintPath>packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
5057
<Private>True</Private>
5158
</Reference>
52-
<Reference Include="nunit.framework">
53-
<HintPath>packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
54-
</Reference>
5559
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
5660
<SpecificVersion>False</SpecificVersion>
5761
<HintPath>packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
@@ -323,16 +327,6 @@
323327
<Content Include="Source\Resource\jwsToken.txt" />
324328
<Content Include="Source\Resource\signatureHeaderValue.txt" />
325329
</ItemGroup>
326-
<ItemGroup>
327-
<ProjectReference Include="..\cybersource-rest-auth-dotnet\AuthenticationSdk\AuthenticationSdk\AuthenticationSdk.csproj">
328-
<Project>{910f28d1-8bd0-4359-aacb-b96c04cf68e8}</Project>
329-
<Name>AuthenticationSdk</Name>
330-
</ProjectReference>
331-
<ProjectReference Include="..\cybersource-rest-client-dotnet\cybersource-rest-client-dotnet.csproj">
332-
<Project>{8c08b6dc-4da0-4434-a6c5-709932dddde5}</Project>
333-
<Name>cybersource-rest-client-dotnet</Name>
334-
</ProjectReference>
335-
</ItemGroup>
336330
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
337331
<PropertyGroup>
338332
<PostBuildEvent>DEL /S /Q ..\..\..\obj\*</PostBuildEvent>

‎cybersource-rest-samples-csharp.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.31624.102
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-samples-csharp", "cybersource-rest-samples-csharp.csproj", "{97FF11A4-924D-4C87-A028-2AAF64655954}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationSdk", "..\cybersource-rest-auth-dotnet\AuthenticationSdk\AuthenticationSdk\AuthenticationSdk.csproj", "{910F28D1-8BD0-4359-AACB-B96C04CF68E8}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-client-dotnet", "..\cybersource-rest-client-dotnet\cybersource-rest-client-dotnet.csproj", "{8C08B6DC-4DA0-4434-A6C5-709932DDDDE5}"
11-
EndProject
128
Global
139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1410
Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
1915
{97FF11A4-924D-4C87-A028-2AAF64655954}.Debug|Any CPU.Build.0 = Debug|Any CPU
2016
{97FF11A4-924D-4C87-A028-2AAF64655954}.Release|Any CPU.ActiveCfg = Release|Any CPU
2117
{97FF11A4-924D-4C87-A028-2AAF64655954}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{910F28D1-8BD0-4359-AACB-B96C04CF68E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{910F28D1-8BD0-4359-AACB-B96C04CF68E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{910F28D1-8BD0-4359-AACB-B96C04CF68E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{910F28D1-8BD0-4359-AACB-B96C04CF68E8}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{8C08B6DC-4DA0-4434-A6C5-709932DDDDE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{8C08B6DC-4DA0-4434-A6C5-709932DDDDE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{8C08B6DC-4DA0-4434-A6C5-709932DDDDE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{8C08B6DC-4DA0-4434-A6C5-709932DDDDE5}.Release|Any CPU.Build.0 = Release|Any CPU
3018
EndGlobalSection
3119
GlobalSection(SolutionProperties) = preSolution
3220
HideSolutionNode = FALSE

‎cybersource-rest-samples-netcore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="CyberSource.Authentication.NetStandard" Version="0.0.1.5" />
43-
<PackageReference Include="CyberSource.Rest.Client.NetStandard" Version="0.0.1.11" />
42+
<PackageReference Include="CyberSource.Authentication.NetStandard" Version="0.0.1.6" />
43+
<PackageReference Include="CyberSource.Rest.Client.NetStandard" Version="0.0.1.12" />
4444
<PackageReference Include="jose-jwt" Version="2.5.0" />
4545
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
4646
<PackageReference Include="NLog" Version="4.7.4" />

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CyberSource.Authentication" version="0.0.0.11" targetFramework="net461" />
4-
<package id="CyberSource.Rest.Client" version="0.0.1.18" targetFramework="net461" />
3+
<package id="CyberSource.Authentication" version="0.0.0.13" targetFramework="net461" />
4+
<package id="CyberSource.Rest.Client" version="0.0.1.20" targetFramework="net461" />
55
<package id="jose-jwt" version="2.4.0" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
77
<package id="NLog" version="4.5.10" targetFramework="net461" />

0 commit comments

Comments
 (0)