Updating csharp library with new csharp OAuth signer and encryption libraries

Author: danny-gallagher

csharp/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.1
+5.0.1

csharp/Acme.App.MastercardApi.Client.Tests/TokenizeApiTest.cs

@@ -1,14 +1,13 @@
-using System;
+using System.Security.Cryptography;
 using Mastercard.Developer.ClientEncryption.Core.Encryption;
 using Mastercard.Developer.ClientEncryption.Core.Utils;
-using Mastercard.Developer.ClientEncryption.RestSharp.Interceptors;
 using Mastercard.Developer.OAuth1Signer.Core.Utils;
-using Mastercard.Developer.OAuth1Signer.RestSharp.Authenticators;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Acme.App.MastercardApi.Client.Api;
 using Acme.App.MastercardApi.Client.Client;
 using Acme.App.MastercardApi.Client.Model;
 using System.Security.Cryptography.X509Certificates;
+using Mastercard.Developer.ClientEncryption.RestSharpV2.Interceptors;
 using static Mastercard.Developer.ClientEncryption.Core.Encryption.FieldLevelEncryptionConfig;
 
 namespace Mastercard.Developer.DigitalEnablement.Tests
@@ -23,7 +22,11 @@ public class TokenizeApiTest
         private const string SigningKeyAlias = "fake-key";
         private const string SigningKeyPassword = "fakepassword";
         private const string SigningKeyPkcs12FilePath = "./_Resources/fake-signing-key.p12";
+        private const string BasePath = "https://sandbox.api.mastercard.com/mdes/";
 
+        private static RSA SigningKey { set; get; }
+        private static ApiClient Client { set; get; }
+        
         // Encryption keys from https://developer.mastercard.com/page/digital-enablement-api-sandbox-configuration
         private const string EncryptionCertificateFilePath = "./_Resources/digital-enablement-sandbox-encryption-key.crt";
         private const string DecryptionKeyFilePath = "./_Resources/digital-enablement-sandbox-decryption-key.key";
@@ -36,7 +39,7 @@ public static void Before(TestContext context)
 
         private static void SetupApiClient()
         {
-            var signingKey = AuthenticationUtils.LoadSigningKey(SigningKeyPkcs12FilePath, SigningKeyAlias, SigningKeyPassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
+            SigningKey = AuthenticationUtils.LoadSigningKey(SigningKeyPkcs12FilePath, SigningKeyAlias, SigningKeyPassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
             var encryptionCertificate = EncryptionUtils.LoadEncryptionCertificate(EncryptionCertificateFilePath);
             var decryptionKey = EncryptionUtils.LoadDecryptionKey(DecryptionKeyFilePath);
 
@@ -56,16 +59,17 @@ private static void SetupApiClient()
                 .WithValueEncoding(FieldValueEncoding.Hex)
                 .Build();
 
-            var config = Configuration.Default;
-            config.BasePath = "https://sandbox.api.mastercard.com/mdes/";
-            config.ApiClient.RestClient.Authenticator = new RestSharpOAuth1Authenticator(ConsumerKey, signingKey, new Uri(config.BasePath));
-            config.ApiClient.EncryptionInterceptor = new RestSharpFieldLevelEncryptionInterceptor(fieldLevelEncryptionConfig);
+            Client = new ApiClient(SigningKey, BasePath, ConsumerKey)
+            {
+                EncryptionInterceptor = new RestSharpFieldLevelEncryptionInterceptor(fieldLevelEncryptionConfig)
+            };
         }
 
         [TestMethod]
         public void TestTokenizeEndpoint()
         {
-            var tokenizeApi = new TokenizeApi(Configuration.Default);
+            var tokenizeApi = new TokenizeApi();
+            tokenizeApi.Client = Client;
             var response = tokenizeApi.CreateTokenize(BuildTokenizeRequestSchema());
             Assert.IsNotNull(response);
             Assert.AreEqual("APPROVED", response.Decision);

csharp/Acme.App.MastercardApi.Client/Acme.App.MastercardApi.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Acme.App.MastercardApi.Client</AssemblyName>
     <PackageId>Acme.App.MastercardApi.Client</PackageId>
     <OutputType>Library</OutputType>
@@ -18,14 +18,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.7" />
-    <PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.7" />
+    <PackageReference Include="JsonSubTypes" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="JsonSubTypes" Version="1.6.0" />
-    <PackageReference Include="Mastercard.Developer.OAuth1Signer.RestSharp" Version="1.2.5" />
-    <PackageReference Include="Mastercard.Developer.ClientEncryption.RestSharp" Version="1.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="RestSharp" Version="106.11.4" />
+    <PackageReference Include="Polly" Version="7.2.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="Mastercard.Developer.ClientEncryption.RestSharpV2" Version="1.1.0" />
+    <PackageReference Include="Mastercard.Developer.OAuth1Signer.RestSharpV2" Version="1.3.0" />
   </ItemGroup>
 
-
 </Project>