cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored a few more methods that rely on the IConfiguration object to use IConfigHelper instead.

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2024-11-25 08:40:14 -07:00
parent d4dda481be
commit 230433f784
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/MigrationController.cs
View File

@@ -15,7 +15,7 @@ namespace CarCareTracker.Controllers
private IConfigHelper _configHelper; private IConfigHelper _configHelper;
private IFileHelper _fileHelper; private IFileHelper _fileHelper;
private readonly ILogger<MigrationController> _logger; private readonly ILogger<MigrationController> _logger;
public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger) public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, ILogger<MigrationController> logger)
{ {
_configHelper = configHelper; _configHelper = configHelper;
_fileHelper = fileHelper; _fileHelper = fileHelper;

8
Helper/ConfigHelper.cs
View File

@@ -10,6 +10,7 @@ namespace CarCareTracker.Helper
{ {
OpenIDConfig GetOpenIDConfig(); OpenIDConfig GetOpenIDConfig();
ReminderUrgencyConfig GetReminderUrgencyConfig(); ReminderUrgencyConfig GetReminderUrgencyConfig();
MailConfig GetMailConfig();
UserConfig GetUserConfig(ClaimsPrincipal user); UserConfig GetUserConfig(ClaimsPrincipal user);
bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData); bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
bool AuthenticateRootUser(string username, string password); bool AuthenticateRootUser(string username, string password);
@@ -65,6 +66,11 @@ namespace CarCareTracker.Helper
ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(); ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
return reminderUrgencyConfig; return reminderUrgencyConfig;
} }
public MailConfig GetMailConfig()
{
MailConfig mailConfig = _config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
return mailConfig;
}
public string GetLogoUrl() public string GetLogoUrl()
{ {
var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png"); var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png");
@@ -107,7 +113,7 @@ namespace CarCareTracker.Helper
} }
public string GetServerPostgresConnection() public string GetServerPostgresConnection()
{ {
var postgresConnection = CheckString("POSTGRES_CONNECTION") var postgresConnection = CheckString("POSTGRES_CONNECTION");
return postgresConnection; return postgresConnection;
} }
public bool GetServerEnableShopSupplies() public bool GetServerEnableShopSupplies()

4
Helper/MailHelper.cs
View File

@@ -18,12 +18,12 @@ namespace CarCareTracker.Helper
private readonly IFileHelper _fileHelper; private readonly IFileHelper _fileHelper;
private readonly ILogger<MailHelper> _logger; private readonly ILogger<MailHelper> _logger;
public MailHelper( public MailHelper(
IConfiguration config, IConfigHelper config,
IFileHelper fileHelper, IFileHelper fileHelper,
ILogger<MailHelper> logger ILogger<MailHelper> logger
) { ) {
//load mailConfig from Configuration //load mailConfig from Configuration
mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig(); mailConfig = config.GetMailConfig();
_fileHelper = fileHelper; _fileHelper = fileHelper;
_logger = logger; _logger = logger;
} }

2
Middleware/Authen.cs
View File

@@ -28,7 +28,7 @@ namespace CarCareTracker.Middleware
_httpContext = httpContext; _httpContext = httpContext;
_dataProtector = securityProvider.CreateProtector("login"); _dataProtector = securityProvider.CreateProtector("login");
_loginLogic = loginLogic; _loginLogic = loginLogic;
enableAuth = bool.Parse(configuration["EnableAuth"]); enableAuth = bool.Parse(configuration["EnableAuth"] ?? "false");
} }
protected override async Task<AuthenticateResult> HandleAuthenticateAsync() protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
{ {

2
Program.cs
View File

@@ -65,8 +65,8 @@ builder.Services.AddSingleton<IFileHelper, FileHelper>();
builder.Services.AddSingleton<IGasHelper, GasHelper>(); builder.Services.AddSingleton<IGasHelper, GasHelper>();
builder.Services.AddSingleton<IReminderHelper, ReminderHelper>(); builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
builder.Services.AddSingleton<IReportHelper, ReportHelper>(); builder.Services.AddSingleton<IReportHelper, ReportHelper>();
builder.Services.AddSingleton<IMailHelper, MailHelper>();
builder.Services.AddSingleton<IConfigHelper, ConfigHelper>(); builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
builder.Services.AddSingleton<IMailHelper, MailHelper>();
builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>(); builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
//configure logic //configure logic

6
Views/Admin/Index.cshtml
View File

@@ -2,12 +2,12 @@
@{ @{
ViewData["Title"] = "Admin Panel"; ViewData["Title"] = "Admin Panel";
} }
@inject IConfiguration config; @inject IConfigHelper config
@inject ITranslationHelper translator @inject ITranslationHelper translator
@{ @{
bool emailServerIsSetup = true; bool emailServerIsSetup = true;
var mailConfig = config.GetSection("MailConfig").Get<MailConfig>(); var mailConfig = config.GetMailConfig();
var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US"; var userLanguage = config.GetServerLanguage();
if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer)) if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
{ {
emailServerIsSetup = false; emailServerIsSetup = false;

4
Views/Migration/Index.cshtml
View File

@@ -1,10 +1,10 @@
@{ @{
ViewData["Title"] = "Database Migration"; ViewData["Title"] = "Database Migration";
} }
@inject IConfiguration config; @inject IConfigHelper config
@inject ITranslationHelper translator @inject ITranslationHelper translator
@{ @{
var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US"; var userLanguage = config.GetServerLanguage();
} }
@using CarCareTracker.Helper @using CarCareTracker.Helper
@model AdminViewModel @model AdminViewModel