kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4979 from sbwalker/dev

Browse Source 
fix #4969 - improve feedback and flow when connection string points to an invalid database
This commit is contained in:
Shaun Walker 2025-01-13 07:48:50 -05:00 committed by GitHub
commit ed3743d3b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Controllers/SettingController.cs
View File

@ -64,7 +64,7 @@ namespace Oqtane.Controllers
} }
else else
{ {
// suppress unauthorized visitor logging as it is usually caused by clients that do not support cookies // suppress unauthorized visitor logging as it is usually caused by clients that do not support cookies or private browsing sessions
if (entityName != EntityNames.Visitor) if (entityName != EntityNames.Visitor)
{ {
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId); _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId);

10
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -91,7 +91,7 @@ namespace Oqtane.Infrastructure
// get configuration // get configuration
if (install == null) if (install == null)
{ {
// startup or silent installation // startup or auotmated installation
install = new InstallConfig install = new InstallConfig
{ {
ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey),
@ -111,7 +111,7 @@ namespace Oqtane.Infrastructure
if (!string.IsNullOrEmpty(install.ConnectionString) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.HostPassword) && !string.IsNullOrEmpty(install.HostEmail)) if (!string.IsNullOrEmpty(install.ConnectionString) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.HostPassword) && !string.IsNullOrEmpty(install.HostEmail))
{ {
// silent install // automated install
install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate); install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate);
install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme); install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme);
install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer); install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer);
@ -120,7 +120,11 @@ namespace Oqtane.Infrastructure
} }
else else
{ {
// silent installation is missing required information if (!string.IsNullOrEmpty(install.ConnectionString))
{
// automated installation is missing required information
result.Message = $"Error Installing Master Database For {SettingKeys.ConnectionStringKey}: {install.ConnectionString}. If You Are Trying To Execute An Automated Installation You Must Include The HostEmail, HostPassword, And DefaultAlias In appsettings.json.";
}
install.ConnectionString = ""; install.ConnectionString = "";
} }
} }

3
Oqtane.Server/Program.cs
View File

@ -25,8 +25,11 @@ namespace Oqtane.Server
filelogger.LogError($"[Oqtane.Server.Program.Main] {install.Message}"); filelogger.LogError($"[Oqtane.Server.Program.Main] {install.Message}");
} }
} }
else
{
host.Run(); host.Run();
} }
}
public static IWebHost BuildWebHost(string[] args) => public static IWebHost BuildWebHost(string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)