Merge remote-tracking branch 'origin/main'

Author: mbradley672

Source/FikaAmazonAPI/AmazonCredential.cs

@@ -23,19 +23,21 @@ public class AmazonCredential
         public bool IsDebugMode { get; set; }
         public string MarketPlaceID { get; set; }
         public string SellerID { get; set; }
+        public string ProxyAddress { get; set; }
 
         public AmazonCredential()
         {
             CacheTokenData = new CacheTokenData();
         }
-        public AmazonCredential(string AccessKey, string SecretKey, string RoleArn, string ClientId, string ClientSecret, string RefreshToken)
+        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;
             CacheTokenData = new CacheTokenData();
         }
 

Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/LWAClient.cs

@@ -18,15 +18,27 @@ public class LWAClient
         public LWAAuthorizationCredentials LWAAuthorizationCredentials { get; private set; }
 
 
-        public LWAClient(LWAAuthorizationCredentials lwaAuthorizationCredentials)
+        public LWAClient(LWAAuthorizationCredentials lwaAuthorizationCredentials, string proxyAddress = null)
         {
 
             LWAAuthorizationCredentials = lwaAuthorizationCredentials;
             LWAAccessTokenRequestMetaBuilder = new LWAAccessTokenRequestMetaBuilder();
             // RestClient = new RestClient(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority));
-            RestClient =
-                RestClientSingleton.GetRestClient(
-                    LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority));
+            if (string.IsNullOrWhiteSpace(proxyAddress))
+            {
+                RestClient = new RestClient(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority));
+            }else
+            {
+                var options = new RestClientOptions(LWAAuthorizationCredentials.Endpoint.GetLeftPart(UriPartial.Authority))
+                {
+                    Proxy = new System.Net.WebProxy()
+                    {
+                        Address = new Uri(proxyAddress)
+                    }
+                };
+
+                RestClient = new RestClient(options);
+            }
         }
 
 

Source/FikaAmazonAPI/Services/OrderService.cs

@@ -186,13 +186,13 @@ public async Task<OrderItemsBuyerInfoList> GetOrderItemsBuyerInfoAsync(string or
             return response.Payload;
         }
 
-        public Address GetOrderAddress(string orderId) =>
+        public OrderAddress GetOrderAddress(string orderId) =>
             Task.Run(() => GetOrderAddressAsync(orderId)).ConfigureAwait(false).GetAwaiter().GetResult();
-        public async Task<Address> GetOrderAddressAsync(string orderId, CancellationToken cancellationToken = default)
+        public async Task<OrderAddress> GetOrderAddressAsync(string orderId, CancellationToken cancellationToken = default)
         {
             await CreateAuthorizedRequestAsync(OrdersApiUrls.OrderShipmentInfo(orderId), RestSharp.Method.Get, cancellationToken: cancellationToken);
             var response = await ExecuteRequestAsync<GetOrderAddressResponse>(Utils.RateLimitType.Order_GetOrderAddress, cancellationToken);
-            return response.Payload.ShippingAddress;
+            return response.Payload;
         }
 
         public bool UpdateShipmentStatus(string orderId, UpdateShipmentStatusRequest updateShipmentStatusRequest) =>

Source/FikaAmazonAPI/Services/RequestService.cs

@@ -56,9 +56,24 @@ public RequestService(AmazonCredential amazonCredential)
 
         private void CreateRequest(string url, RestSharp.Method method)
         {
-            RequestClient = RestClientSingleton.GetRestClient(ApiBaseUrl);
-            // RequestClient = new RestClient(ApiBaseUrl);
-            // RequestClient.UseNewtonsoftJson();
+            if (string.IsNullOrWhiteSpace(AmazonCredential.ProxyAddress))
+            {
+                RequestClient = new RestClient(ApiBaseUrl);
+            }
+            else
+            {
+                var options = new RestClientOptions(ApiBaseUrl)
+                {
+                    Proxy = new System.Net.WebProxy()
+                    {
+                        Address = new Uri(AmazonCredential.ProxyAddress)
+                    }
+                };
+
+                RequestClient = new RestClient(options);
+            }
+
+            RequestClient.UseNewtonsoftJson();
             Request = new RestRequest(url, method);
         }
 

Source/FikaAmazonAPI/Services/TokenGeneration.cs

@@ -32,7 +32,7 @@ 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);
+            var Client = new LWAClient(lwaCredentials, credentials.ProxyAddress);
             var accessToken = await Client.GetAccessTokenAsync(cancellationToken);
 
             return accessToken;