Merged lloyds/improve-login-func into main

BankingBot/ActionManagers/LoginManagers/BarclaysLoginManager.cs

@@ -2,7 +2,6 @@
 using BankingBot.Contracts;
 using BankingBot.Enums;
 using BankingBot.LoginCredentials;
-using BankingBot.Responses;
 using System.Collections.Generic;
 using BankingBot.ScriptManagement;
 
@@ -28,7 +27,7 @@ namespace BankingBot.ActionManagers.LoginManagers
             this.scriptManager = scriptManager;
         }
 
-        public Response Login(ILoginCredentials credentials)
+        public void Login(ILoginCredentials credentials)
         {
             _credentials = credentials as BarclaysLoginCredentials;
 
@@ -100,11 +99,6 @@ namespace BankingBot.ActionManagers.LoginManagers
             };
 
             scriptManager.Execute("barclays-login.js", scriptData, ScriptBundles.ProviderLogin);
-
-            return new Response
-            {
-                Status = ResponseStatus.Success
-            };
         }
     }
 }

BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using BankingBot.Attributes;
 using BankingBot.Contracts;
 using BankingBot.LoginCredentials;
 using OpenQA.Selenium;
-using BankingBot.Responses;
 using BankingBot.Enums;
-using BankingBot.ScriptManagement;
 using BankingBot.Urls;
 using BankingBot.Exceptions;
 
@@ -16,8 +13,10 @@ namespace BankingBot.ActionManagers.LoginManagers
     [ProviderIdentifier(Provider.Lloyds)]
     public class LloydsLoginManager : IProviderLoginManager
     {
-        private readonly IBrowserBot _browserBot;
+        readonly IBrowserBot _browserBot;
-        private readonly IScriptManager _scriptManager;
+        readonly IScriptManager _scriptManager;
+
+        private LloydsLoginCredentials _credentials;
         
         public LloydsLoginManager(
             IBrowserBot browserBot,
@@ -27,63 +26,49 @@ namespace BankingBot.ActionManagers.LoginManagers
             _scriptManager = scriptManager;
         }
 
-        public Response Login(ILoginCredentials credentials)
+        public void Login(ILoginCredentials credentials)
         {
-            var response = new Response();
+            _credentials = (LloydsLoginCredentials)credentials;
-            var lloydsCreds = (LloydsLoginCredentials)credentials;
 
-            try
+            LoginStep1();
-            {
+            LoginStep2();
-                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;
         }
 
-        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_userID")).SendKeys(_credentials.Username);
-            _browserBot.WebDriver.FindElement(By.Id("frmLogin:strCustomerLogin_pwd")).SendKeys(credentials.Password);
+            _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()

BankingBot/ActionManagers/LoginManagers/LoginManager.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Linq;
-using BankingBot.Attributes;
 using BankingBot.Contracts;
-using BankingBot.Responses;
 using BankingBot.ScriptManagement;
 
 namespace BankingBot.ActionManagers.LoginManagers
@@ -13,7 +10,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 +18,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);
         }
     }
 }

BankingBot/BankingBot.csproj

@@ -77,8 +77,6 @@
     <Compile Include="ActionManagers\LoginManagers\LoginManager.cs" />
     <Compile Include="Models\Account.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Responses\LoginResponse.cs" />
-    <Compile Include="Responses\Response.cs" />
     <Compile Include="ScriptManagement\ScriptBundles.cs" />
     <Compile Include="ScriptManagement\ScriptManager.cs" />
     <Compile Include="Urls\LloydsUrls.cs" />

BankingBot/BankingClient.cs

@@ -5,7 +5,6 @@ using BankingBot.ActionManagers.LoginManagers;
 using BankingBot.Models;
 using OpenQA.Selenium;
 using BankingBot.ActionManagers.AccountManagers;
-using BankingBot.Responses;
 using BankingBot.Enums;
 
 namespace BankingBot
@@ -36,18 +35,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);
+            loginManager.Login(credentials);
-            if (response.Status == ResponseStatus.Success)
+            accountManager.Init(Provider);
-            {
-                accountManager.Init(Provider);
-            }
-
-            return response;
         }
 
         #endregion

BankingBot/Contracts/IClient.cs

@@ -1,13 +1,11 @@
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using BankingBot.Models;
-using BankingBot.Responses;
 
 namespace BankingBot.Contracts
 {
     public interface IClient
     {
-        Response Login(ILoginCredentials credentials);
+        void Login(ILoginCredentials credentials);
 
         decimal GetBalance();
 

BankingBot/Contracts/ILoginManager.cs

@@ -1,9 +1,7 @@
-using BankingBot.Responses;
+namespace BankingBot.Contracts
-
-namespace BankingBot.Contracts
 {
     public interface ILoginManager
     {
-        Response Login(ILoginCredentials credentials);
+        void Login(ILoginCredentials credentials);
     }
 }

BankingBot/Contracts/IProviderLoginManager.cs

@@ -1,9 +1,7 @@
-using BankingBot.Responses;
+namespace BankingBot.Contracts
-
-namespace BankingBot.Contracts
 {
     public interface IProviderLoginManager
     {
-        Response Login(ILoginCredentials credentials);
+        void Login(ILoginCredentials credentials);
     }
 }

BankingBot/LoginCredentials/LloydsLoginCredentials.cs

@@ -1,10 +1,4 @@
-using System;
+using BankingBot.Attributes;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BankingBot.Attributes;
-using BankingBot.Contracts;
 
 namespace BankingBot.LoginCredentials
 {

BankingBot/LoginCredentials/LoginCredentials.cs

@@ -1,9 +1,4 @@
-using System;
+using BankingBot.Attributes;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BankingBot.Attributes;
 using BankingBot.Contracts;
 using BankingBot.Enums;
 

BankingBot/Responses/LoginResponse.cs

@@ -1,14 +0,0 @@
-using BankingBot.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankingBot.Responses
-{
-    public class LoginResponse : Response
-    {
-        Provider Provider { get; }
-    }
-}

BankingBot/Responses/Response.cs

@@ -1,17 +0,0 @@
-using BankingBot.Contracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BankingBot.Enums;
-
-namespace BankingBot.Responses
-{
-    public class Response : IResponse
-    {
-        public Exception Exception { get; set; }
-
-        public ResponseStatus Status { get; set; }
-    }
-}