Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored Code #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactored Code #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9fdec0
Refactored Code
gitvinit Mar 6, 2017
7bdf45d
Merge branch 'master' into master
gitvinit Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 31 additions & 42 deletions AmazonPay/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
using System;
using System.Reflection;
using System.Web;
using System.Net;
using System.Text;
using System.IO;
using System.Text.RegularExpressions;
using System.Security.Cryptography;
using System.Globalization;
using System.Xml.Serialization;
using System.Collections.Generic;
using System.Collections;
using System.Xml;
using Newtonsoft.Json;
using AmazonPay.StandardPaymentRequests;
using AmazonPay.Responses;
Expand All @@ -34,7 +26,7 @@ public class Client : IClient
private string mwsTestUrl = string.Empty;
private string timeStamp = string.Empty;
private Signature signatureObject;
private Configuration clientConfig = null;
private readonly Configuration clientConfig;
private readonly string aud = "aud";

/// <summary>
Expand Down Expand Up @@ -92,7 +84,6 @@ public Client(Configuration clientConfig)
/// <param name="jsonFilePath"></param>
public Client(string jsonFilePath)
{
string json;
if (!string.IsNullOrEmpty(jsonFilePath))
{
if (!File.Exists(@jsonFilePath))
Expand All @@ -101,11 +92,12 @@ public Client(string jsonFilePath)
}
else
{
string json;
using (StreamReader r = new StreamReader(@jsonFilePath))
{
json = r.ReadToEnd();
}
this.clientConfig = new Configuration(json);
clientConfig = new Configuration(json);
}
}
else
Expand All @@ -120,7 +112,7 @@ public Client(string jsonFilePath)
/// <param name="url"></param>
public void SetMwsTestUrl(string url)
{
this.mwsTestUrl = url;
mwsTestUrl = url;
}

/// <summary>
Expand All @@ -129,7 +121,7 @@ public void SetMwsTestUrl(string url)
/// <returns>IDictionary parameters</returns>
public Dictionary<string, string> GetParameters()
{
return this.parameters;
return parameters;

}

Expand All @@ -149,6 +141,7 @@ public void SetTimeStamp(string timeStamp)
/// If Provider Credit Reversal Details is present, values are set by setProviderCreditDetails
/// </summary>
/// <param name="requestParameters"></param>
/// <param name="providerDetails"></param>
/// <returns>string XML response</returns>
private string SetParametersAndPost(Dictionary<string, string> requestParameters, IList<Dictionary<string, string>> providerDetails = null)
{
Expand Down Expand Up @@ -210,9 +203,9 @@ private Dictionary<string, string> SetDefaultValues(Dictionary<string, string> p
{
if (requestParameters[Constants.SellerId] == null || requestParameters[Constants.SellerId].Trim() == "")
{
if (this.clientConfig.GetMerchantId() != null && this.clientConfig.GetMerchantId().Trim() != "")
if (clientConfig.GetMerchantId() != null && clientConfig.GetMerchantId().Trim() != "")
{
parameters[Constants.SellerId] = this.clientConfig.GetMerchantId();
parameters[Constants.SellerId] = clientConfig.GetMerchantId();
}
}
}
Expand All @@ -225,23 +218,23 @@ private Dictionary<string, string> SetDefaultValues(Dictionary<string, string> p
{
if (string.IsNullOrEmpty(param.Value))
{
if (this.clientConfig.GetCurrencyCode() != null && this.clientConfig.GetCurrencyCode().Trim() != "")
if (clientConfig.GetCurrencyCode() != null && this.clientConfig.GetCurrencyCode().Trim() != "")
{
parameters[param.Key] = this.clientConfig.GetCurrencyCode();
parameters[param.Key] = clientConfig.GetCurrencyCode();
}
}
}

if (param.Key.Contains("PlatformId"))
{
if (string.IsNullOrEmpty(param.Value))
{
if (this.clientConfig.GetPlatformId() != null && this.clientConfig.GetPlatformId().Trim() != "")
if (clientConfig.GetPlatformId() != null && clientConfig.GetPlatformId().Trim() != "")
{
parameters[param.Key] = this.clientConfig.GetPlatformId();
}
}
}
}
}
}

