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

fix #4969 - improve feedback and flow when connection string points to an invalid database

Browse Source
This commit is contained in:
sbwalker 2025-01-13 07:48:30 -05:00
parent 44ce68097b
commit 3468cba000
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
{
// 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)
{
_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
if (install == null)
{
// startup or silent installation
// startup or auotmated installation
install = new InstallConfig
{
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))
{
// silent install
// automated install
install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate);
install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme);
install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer);
@ -120,7 +120,11 @@ namespace Oqtane.Infrastructure
}
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 = "";
}
}

3
Oqtane.Server/Program.cs
View File

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