Janus007/PlanTempusApp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conforming all these db calls

Browse source
This commit is contained in:
Janus C. H. Knudsen 2025-02-06 23:46:55 +01:00
parent 5ca874abe9
commit 05d6977a76
17 changed files with 337 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Database/ConfigurationManagementSystem/ConfigurationDatabaseSetup.cs → Database/ConfigurationManagementSystem/SetupConfiguration.cs
View file

@ -3,11 +3,11 @@ using System.Data;
namespace Database.ConfigurationManagementSystem;
public class ConfigurationDatabaseSetup
public class SetupConfiguration
{
private readonly IDbConnection _connection;
public ConfigurationDatabaseSetup(IDbConnection connection)
public SetupConfiguration(IDbConnection connection)
{
_connection = connection;
}

180
Database/Core/SetupIdentitySystem.cs
View file

@ -1,67 +1,67 @@
using Insight.Database;
using System.Data;
namespace Database.IdentitySystem
namespace Database.Core
{
public interface IDbSetup
{
void CreateSystem(string schema = null);
}
public interface IDbSetup
{
void CreateSystem(string schema = null);
}
/// <summary>
/// This is by purpose not async await
/// </summary>
public class DbSetup : IDbSetup
{
readonly IDbConnection _db;
IDbTransaction _transaction = null;
string _schema;
/// <summary>
/// This is by purpose not async await
/// </summary>
public class SetupIdentitySystem : IDbSetup
{
readonly IDbConnection _db;
IDbTransaction _transaction = null;
string _schema;
public DbSetup(IDbConnection db)
{
_db = db;
}
public SetupIdentitySystem(IDbConnection db)
{
_db = db;
}
/// <summary>
/// Creates the system tables in the specified schema within a transaction.
/// </summary>
/// <param name="schema">The schema name where the tables will be created.</param>
public void CreateSystem(string schema = null)
{
/// <summary>
/// Creates the system tables in the specified schema within a transaction.
/// </summary>
/// <param name="schema">The schema name where the tables will be created.</param>
public void CreateSystem(string schema = null)
{
using (_transaction = _db.BeginTransaction())
{
try
{
CreateUsersTable();
CreateTenantsTable();
CreateUserTenantsTable();
SetupRLS();
using (_transaction = _db.BeginTransaction())
{
try
{
CreateUsersTable();
CreateTenantsTable();
CreateUserTenantsTable();
SetupRLS();
_transaction.Commit();
}
catch (Exception ex)
{
_transaction.Rollback();
throw new InvalidOperationException("Failed to create system tables.", ex);
}
}
}
private void ExecuteSql(string sql)
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException(nameof(sql));
_transaction.Commit();
}
catch (Exception ex)
{
_transaction.Rollback();
throw new InvalidOperationException("Failed to create system tables.", ex);
}
}
}
private void ExecuteSql(string sql)
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException(nameof(sql));
_db.ExecuteSql(sql);
}
_db.ExecuteSql(sql);
}
/// <summary>
/// Creates the users table
/// </summary>
public void CreateUsersTable()
{
var sql = @"
/// <summary>
/// Creates the users table
/// </summary>
public void CreateUsersTable()
{
var sql = @"
CREATE TABLE IF NOT EXISTS users (
id SERIAL PRIMARY KEY,
email VARCHAR(256) NOT NULL UNIQUE,
@ -76,16 +76,16 @@ namespace Database.IdentitySystem
last_login_at TIMESTAMPTZ NULL
);";
ExecuteSql(sql);
ExecuteSql(sql);
}
}
/// <summary>
/// Creates the tenants table
/// </summary>
public void CreateTenantsTable()
{
var sql = @"
/// <summary>
/// Creates the tenants table
/// </summary>
public void CreateTenantsTable()
{
var sql = @"
CREATE TABLE IF NOT EXISTS tenants (
id SERIAL PRIMARY KEY,
connection_string VARCHAR(500) NOT NULL,
@ -94,16 +94,16 @@ namespace Database.IdentitySystem
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
);";
ExecuteSql(sql);
ExecuteSql(sql);
}
}
/// <summary>
/// Creates the user_tenants table
/// </summary>
public void CreateUserTenantsTable()
{
var sql = @"
/// <summary>
/// Creates the user_tenants table
/// </summary>
public void CreateUserTenantsTable()
{
var sql = @"
CREATE TABLE IF NOT EXISTS user_tenants (
user_id INTEGER NOT NULL REFERENCES users(id),
tenant_id INTEGER NOT NULL REFERENCES tenants(id),
@ -112,37 +112,37 @@ namespace Database.IdentitySystem
PRIMARY KEY (user_id, tenant_id)
);";
ExecuteSql(sql);
ExecuteSql(sql);
}
}
/// <summary>
/// Sets up Row Level Security (RLS) for the tenants and user_tenants tables.
/// </summary>
public void SetupRLS()
{
var sql = new[]
{
"ALTER TABLE tenants ENABLE ROW LEVEL SECURITY;",
"ALTER TABLE user_tenants ENABLE ROW LEVEL SECURITY;",
"DROP POLICY IF EXISTS tenant_access ON tenants;",
@"CREATE POLICY tenant_access ON tenants
/// <summary>
/// Sets up Row Level Security (RLS) for the tenants and user_tenants tables.
/// </summary>
public void SetupRLS()
{
var sql = new[]
{
"ALTER TABLE tenants ENABLE ROW LEVEL SECURITY;",
"ALTER TABLE user_tenants ENABLE ROW LEVEL SECURITY;",
"DROP POLICY IF EXISTS tenant_access ON tenants;",
@"CREATE POLICY tenant_access ON tenants
USING (id IN (
SELECT tenant_id
FROM user_tenants
WHERE user_id = current_setting('app.user_id', TRUE)::INTEGER
));",
"DROP POLICY IF EXISTS user_tenant_access ON user_tenants;",
@"CREATE POLICY user_tenant_access ON user_tenants
"DROP POLICY IF EXISTS user_tenant_access ON user_tenants;",
@"CREATE POLICY user_tenant_access ON user_tenants
USING (user_id = current_setting('app.user_id', TRUE)::INTEGER);"
};
};
foreach (var statement in sql)
{
ExecuteSql(statement);
}
}
foreach (var statement in sql)
{
ExecuteSql(statement);
}
}
}
}
}

