Added fix for RestClient

gnongsie · gnongsie · commit e6a3205f935c · 2024-02-12T13:37:19.000+05:30
diff --git a/Client/ApiClient.cs b/Client/ApiClient.cs
@@ -270,13 +270,16 @@ private RestRequest PrepareRestRequest(
             }
 
             RestRequest requestT = new RestRequest(path);
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             // Add Header Parameter, if any
             // Passed to this function
             foreach (var param in headerParams)
@@ -442,14 +445,13 @@ public object CallApi(
 
             // set timeout
             request.Timeout = Configuration.Timeout;
-            // set user agent
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             // RestClient.ClearHandlers();
 
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
 
             // Adding Client Cert
@@ -467,9 +469,12 @@ public object CallApi(
                 // Importing Certificates
                 var certificate = new X509Certificate2(fileName, clientCertPassword);
                 clientCertPassword.Dispose();
-                RestClient.Options.ClientCertificates = new X509CertificateCollection { certificate };
+                clientOptions.ClientCertificates = new X509CertificateCollection { certificate };
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
             foreach (var param in request.Parameters)
@@ -570,7 +575,7 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(
             // set timeout
             request.Timeout = Configuration.Timeout;
             // set user agent
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             if (logUtility.IsMaskingEnabled(logger))
             {
@@ -581,6 +586,9 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(
                 logger.Debug($"HTTP Request Headers :\n{headerPrintOutput.ToString()}");
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             InterceptRequest(request);
             var response = await RestClient.ExecuteAsync(request);
             InterceptResponse(request, response);
@@ -991,10 +999,13 @@ public void CallAuthenticationHeaders(string requestType, string requestTarget,
                 RestClient = new RestClient("https://" + merchantConfig.HostName);
             }
 
+            RestClientOptions clientOptions = RestClient.Options;
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
+
+            RestClient = new RestClient(clientOptions);
         }
     }
 }
diff --git a/generator/cybersource-csharp-template/ApiClient.mustache b/generator/cybersource-csharp-template/ApiClient.mustache
@@ -312,13 +312,16 @@ namespace {{packageName}}.Client
             }
 
             RestRequest requestT = new RestRequest(path);
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             // Add Header Parameter, if any
             // Passed to this function
             foreach (var param in headerParams)
@@ -484,14 +487,13 @@ namespace {{packageName}}.Client
 
             // set timeout
             request.Timeout = Configuration.Timeout;
-            // set user agent
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             // RestClient.ClearHandlers();
 
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
 
             // Adding Client Cert
@@ -509,9 +511,12 @@ namespace {{packageName}}.Client
                 // Importing Certificates
                 var certificate = new X509Certificate2(fileName, clientCertPassword);
                 clientCertPassword.Dispose();
-                RestClient.Options.ClientCertificates = new X509CertificateCollection { certificate };
+                clientOptions.ClientCertificates = new X509CertificateCollection { certificate };
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
             foreach (var param in request.Parameters)
@@ -624,7 +629,7 @@ namespace {{packageName}}.Client
             // set timeout
             request.Timeout = Configuration.Timeout;
             // set user agent
-            RestClient.Options.UserAgent = Configuration.UserAgent;
+            RestClientOptions clientOptions = RestClient.Options;
 
             if (logUtility.IsMaskingEnabled(logger))
             {
@@ -635,6 +640,9 @@ namespace {{packageName}}.Client
                 logger.Debug($"HTTP Request Headers :\n{headerPrintOutput.ToString()}");
             }
 
+            RestClient = new RestClient(clientOptions);
+            RestClient.Options.UserAgent = Configuration.UserAgent;
+
             InterceptRequest(request);
             var response = await RestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);
             InterceptResponse(request, response);
@@ -1062,10 +1070,13 @@ namespace {{packageName}}.Client
                 RestClient = new RestClient("https://" + merchantConfig.HostName);
             }
 
+            RestClientOptions clientOptions = RestClient.Options;
             if (Configuration.Proxy != null)
             {
-                RestClient.Options.Proxy = Configuration.Proxy;
+                clientOptions.Proxy = Configuration.Proxy;
             }