Expand Down Expand Up @@ -274,7 +267,7 @@ private Dictionary<string, string> SetProviderCreditDetails(Dictionary<string, s
// If currency code is not entered take it from the configuration object
if (string.IsNullOrEmpty(parameters[providerString + providerIndex + "." + Constants.CreditAmount_CurrencyCode]))
{
parameters[providerString + providerIndex + "." + Constants.CreditAmount_CurrencyCode] = this.clientConfig.GetCurrencyCode();
parameters[providerString + providerIndex + "." + Constants.CreditAmount_CurrencyCode] = clientConfig.GetCurrencyCode();
}
}
return parameters;
Expand Down Expand Up @@ -306,7 +299,7 @@ private Dictionary<string, string> SetProviderCreditReversalDetails(Dictionary<s
// If currency code is not entered take it from the configuration object
if (string.IsNullOrEmpty(parameters[providerString + providerIndex + "." + Constants.CreditReversalAmount_CurrencyCode]))
{
parameters[providerString + providerIndex + "." + Constants.CreditReversalAmount_CurrencyCode] = this.clientConfig.GetCurrencyCode();
parameters[providerString + providerIndex + "." + Constants.CreditReversalAmount_CurrencyCode] = clientConfig.GetCurrencyCode();
}
}
return parameters;
Expand All @@ -319,14 +312,13 @@ private Dictionary<string, string> SetProviderCreditReversalDetails(Dictionary<s
/// <returns>string response - json output of profile information</returns>
public string GetUserInfo(string accessToken)
{
string response;
string profileEndpoint = GetProfileEndpointUrl();

if (string.IsNullOrEmpty(accessToken))
{
throw new NullReferenceException("Access Token is a required parameter and is not set");
}
if (string.IsNullOrEmpty(this.clientConfig.GetClientId().ToString()))
if (string.IsNullOrEmpty(clientConfig.GetClientId()))
{
throw new NullReferenceException("client ID is a required parameter and is not set");
}
Expand All @@ -335,21 +327,21 @@ public string GetUserInfo(string accessToken)
string url = profileEndpoint + "/auth/o2/tokeninfo?access_token=" + System.Web.HttpUtility.UrlEncode(accessToken);

HttpImpl httpRequest = new HttpImpl(clientConfig);
response = httpRequest.Get(url);
var response = httpRequest.Get(url);

Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(response);

// aud - The client identifier used to request the access token. The value for aud should math the LWA Client ID - this.clientConfig.GetClientId()
if (data.ContainsKey(aud))
{
if (!(data[aud].Equals(this.clientConfig.GetClientId()))) // describe the aud variable nd add value into a final string
if (!(data[aud].Equals(clientConfig.GetClientId()))) // describe the aud variable nd add value into a final string
{
throw new InvalidDataException("The Access token entered is incorrect");
}
else
{
url = profileEndpoint + "/user/profile";
httpRequest = new HttpImpl(this.clientConfig);
httpRequest = new HttpImpl(clientConfig);
httpRequest.setAccessToken(accessToken);
httpRequest.setHttpHeader();

Expand Down Expand Up @@ -1340,10 +1332,10 @@ public GetProviderCreditReversalDetailsResponse ReverseProviderCredit(ReversePro
/// <returns>Dictionary response</returns>
public AuthorizeResponse Charge(ChargeRequest requestParameters)
{
string xml, baStatus, oroStatus = string.Empty;
string xml, baStatus, oroStatus;
var chargeException = new InvalidDataException();
AuthorizeResponse authorizeResponseObject = null;
bool getSuccess = false, setSuccess = false, confirmSuccess = false, authorizeSuccess = false;
bool getSuccess, setSuccess, confirmSuccess, authorizeSuccess = false;

switch (requestParameters.chargeType)
{
Expand Down Expand Up @@ -1558,9 +1550,8 @@ public OrderReferenceDetailsResponse SetOrderAttributes(SetOrderAttributesReques
/// <returns>parametersToString</returns>
private string CalculateSignatureAndParametersToString(Dictionary<string, string> parameters)
{
signatureObject = new Signature(this.clientConfig, Constants.PaymentsServiceVersion);
signatureObject.Logger = this.Logger;
string parametersToString = signatureObject.CalculateSignatureAndReturnParametersAsString(parameters, this.timeStamp, this.mwsTestUrl);
signatureObject = new Signature(clientConfig, Constants.PaymentsServiceVersion) { Logger = Logger };
string parametersToString = signatureObject.CalculateSignatureAndReturnParametersAsString(parameters, timeStamp, mwsTestUrl);
this.parameters = parameters;

return parametersToString;
Expand All @@ -1575,9 +1566,7 @@ private string Invoke(string parameters)
{
String responseBody = null;

/// <summary>
/// Boolean variable to check if the API call was a success
/// </summary>
//Boolean variable to check if the API call was a success
bool success = false;

Dictionary<string, string> responseDict = new Dictionary<string, string>();
Expand All @@ -1586,7 +1575,7 @@ private string Invoke(string parameters)
byte[] requestData = new UTF8Encoding().GetBytes(parameters);

ConfigureUserAgentHeader();
HttpImpl httpRequest = new HttpImpl(this.clientConfig);
HttpImpl httpRequest = new HttpImpl(clientConfig);

// Submit the request and read response body
bool shouldRetry;
Expand All @@ -1605,7 +1594,7 @@ private string Invoke(string parameters)
shouldRetry = false;
success = true;
}
else if (Convert.ToBoolean(this.clientConfig.GetAutoRetryOnThrottle()) && (statusCode == 500 || statusCode == 503))
else if (Convert.ToBoolean(clientConfig.GetAutoRetryOnThrottle()) && (statusCode == 500 || statusCode == 503))
{
++retries;
if (shouldRetry)
Expand Down Expand Up @@ -1657,9 +1646,9 @@ private string GetProfileEndpointUrl()
string profileEnvt = Convert.ToBoolean(this.clientConfig.GetSandbox()) ? "api.sandbox" : "api";
string profileEndpoint = string.Empty;

if (!string.IsNullOrEmpty(this.clientConfig.GetRegion().ToString()))
if (!string.IsNullOrEmpty(clientConfig.GetRegion()))
{
region = this.clientConfig.GetRegion();
region = clientConfig.GetRegion();
if (Regions.regionMappings.ContainsKey(region))
{
profileEndpoint = "https://" + profileEnvt + "." + Regions.ProfileEndpoint[region];
Expand All @@ -1681,7 +1670,7 @@ private void ConfigureUserAgentHeader()
{
signatureObject.SetUserAgentHeader(
Environment.OSVersion.Platform + "/" + Environment.OSVersion.Version,
".NET/" + Environment.Version.ToString());
".NET/" + Environment.Version);
}

/// <summary>
Expand All @@ -1690,9 +1679,9 @@ private void ConfigureUserAgentHeader()
/// <param name="message"></param>
private void LogMessage(string message, SanitizeData.DataType type)
{
if (this.Logger != null && this.Logger.IsDebugEnabled)
if (Logger != null && Logger.IsDebugEnabled)
{
this.Logger.Debug(SanitizeData.SanitizeGivenData(message, type));
Logger.Debug(SanitizeData.SanitizeGivenData(message, type));
}
}
}
Expand Down
Loading