62
Database/Core/SetupUser.cs
View file

@ -1,62 +0,0 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Insight.Database;
namespace Database.Core
{
public class SetupUser
{
private readonly IDbConnection _db;
public SetupUser(IDbConnection db)
{
_db = db;
}
public async Task CreateTenantInDatabase(string schema, string user, string password)
{
if (!Regex.IsMatch(schema, "^[a-zA-Z0-9_]+$"))
throw new ArgumentException("Invalid schema name");
await CreateUser(user, password);
await CreateSchema(schema);
await GrantSchemaRights(schema, user);
await CreateNavigationLinkTemplatesTable(schema);
await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateSchema(string schema)
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {schema}";
await _db.ExecuteAsync(sql);
}
private async Task CreateUser(string user, string password)
{
var sql = $"CREATE USER {user} WITH PASSWORD '{password}';";
await _db.ExecuteAsync(sql);
}
private async Task GrantSchemaRights(string schema, string user)
{
var sql = $"GRANT USAGE ON SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {schema} " +
$"GRANT ALL PRIVILEGES ON TABLES TO {user};";
await _db.ExecuteAsync(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql2);
}
}
}

2
Database/Core/UserService.cs
View file

@ -2,7 +2,7 @@
using Insight.Database;
using System.Data;
namespace Database.IdentitySystem
namespace Database.Core
{
public class UserService
{

1
Database/Database.csproj
View file

@ -11,7 +11,6 @@
<ItemGroup>
<Folder Include="AuditSystem\" />
<Folder Include="NavigationSystem\" />
</ItemGroup>
</Project>

12
Database/RolesPermissionSystem/NavigationSystem.cs → Database/NavigationSystem/Setup.cs
View file

@ -1,18 +1,22 @@
using Insight.Database;
using System.Data;
namespace Database.RolesPermissionSystem
namespace Database.NavigationSystem
{
internal class NavigationSystem
internal class Setup
{
private readonly IDbConnection _db;
public NavigationSystem(IDbConnection db)
public Setup(IDbConnection db)
{
_db = db;
}
public void CreateSystem()
{
//await CreateNavigationLinkTemplatesTable(schema);
//await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateNavigationLinkTemplatesTable(string schema)
{

135
Database/RolesPermissionSystem/Setup.cs
View file

@ -1,99 +1,98 @@
using System.Data;
using System.Text.RegularExpressions;
using Database.Common;
using Insight.Database;
namespace Database.RolesPermissionSystem
{
public class Setup
{
private readonly IDbConnection _db;
public class Setup
{
IDbConnection _db;
string _schema;
public Setup(IDbConnection db)
{
_db = db ?? throw new ArgumentNullException(nameof(db));
}
public Setup(IDbConnection db)
{
_db = db;
}
/// <summary>
/// Creates the system tables in the specified schema within a transaction.
/// </summary>
/// <param name="schema">The schema name where the tables will be created.</param>
public void CreateSystem(string schema)
{
if (!Validations.IsValidSchemaName(schema))
throw new ArgumentException("Invalid schema name", nameof(schema));
/// <summary>
/// Creates the system tables in the specified schema within a transaction.
/// </summary>
/// <param name="schema">The schema name where the tables will be created.</param>
public void CreateSystem(string schema)
{
_schema = schema;
using (var transaction = _db.BeginTransaction())
{
try
{
CreateRolesTable(schema, transaction);
CreatePermissionsTable(schema, transaction);
CreatePermissionTypesTable(schema, transaction);
CreateRolePermissionsTable(schema, transaction);
if (!Validations.IsValidSchemaName(_schema))
throw new ArgumentException("Invalid schema name", _schema);
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
throw new InvalidOperationException("Failed to create system tables.", ex);
}
}
}
using (var transaction = _db.BeginTransaction())
{
try
{
CreateRolesTable();
CreatePermissionsTable();
CreatePermissionTypesTable();
CreateRolePermissionsTable();
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
throw new InvalidOperationException("Failed to create system tables.", ex);
}
}
}
private void ExecuteSql(string sql, IDbTransaction transaction)
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException(nameof(sql));
private void ExecuteSql(string sql)
{
_db.ExecuteSql(sql);
}
_db.Execute(sql, transaction: transaction);
}
private void CreatePermissionTypesTable(string schema, IDbTransaction transaction)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.permission_types (
private void CreatePermissionTypesTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {_schema}.permission_types (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE
)";
ExecuteSql(sql, transaction);
}
ExecuteSql(sql);
}
private void CreatePermissionsTable(string schema, IDbTransaction transaction)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.permissions (
private void CreatePermissionsTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {_schema}.permissions (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE,
type_id INTEGER NOT NULL,
FOREIGN KEY (type_id) REFERENCES {schema}.permission_types(id)
FOREIGN KEY (type_id) REFERENCES {_schema}.permission_types(id)
)";
ExecuteSql(sql, transaction);
}
ExecuteSql(sql);
}
private void CreateRolesTable(string schema, IDbTransaction transaction)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.roles (
private void CreateRolesTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {_schema}.roles (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE
)";
ExecuteSql(sql, transaction);
}
ExecuteSql(sql);
}
private void CreateRolePermissionsTable(string schema, IDbTransaction transaction)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.role_permissions (
private void CreateRolePermissionsTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {_schema}.role_permissions (
role_id INTEGER NOT NULL,
permission_id INTEGER NOT NULL,
PRIMARY KEY (role_id, permission_id),
FOREIGN KEY (role_id) REFERENCES {schema}.roles(id),
FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id)
FOREIGN KEY (role_id) REFERENCES {_schema}.roles(id),
FOREIGN KEY (permission_id) REFERENCES {_schema}.permissions(id)
)";
ExecuteSql(sql, transaction);
}
}
ExecuteSql(sql);
}
}
}

