Added responses to login

BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs

@@ -4,6 +4,8 @@ using BankingBot.Attributes;
 using BankingBot.Contracts;
 using BankingBot.LoginCredentials;
 using OpenQA.Selenium;
+using BankingBot.Responses;
+using BankingBot.Enums;
 
 namespace BankingBot.ActionManagers.LoginManagers
 {
@@ -24,19 +26,32 @@ namespace BankingBot.ActionManagers.LoginManagers
             _browserBot = browserBot;
         }
 
-        public void Login(ILoginCredentials credentials)
+        public Response Login(ILoginCredentials credentials)
         {
+            var response = new Response();
             var lloydsCreds = (LloydsLoginCredentials)credentials;
 
-            LoginStep1(lloydsCreds);
+            try
+            {
+                LoginStep1(lloydsCreds);
 
-            if (!_browserBot.WebDriver.Url.Contains(Urls.MemorableInfo))
+                if (!_browserBot.WebDriver.Url.Contains(Urls.MemorableInfo))
-                throw new Exception("An error occured");
+                    throw new InvalidOperationException("Invalid login credentials");
 
-            LoginStep2(lloydsCreds);
+                LoginStep2(lloydsCreds);
 
-            if (!_browserBot.WebDriver.Url.Contains(Urls.AccountOverview))
+                if (!_browserBot.WebDriver.Url.Contains(Urls.AccountOverview))
-                throw new Exception("An error occured");
+                    throw new InvalidOperationException("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)

BankingBot/ActionManagers/LoginManagers/LoginManager.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using BankingBot.Attributes;
 using BankingBot.Contracts;
+using BankingBot.Responses;
 
 namespace BankingBot.ActionManagers.LoginManagers
 {
@@ -11,39 +12,12 @@ namespace BankingBot.ActionManagers.LoginManagers
             : base(browserBot)
         { }
 
-        public void Login(ILoginCredentials credentials)
+        public Response Login(ILoginCredentials credentials)
         {
-            //var provLoginManagerType = GetProviderLoginManagerType(credentials);
-            //var provLoginManager = (IProviderLoginManager)Activator.CreateInstance(provLoginManagerType, BrowserBot);
-            //provLoginManager.Login(credentials);
-
             var provLoginManagerType = GetActionTypeFromInterface(credentials, typeof(IProviderLoginManager));
             var provLoginManager = (IProviderLoginManager)Activator.CreateInstance(provLoginManagerType, BrowserBot);
-            provLoginManager.Login(credentials);
+
+            return provLoginManager.Login(credentials);
         }
-
-        //private Type GetProviderLoginManagerType(ILoginCredentials credentials)
-        //{
-        //    // Get all "provider login manager" classes in the assembly
-        //    // (any class that implements IProviderLoginManager)
-        //    var providerLoginManagerTypes = AppDomain.CurrentDomain.GetAssemblies()
-        //        .SelectMany(s => s.GetTypes())
-        //        .Where(p =>
-        //            typeof(IProviderLoginManager).IsAssignableFrom(p) &&
-        //            p != typeof(IProviderLoginManager));
-
-        //    var credentialsProvider = credentials.GetProvider();
-        //    foreach (var type in providerLoginManagerTypes)
-        //    {
-        //        // Get associated provider for each "provider login manager" class
-        //        var provider = ProviderIdentifier.GetProviderFromType(type);
-        //        if (provider == credentialsProvider)
-        //        {
-        //            return type;
-        //        }
-        //    }
-
-        //    return null;
-        //}
     }
 }

BankingBot/BankingBot.csproj

@@ -57,7 +57,9 @@
     <Compile Include="Contracts\ILoginCredentials.cs" />
     <Compile Include="Contracts\ILoginManager.cs" />
     <Compile Include="Contracts\IProviderLoginManager.cs" />
+    <Compile Include="Contracts\IResponse.cs" />
     <Compile Include="Enums\Provider.cs" />
+    <Compile Include="Enums\ResponseStatus.cs" />
     <Compile Include="LoginCredentials\LloydsLoginCredentials.cs" />
     <Compile Include="LoginCredentials\LoginCredentials.cs" />
     <Compile Include="ActionManagers\LoginManagers\LloydsLoginManager.cs" />
@@ -65,6 +67,7 @@
     <Compile Include="Models\Account.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Responses\LoginResponse.cs" />
+    <Compile Include="Responses\Response.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

BankingBot/Client.cs

@@ -8,6 +8,7 @@ using BankingBot.ActionManagers.LoginManagers;
 using BankingBot.Models;
 using OpenQA.Selenium;
 using BankingBot.ActionManagers.AccountManagers;
+using BankingBot.Responses;
 
 namespace BankingBot
 {
@@ -38,11 +39,11 @@ namespace BankingBot
 
         #region Actions - Login Manager
 
-        public void Login(ILoginCredentials credentials)
+        public Response Login(ILoginCredentials credentials)
         {
-            _loginManager.Login(credentials);
-
             LoginCredentials = credentials;
+
+            return _loginManager.Login(credentials);
         }
 
         #endregion

BankingBot/Contracts/IClient.cs

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

BankingBot/Contracts/ILoginManager.cs

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

BankingBot/Contracts/IProviderLoginManager.cs

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

BankingBot/Contracts/IResponse.cs

@@ -1,4 +1,5 @@
-using System;
+using BankingBot.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,10 +9,8 @@ namespace BankingBot.Contracts
 {
     public interface IResponse
     {
-        Exception exception { get; }
+        Exception Exception { get; }
 
-        string Message { get; }
+        ResponseStatus Status { get; }
-
-        bool IsError { get; }
     }
 }

BankingBot/Enums/ResponseStatus.cs

@@ -0,0 +1,8 @@
+namespace BankingBot.Enums
+{
+    public enum ResponseStatus
+    {
+        Success,
+        Error
+    }
+}

BankingBot/Responses/Response.cs

@@ -4,15 +4,14 @@ 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 Exception Exception { get; set; }
 
-        public string Message { get; set; }
+        public ResponseStatus Status { get; set; }
-
-        public bool IsError { get; set; }
     }
 }