diff --git a/src/Robware.Api.Auth.sln b/src/Robware.Api.Auth.sln index 697882f..3b269de 100644 --- a/src/Robware.Api.Auth.sln +++ b/src/Robware.Api.Auth.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Auth", "Robware.Aut EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Auth.Tests", "Robware.Auth.Tests\Robware.Auth.Tests.csproj", "{E229DE31-8DBB-4AED-9461-A04C8DE0F074}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data", "Robware.Data\Robware.Data.csproj", "{69989FA2-BEE8-491D-97B9-856D4916D154}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{19A36DA9-BFBF-4988-B7C7-4808D6B57246}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data.MongoDB", "Robware.Data.MongoDB\Robware.Data.MongoDB.csproj", "{574A8F26-06E4-4225-AE82-5824A721DD10}" diff --git a/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj b/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj index fdadf85..3986329 100644 --- a/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj +++ b/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj @@ -17,7 +17,6 @@ - \ No newline at end of file diff --git a/src/Robware.Data/API/ApiKeyRepository.cs b/src/Robware.Data/API/ApiKeyRepository.cs deleted file mode 100644 index cb03368..0000000 --- a/src/Robware.Data/API/ApiKeyRepository.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Threading.Tasks; -using System.Linq; -using Dapper; -using Robware.Auth.API; -using Robware.Data.Users; - -namespace Robware.Data.API { - public class ApiKeyRepository : IApiKeys { - private readonly IDatabaseProvider _dbProvider; - - public ApiKeyRepository(IDatabaseProvider dbProvider) { - _dbProvider = dbProvider; - } - - public async Task Get(string key) { - const string query = "SELECT * FROM api_keys WHERE api_key=@key"; - - using (var connection = _dbProvider.NewConnection()) { - connection.Open(); - var result = await connection.QueryAsync(query, new {key}); - - if (!result.Any()) - throw new ApiKeyNotFoundException(key); - - var dbKey = result.Single(); - return new ApiKey { - Key = dbKey.Api_Key, - Enabled = dbKey.Enabled, - IssueTimestamp = dbKey.IssueTimestamp, - Name = dbKey.Name - }; - } - } - } - - public class ApiKeyState { - public string Name { get; set; } - public DateTime IssueTimestamp { get; set; } - public string Api_Key { get; set; } - public bool Enabled { get; set; } - } -} \ No newline at end of file diff --git a/src/Robware.Data/Robware.Data.csproj b/src/Robware.Data/Robware.Data.csproj deleted file mode 100644 index fc1eb18..0000000 --- a/src/Robware.Data/Robware.Data.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp3.1 - - - - - - - - - - - - diff --git a/src/Robware.Data/Users/DatabaseUser.cs b/src/Robware.Data/Users/DatabaseUser.cs deleted file mode 100644 index 8a14c0d..0000000 --- a/src/Robware.Data/Users/DatabaseUser.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Robware.Auth.Users; -using Robware.Data.Users.States; - -namespace Robware.Data.Users { - public class DatabaseUser : User { - public DatabaseUser(UserState state) { - Username = state.User_Email; - Password = state.User_Password; - } - } -} \ No newline at end of file diff --git a/src/Robware.Data/Users/IDatabaseProvider.cs b/src/Robware.Data/Users/IDatabaseProvider.cs deleted file mode 100644 index 7304a7c..0000000 --- a/src/Robware.Data/Users/IDatabaseProvider.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Data; - -namespace Robware.Data.Users { - public interface IDatabaseProvider { - IDbConnection NewConnection(); - } -} \ No newline at end of file diff --git a/src/Robware.Data/Users/MySQLDatabaseProvider.cs b/src/Robware.Data/Users/MySQLDatabaseProvider.cs deleted file mode 100644 index ec6e07d..0000000 --- a/src/Robware.Data/Users/MySQLDatabaseProvider.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Data; -using MySql.Data.MySqlClient; - -namespace Robware.Data.Users { - public class MySQLDatabaseProvider : IDatabaseProvider { - private readonly string _connectionString; - - public MySQLDatabaseProvider(string connectionString) => _connectionString = connectionString; - - public IDbConnection NewConnection() => new MySqlConnection(_connectionString); - } -} \ No newline at end of file diff --git a/src/Robware.Data/Users/States/UserState.cs b/src/Robware.Data/Users/States/UserState.cs deleted file mode 100644 index aa0cbc8..0000000 --- a/src/Robware.Data/Users/States/UserState.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Robware.Data.Users.States { - public class UserState { - public string User_Id { get; set; } - public string User_Email { get; set; } - public string User_Password { get; set; } - public string User_Created { get; set; } - public string User_Deleted { get; set; } - public string Group_Id { get; set; } - } -} \ No newline at end of file diff --git a/src/Robware.Data/Users/UserRepository.cs b/src/Robware.Data/Users/UserRepository.cs deleted file mode 100644 index b3d41ee..0000000 --- a/src/Robware.Data/Users/UserRepository.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Linq; -using System.Threading.Tasks; -using Dapper; -using Robware.Auth.Users; -using Robware.Data.Users.States; - -namespace Robware.Data.Users { - public class UserRepository : IUsers { - private readonly IDatabaseProvider _dbProvider; - - public UserRepository(IDatabaseProvider dbProvider) { - _dbProvider = dbProvider; - } - - public async Task GetByEmail(string email) { - const string query = "SELECT * FROM users WHERE user_email=@email"; - - using (var connection = _dbProvider.NewConnection()) { - connection.Open(); - var result = await connection.QueryAsync(query, new { email }); - - if (!result.Any()) - throw new UserNotFoundException(email); - - return new DatabaseUser(result.Single()); - } - } - } -} \ No newline at end of file