Replace string ProxyAddress with IWebProxy for flexible proxy configuration

README.md

@@ -124,19 +124,36 @@ AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
 
 ### Configuration using a proxy
 Please see [here](https://github.com/abuzuhri/Amazon-SP-API-CSharp/blob/main/Source/FikaAmazonAPI.SampleCode/Program.cs) for the relevant code file.
->```csharp
->AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
->{
->     ClientId = "amzn1.application-XXX-client.XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
->     ClientSecret = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
->     RefreshToken= "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
->     MarketPlaceID = "A2VIGQ35RCS4UG",
->     ProxyAddress = "http(s)://xxx.xxx.xxx.xxx:xxxx",
->});
->```
->> * Assign your proxy address to the ProxyAddress Property and you'll be able to use a proxy account. 
->>
->> ***This is not required and will operate normally without the ProxyAddress being set.***
+
+The `Proxy` property accepts any `IWebProxy` implementation:
+```csharp
+AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
+{
+     ClientId = "amzn1.application-XXX-client.XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     ClientSecret = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     RefreshToken= "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     MarketPlaceID = "A2VIGQ35RCS4UG",
+     Proxy = new System.Net.WebProxy("http://xxx.xxx.xxx.xxx:xxxx"),
+});
+```
+
+For an authenticated proxy, assign any `IWebProxy` implementation -- for example, a `WebProxy` with credentials:
+```csharp
+AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
+{
+     ClientId = "amzn1.application-XXX-client.XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     ClientSecret = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     RefreshToken= "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+     MarketPlaceID = "A2VIGQ35RCS4UG",
+     Proxy = new System.Net.WebProxy("http://xxx.xxx.xxx.xxx:xxxx")
+     {
+         Credentials = new System.Net.NetworkCredential("username", "password")
+     },
+});
+```
+> ***Proxy is not required and will operate normally without it being set.***
+
+---
 
 ### Order List
 For more order samples, please check [Here](https://github.com/abuzuhri/Amazon-SP-API-CSharp/blob/main/Source/FikaAmazonAPI.SampleCode/OrdersSample.cs).

Source/FikaAmazonAPI/AmazonCredential.cs

@@ -1,6 +1,8 @@
 using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
 using FikaAmazonAPI.Utils;
+using System;
 using System.Collections.Generic;
+using System.Net;
 using static FikaAmazonAPI.AmazonSpApiSDK.Models.Token.CacheTokenData;
 using static FikaAmazonAPI.Utils.Constants;
 
@@ -23,21 +25,31 @@
         public bool IsDebugMode { get; set; }
         public string MarketPlaceID { get; set; }
         public string SellerID { get; set; }
-        public string ProxyAddress { get; set; }
+        public IWebProxy Proxy { get; set; }
+
+        [Obsolete("Use the Proxy property instead.")]
+        public string ProxyAddress
+        {
+            get => (Proxy as WebProxy)?.Address?.ToString();
+            set => Proxy = string.IsNullOrWhiteSpace(value) ? null : new WebProxy(value);
+        }
+
         public static bool DebugMode { get; set; }
         public AmazonCredential()
         {
             CacheTokenData = new CacheTokenData();
         }
-        public AmazonCredential(string AccessKey, string SecretKey, string RoleArn, string ClientId, string ClientSecret, string RefreshToken, string ProxyAddress = null)
+
+        public AmazonCredential(string AccessKey, string SecretKey, string RoleArn, string ClientId,
+            string ClientSecret, string RefreshToken, string ProxyAddress = null)
         {
             this.AccessKey = AccessKey;
             this.SecretKey = SecretKey;
             this.RoleArn = RoleArn;
             this.ClientId = ClientId;
             this.ClientSecret = ClientSecret;
             this.RefreshToken = RefreshToken;
-            this.ProxyAddress = ProxyAddress;
+            this.Proxy = string.IsNullOrWhiteSpace(ProxyAddress) ? null : new WebProxy(ProxyAddress);
             CacheTokenData = new CacheTokenData();
         }
 

Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/LWAClient.cs

@@ -1,9 +1,9 @@
 using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
 using FikaAmazonAPI.RestSharp;
 using Newtonsoft.Json;
-using FikaAmazonAPI.RestSharp;
 using System;
 using System.IO;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Diagnostics;
@@ -20,29 +20,16 @@ public class LWAClient
         public LWAAuthorizationCredentials LWAAuthorizationCredentials { get; private set; }
 
 
-        public LWAClient(LWAAuthorizationCredentials lwaAuthorizationCredentials, string proxyAddress = null)
+        public LWAClient(LWAAuthorizationCredentials lwaAuthorizationCredentials, IWebProxy proxy = null)
         {
 
             LWAAuthorizationCredentials = lwaAuthorizationCredentials;
             LWAAccessTokenRequestMetaBuilder = new LWAAccessTokenRequestMetaBuilder();
-            // RestClient = new RestClient(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority));
-            if (string.IsNullOrWhiteSpace(proxyAddress))
-            {
-                var options = new RestClientOptions(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority));
-                RestClient = new RestClient(options);
-            }
-            else
+            var options = new RestClientOptions(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority))
             {
-                var options = new RestClientOptions(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority))
-                {
-                    Proxy = new System.Net.WebProxy()
-                    {
-                        Address = new Uri(proxyAddress)
-                    }
-                };
-
-                RestClient = new RestClient(options);
-            }
+                Proxy = proxy
+            };
+            RestClient = new RestClient(options);
         }
 
 