88
Database/Tenants/Setup.cs Normal file
View file

@ -0,0 +1,88 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Database.Common;
using Insight.Database;
namespace Database.Tenants
{
public class Setup
{
IDbConnection _db;
string _schema;
string _user;
string _password;
public Setup(IDbConnection db)
{
_db = db;
}
public void CreateUserWithSchemaInDatabase(string schema, string user, string password)
{
_schema = schema;
_password = password;
_user = user;
if (!Validations.IsValidSchemaName(_schema))
throw new ArgumentException("Invalid schema name", _schema);
using (var transaction = _db.BeginTransaction())
{
try
{
CreateSchema();
CreateRole();
GrantSchemaRights();
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
throw new InvalidOperationException("Failed to CreateUserWithSchemaInDatabase", ex);
}
}
}
private void ExecuteSql(string sql)
{
_db.ExecuteSql(sql);
}
private void CreateSchema()
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {_schema}";
ExecuteSql(sql);
}
private void CreateRole()
{
var sql = $"CREATE ROLE {_user} LOGIN PASSWORD '{_password}';";
ExecuteSql(sql);
var sql1 = $"ALTER ROLE {_user} SET search_path='{_schema}';";
ExecuteSql(sql1);
}
private void GrantSchemaRights()
{
var sql = $"GRANT USAGE ON SCHEMA {_schema} TO {_user};";
ExecuteSql(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_schema} " +
$"GRANT INSERT, SELECT, UPDATE PRIVILEGES ON TABLES TO {_user};";
ExecuteSql(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_schema} TO {_user};";
ExecuteSql(sql2);
}
}
}

