aaron/banking-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed login to not return respose

Browse source 
The login method now throws specific exceptions if something goes wrong during the login process. This is the ideal way for a developer using this API to handle errors.
This commit is contained in:
Aaron Yarborough 2017-02-13 13:05:48 +00:00
parent 6345a4d1a6
commit a39b20484f
7 changed files with 31 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
BankingBot/ActionManagers/LoginManagers/BarclaysLoginManager.cs
View file

@ -28,7 +28,7 @@ namespace BankingBot.ActionManagers.LoginManagers
this.scriptManager = scriptManager;
}
public Response Login(ILoginCredentials credentials)
public void Login(ILoginCredentials credentials)
{
_credentials = credentials as BarclaysLoginCredentials;
@ -100,11 +100,6 @@ namespace BankingBot.ActionManagers.LoginManagers
};
scriptManager.Execute("barclays-login.js", scriptData, ScriptBundles.ProviderLogin);
return new Response
{
Status = ResponseStatus.Success
};
}
}
}

56
BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs
View file

@ -16,8 +16,10 @@ namespace BankingBot.ActionManagers.LoginManagers
[ProviderIdentifier(Provider.Lloyds)]
public class LloydsLoginManager : IProviderLoginManager
{
private readonly IBrowserBot _browserBot;
private readonly IScriptManager _scriptManager;
readonly IBrowserBot _browserBot;
readonly IScriptManager _scriptManager;
private LloydsLoginCredentials _credentials;
public LloydsLoginManager(
IBrowserBot browserBot,
@ -27,63 +29,49 @@ namespace BankingBot.ActionManagers.LoginManagers
_scriptManager = scriptManager;
}
public Response Login(ILoginCredentials credentials)
public void Login(ILoginCredentials credentials)
{
var response = new Response();
var lloydsCreds = (LloydsLoginCredentials)credentials;
_credentials = (LloydsLoginCredentials)credentials;
try
{
LoginStep1(lloydsCreds);
if (!_browserBot.WebDriver.Url.Contains(LloydsUrls.MemorableInfo))
throw new InvalidCredentialsException("Invalid login credentials");
LoginStep2(lloydsCreds);
if (!_browserBot.WebDriver.Url.Contains(LloydsUrls.AccountOverview))
throw new InvalidCredentialsException("Invalid passphrase for account");
response.Status = ResponseStatus.Success;
}
catch (Exception ex)
{
response.Exception = ex;
response.Status = ResponseStatus.Error;
}
return response;
LoginStep1();
LoginStep2();
}
private void LoginStep1(LloydsLoginCredentials credentials)
private void LoginStep1()
{
_browserBot.WebDriver.Url = LloydsUrls.Login;
_browserBot.WebDriver.Navigate();
_browserBot.WebDriver.FindElement(By.Id("frmLogin:strCustomerLogin_userID")).SendKeys(credentials.Username);
_browserBot.WebDriver.FindElement(By.Id("frmLogin:strCustomerLogin_pwd")).SendKeys(credentials.Password);
_browserBot.WebDriver.FindElement(By.Id("frmLogin:strCustomerLogin_userID")).SendKeys(_credentials.Username);
_browserBot.WebDriver.FindElement(By.Id("frmLogin:strCustomerLogin_pwd")).SendKeys(_credentials.Password);
_browserBot.WebDriver.FindElement(By.Id("frmLogin:btnLogin2")).Click();
if (!_browserBot.WebDriver.Url.Contains(LloydsUrls.MemorableInfo))
throw new InvalidCredentialsException("Invalid login credentials");
}
private void LoginStep2(LloydsLoginCredentials credentials)
private void LoginStep2()
{
var passphraseIndexes = GetPassphraseIndexes();
var maxPassphraseLength = passphraseIndexes[2];
if (credentials.Passphrase.Length < maxPassphraseLength)
if (_credentials.Passphrase.Length < maxPassphraseLength)
throw new InvalidCredentialsException("Passphrase is too short");
_browserBot.WebDriver.FindElement(By.Id(GetPassphraseDdlId(1))).SendKeys(
credentials.Passphrase[passphraseIndexes[0]].ToString());
_credentials.Passphrase[passphraseIndexes[0]].ToString());
_browserBot.WebDriver.FindElement(By.Id(GetPassphraseDdlId(2))).SendKeys(
credentials.Passphrase[passphraseIndexes[1]].ToString());
_credentials.Passphrase[passphraseIndexes[1]].ToString());
_browserBot.WebDriver.FindElement(By.Id(GetPassphraseDdlId(3))).SendKeys(
credentials.Passphrase[passphraseIndexes[2]].ToString());
_credentials.Passphrase[passphraseIndexes[2]].ToString());
_browserBot.WebDriver.FindElement(By.Id("frmentermemorableinformation1:btnContinue")).Click();
if (!_browserBot.WebDriver.Url.Contains(LloydsUrls.AccountOverview))
throw new InvalidCredentialsException("Invalid passphrase for account");
}
private int[] GetPassphraseIndexes()

4
BankingBot/ActionManagers/LoginManagers/LoginManager.cs
View file

@ -13,7 +13,7 @@ namespace BankingBot.ActionManagers.LoginManagers
: base(browserBot)
{ }
public Response Login(ILoginCredentials credentials)
public void Login(ILoginCredentials credentials)
{
// TODO: THIS NEEDS TO BE MOVED
var scriptManager = new ScriptManager(BrowserBot);
@ -21,7 +21,7 @@ namespace BankingBot.ActionManagers.LoginManagers
var providerLoginManagerType = GetTypeFromInterface(credentials.GetProvider(), typeof(IProviderLoginManager));
var provLoginManager = (IProviderLoginManager)Activator.CreateInstance(providerLoginManagerType, BrowserBot, scriptManager);
return provLoginManager.Login(credentials);
provLoginManager.Login(credentials);
}
}
}

11
BankingBot/BankingClient.cs
View file

@ -36,18 +36,13 @@ namespace BankingBot
#region Actions - Login Manager
public Response Login(ILoginCredentials credentials)
public void Login(ILoginCredentials credentials)
{
LoginCredentials = credentials;
Provider = credentials.GetProvider();
var response = loginManager.Login(credentials);
if (response.Status == ResponseStatus.Success)
{
accountManager.Init(Provider);
}
return response;
loginManager.Login(credentials);
accountManager.Init(Provider);
}
#endregion

2
BankingBot/Contracts/IClient.cs
View file

@ -7,7 +7,7 @@ namespace BankingBot.Contracts
{
public interface IClient
{
Response Login(ILoginCredentials credentials);
void Login(ILoginCredentials credentials);
decimal GetBalance();

2
BankingBot/Contracts/ILoginManager.cs
View file

@ -4,6 +4,6 @@ namespace BankingBot.Contracts
{
public interface ILoginManager
{
Response Login(ILoginCredentials credentials);
void Login(ILoginCredentials credentials);
}
}

2
BankingBot/Contracts/IProviderLoginManager.cs
View file

@ -4,6 +4,6 @@ namespace BankingBot.Contracts
{
public interface IProviderLoginManager
{
Response Login(ILoginCredentials credentials);
void Login(ILoginCredentials credentials);
}
}