Source/FikaAmazonAPI/Services/RequestService.cs

@@ -59,25 +59,12 @@
 
         private void CreateRequest(string url, RestSharp.Method method)
         {
-            if (string.IsNullOrWhiteSpace(AmazonCredential.ProxyAddress))
+            var options = new RestClientOptions(ApiBaseUrl)
             {
-                var options = new RestClientOptions(ApiBaseUrl);
-                RequestClient = new RestClient(options,
-                    configureSerialization: s => s.UseNewtonsoftJson());
-            }
-            else
-            {
-                var options = new RestClientOptions(ApiBaseUrl)
-                {
-                    Proxy = new System.Net.WebProxy()
-                    {
-                        Address = new Uri(AmazonCredential.ProxyAddress)
-                    }
-                };
-
-                RequestClient = new RestClient(options,
-                    configureSerialization: s => s.UseNewtonsoftJson());
-            }
+                Proxy = AmazonCredential.Proxy
+            };
+            RequestClient = new RestClient(options,
+                configureSerialization: s => s.UseNewtonsoftJson());
 
             Request = new RestRequest(url, method);
         }
@@ -224,7 +211,7 @@
                 {
                     return await ExecuteRequestTry<T>(rateLimitType, cancellationToken);
                 }
                 catch (AmazonQuotaExceededException ex)
                 {
                     if (tryCount >= AmazonCredential.MaxThrottledRetryCount)
                     {
@@ -276,7 +263,7 @@
                     }
                 }
             }
             catch (Exception e)
             {
             }
         }

Source/FikaAmazonAPI/Services/TokenGeneration.cs

@@ -29,8 +29,8 @@ public static async Task<TokenResponse> RefreshAccessTokenAsync(AmazonCredential
             if (tokenDataType == TokenDataType.Grantless)
                 lwaCredentials.Scopes = new List<string>() { ScopeConstants.ScopeMigrationAPI, ScopeConstants.ScopeNotificationsAPI };
 
-            var Client = new LWAClient(lwaCredentials, credentials.ProxyAddress);
-            var accessToken = await Client.GetAccessTokenAsync(cancellationToken);
+            var client = new LWAClient(lwaCredentials, credentials.Proxy);
+            var accessToken = await client.GetAccessTokenAsync(cancellationToken);
 
             return accessToken;
         }