+
+            RestClient = new RestClient(clientOptions);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -270,13 +270,16 @@ private RestRequest PrepareRestRequest(`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`RestRequest requestT = new RestRequest(path);`
`273`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`273`	`+ RestClientOptions clientOptions = RestClient.Options;`
`274`	`274`
`275`	`275`	`if (Configuration.Proxy != null)`
`276`	`276`	`{`
`277`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`277`	`+ clientOptions.Proxy = Configuration.Proxy;`
`278`	`278`	`}`
`279`	`279`
	`280`	`+ RestClient = new RestClient(clientOptions);`
	`281`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`282`	`+`
`280`	`283`	`// Add Header Parameter, if any`
`281`	`284`	`// Passed to this function`
`282`	`285`	`foreach (var param in headerParams)`
`@@ -442,14 +445,13 @@ public object CallApi(`
`442`	`445`
`443`	`446`	`// set timeout`
`444`	`447`	`request.Timeout = Configuration.Timeout;`
`445`		`- // set user agent`
`446`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`448`	`+ RestClientOptions clientOptions = RestClient.Options;`
`447`	`449`
`448`	`450`	`// RestClient.ClearHandlers();`
`449`	`451`
`450`	`452`	`if (Configuration.Proxy != null)`
`451`	`453`	`{`
`452`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`454`	`+ clientOptions.Proxy = Configuration.Proxy;`
`453`	`455`	`}`
`454`	`456`
`455`	`457`	`// Adding Client Cert`
`@@ -467,9 +469,12 @@ public object CallApi(`
`467`	`469`	`// Importing Certificates`
`468`	`470`	`var certificate = new X509Certificate2(fileName, clientCertPassword);`
`469`	`471`	`clientCertPassword.Dispose();`
`470`		`- RestClient.Options.ClientCertificates = new X509CertificateCollection { certificate };`
	`472`	`+ clientOptions.ClientCertificates = new X509CertificateCollection { certificate };`
`471`	`473`	`}`
`472`	`474`
	`475`	`+ RestClient = new RestClient(clientOptions);`
	`476`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`477`	`+`
`473`	`478`	`// Logging Request Headers`
`474`	`479`	`var headerPrintOutput = new StringBuilder();`
`475`	`480`	`foreach (var param in request.Parameters)`
`@@ -570,7 +575,7 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(`
`570`	`575`	`// set timeout`
`571`	`576`	`request.Timeout = Configuration.Timeout;`
`572`	`577`	`// set user agent`
`573`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`578`	`+ RestClientOptions clientOptions = RestClient.Options;`
`574`	`579`
`575`	`580`	`if (logUtility.IsMaskingEnabled(logger))`
`576`	`581`	`{`
`@@ -581,6 +586,9 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(`
`581`	`586`	`logger.Debug($"HTTP Request Headers :\n{headerPrintOutput.ToString()}");`
`582`	`587`	`}`
`583`	`588`
	`589`	`+ RestClient = new RestClient(clientOptions);`
	`590`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`591`	`+`
`584`	`592`	`InterceptRequest(request);`
`585`	`593`	`var response = await RestClient.ExecuteAsync(request);`
`586`	`594`	`InterceptResponse(request, response);`
`@@ -991,10 +999,13 @@ public void CallAuthenticationHeaders(string requestType, string requestTarget,`
`991`	`999`	`RestClient = new RestClient("https://" + merchantConfig.HostName);`
`992`	`1000`	`}`
`993`	`1001`
	`1002`	`+ RestClientOptions clientOptions = RestClient.Options;`
`994`	`1003`	`if (Configuration.Proxy != null)`
`995`	`1004`	`{`
`996`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`1005`	`+ clientOptions.Proxy = Configuration.Proxy;`
`997`	`1006`	`}`
	`1007`	`+`
	`1008`	`+ RestClient = new RestClient(clientOptions);`
`998`	`1009`	`}`
`999`	`1010`	`}`
`1000`	`1011`	`}`
Original file line number	Diff line number	Diff line change
`@@ -312,13 +312,16 @@ namespace {{packageName}}.Client`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`RestRequest requestT = new RestRequest(path);`
`315`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`315`	`+ RestClientOptions clientOptions = RestClient.Options;`
`316`	`316`
`317`	`317`	`if (Configuration.Proxy != null)`
`318`	`318`	`{`
`319`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`319`	`+ clientOptions.Proxy = Configuration.Proxy;`
`320`	`320`	`}`
`321`	`321`
	`322`	`+ RestClient = new RestClient(clientOptions);`
	`323`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`324`	`+`
`322`	`325`	`// Add Header Parameter, if any`
`323`	`326`	`// Passed to this function`
`324`	`327`	`foreach (var param in headerParams)`
`@@ -484,14 +487,13 @@ namespace {{packageName}}.Client`
`484`	`487`
`485`	`488`	`// set timeout`
`486`	`489`	`request.Timeout = Configuration.Timeout;`
`487`		`- // set user agent`
`488`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`490`	`+ RestClientOptions clientOptions = RestClient.Options;`
`489`	`491`
`490`	`492`	`// RestClient.ClearHandlers();`
`491`	`493`
`492`	`494`	`if (Configuration.Proxy != null)`
`493`	`495`	`{`
`494`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`496`	`+ clientOptions.Proxy = Configuration.Proxy;`
`495`	`497`	`}`
`496`	`498`
`497`	`499`	`// Adding Client Cert`
`@@ -509,9 +511,12 @@ namespace {{packageName}}.Client`
`509`	`511`	`// Importing Certificates`
`510`	`512`	`var certificate = new X509Certificate2(fileName, clientCertPassword);`
`511`	`513`	`clientCertPassword.Dispose();`
`512`		`- RestClient.Options.ClientCertificates = new X509CertificateCollection { certificate };`
	`514`	`+ clientOptions.ClientCertificates = new X509CertificateCollection { certificate };`
`513`	`515`	`}`
`514`	`516`
	`517`	`+ RestClient = new RestClient(clientOptions);`
	`518`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`519`	`+`
`515`	`520`	`// Logging Request Headers`
`516`	`521`	`var headerPrintOutput = new StringBuilder();`
`517`	`522`	`foreach (var param in request.Parameters)`
`@@ -624,7 +629,7 @@ namespace {{packageName}}.Client`
`624`	`629`	`// set timeout`
`625`	`630`	`request.Timeout = Configuration.Timeout;`
`626`	`631`	`// set user agent`
`627`		`- RestClient.Options.UserAgent = Configuration.UserAgent;`
	`632`	`+ RestClientOptions clientOptions = RestClient.Options;`
`628`	`633`
`629`	`634`	`if (logUtility.IsMaskingEnabled(logger))`
`630`	`635`	`{`
`@@ -635,6 +640,9 @@ namespace {{packageName}}.Client`
`635`	`640`	`logger.Debug($"HTTP Request Headers :\n{headerPrintOutput.ToString()}");`
`636`	`641`	`}`
`637`	`642`
	`643`	`+ RestClient = new RestClient(clientOptions);`
	`644`	`+ RestClient.Options.UserAgent = Configuration.UserAgent;`
	`645`	`+`
`638`	`646`	`InterceptRequest(request);`
`639`	`647`	`var response = await RestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);`
`640`	`648`	`InterceptResponse(request, response);`
`@@ -1062,10 +1070,13 @@ namespace {{packageName}}.Client`
`1062`	`1070`	`RestClient = new RestClient("https://" + merchantConfig.HostName);`
`1063`	`1071`	`}`
`1064`	`1072`
	`1073`	`+ RestClientOptions clientOptions = RestClient.Options;`
`1065`	`1074`	`if (Configuration.Proxy != null)`
`1066`	`1075`	`{`
`1067`		`- RestClient.Options.Proxy = Configuration.Proxy;`
	`1076`	`+ clientOptions.Proxy = Configuration.Proxy;`
`1068`	`1077`	`}`
	`1078`	`+`
	`1079`	`+ RestClient = new RestClient(clientOptions);`
`1069`	`1080`	`}`
`1070`	`1081`	`}`
`1071`	`1082`	`}`