133
Database/Tenants/TenantSetupService.cs
View file

@ -1,133 +0,0 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Insight.Database;
namespace Database.Tenants
{
public class Setup
{
private readonly IDbConnection _db;
public Setup(IDbConnection db)
{
_db = db;
}
public async Task CreateTenantInDatabase(string schema, string user, string password)
{
if (!Regex.IsMatch(schema, "^[a-zA-Z0-9_]+$"))
throw new ArgumentException("Invalid schema name");
await CreateUser(user, password);
await CreateSchema(schema);
await GrantSchemaRights(schema, user);
await CreateNavigationLinkTemplatesTable(schema);
await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateSchema(string schema)
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {schema}";
await _db.ExecuteAsync(sql);
}
private async Task CreateUser(string user, string password)
{
var sql = $"CREATE USER {user} WITH PASSWORD '{password}';";
await _db.ExecuteAsync(sql);
}
private async Task GrantSchemaRights(string schema, string user)
{
var sql = $"GRANT USAGE ON SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {schema} " +
$"GRANT ALL PRIVILEGES ON TABLES TO {user};";
await _db.ExecuteAsync(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql2);
}
//private async Task CreatePermissionTypesTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.permission_types (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreatePermissionsTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.permissions (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE,
// type_id INTEGER NOT NULL,
// FOREIGN KEY (type_id) REFERENCES {schema}.permission_types(id)
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreateRolesTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.roles (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreateRolePermissionsTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.role_permissions (
// role_id INTEGER NOT NULL,
// permission_id INTEGER NOT NULL,
// PRIMARY KEY (role_id, permission_id),
// FOREIGN KEY (role_id) REFERENCES {schema}.roles(id),
// FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id)
// )";
// await _db.ExecuteAsync(sql);
//}
private async Task CreateNavigationLinkTemplatesTable(string schema)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.navigation_link_templates (
id SERIAL PRIMARY KEY,
parent_id INTEGER NULL,
url VARCHAR(500) NOT NULL,
permission_id INTEGER NULL,
icon VARCHAR(100) NULL,
default_order INTEGER NOT NULL,
FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id),
FOREIGN KEY (parent_id) REFERENCES {schema}.navigation_link_templates(id)
)";
await _db.ExecuteAsync(sql);
}
private async Task CreateNavigationLinkTemplateTranslationsTable(string schema)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.navigation_link_template_translations (
id SERIAL PRIMARY KEY,
template_id INTEGER NOT NULL,
language VARCHAR(10) NOT NULL,
display_name VARCHAR(100) NOT NULL,
FOREIGN KEY (template_id) REFERENCES {schema}.navigation_link_templates(id)
)";
await _db.ExecuteAsync(sql);
}
}
}