diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor index 48dc9f83..c5f6228a 100644 --- a/Oqtane.Client/Installer/Installer.razor +++ b/Oqtane.Client/Installer/Installer.razor @@ -35,13 +35,27 @@ } - @{ - if (_databaseConfigType != null) - { - @DatabaseConfigComponent; - } - } - + @if (!_showConnectionString) + { + if (_databaseConfigType != null) + { + @DatabaseConfigComponent + } +
+ + } + else + { +
+ +
+ +
+
+
+ + } +

@Localizer["ApplicationAdmin"]


@@ -100,13 +114,15 @@ private Type _databaseConfigType; private object _databaseConfig; private RenderFragment DatabaseConfigComponent { get; set; } + private bool _showConnectionString = false; + private string _connectionString = string.Empty; private string _hostUsername = string.Empty; private string _hostPassword = string.Empty; private string _passwordType = "password"; - private string _confirmPasswordType = "password"; + private string _confirmPasswordType = "password"; private string _togglePassword = string.Empty; - private string _toggleConfirmPassword = string.Empty; + private string _toggleConfirmPassword = string.Empty; private string _confirmPassword = string.Empty; private string _hostEmail = string.Empty; private bool _register = true; @@ -116,7 +132,7 @@ protected override async Task OnInitializedAsync() { _togglePassword = SharedLocalizer["ShowPassword"]; - _toggleConfirmPassword = SharedLocalizer["ShowPassword"]; + _toggleConfirmPassword = SharedLocalizer["ShowPassword"]; _databases = await DatabaseService.GetDatabasesAsync(); if (_databases.Exists(item => item.IsDefault)) @@ -172,9 +188,16 @@ private async Task Install() { var connectionString = String.Empty; - if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) + if (_showConnectionString) { - connectionString = databaseConfigControl.GetConnectionString(); + connectionString = _connectionString; + } + else + { + if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) + { + connectionString = databaseConfigControl.GetConnectionString(); + } } if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@")) @@ -218,12 +241,12 @@ { _message = Localizer["Message.Password.Invalid"]; } - } - else - { - _message = Localizer["Message.Require.DbInfo"]; - } - } + } + else + { + _message = Localizer["Message.Require.DbInfo"]; + } + } private void TogglePassword() { @@ -239,7 +262,7 @@ } } - private void ToggleConfirmPassword() + private void ToggleConfirmPassword() { if (_confirmPasswordType == "password") { @@ -252,4 +275,14 @@ _toggleConfirmPassword = SharedLocalizer["ShowPassword"]; } } + + private void ToggleConnectionString() + { + if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) + { + _connectionString = databaseConfigControl.GetConnectionString(); + } + _showConnectionString = !_showConnectionString; + } + } diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx index b211c6aa..e54f584a 100644 --- a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx +++ b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx @@ -121,7 +121,7 @@ Server: - Enter the database server + Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) Database: @@ -133,7 +133,7 @@ Integrated Security: - Select if you want integrated security or not + Select if you are using integrated security User Id: @@ -163,7 +163,7 @@ Self Signed - Specify the type of certificate you are using for encryption + Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True. Trust Server Certificate: diff --git a/Oqtane.Client/Resources/Installer/Installer.resx b/Oqtane.Client/Resources/Installer/Installer.resx index 740ba227..fd937839 100644 --- a/Oqtane.Client/Resources/Installer/Installer.resx +++ b/Oqtane.Client/Resources/Installer/Installer.resx @@ -135,10 +135,10 @@ Please Enter All Required Fields. Ensure Passwords Match And Email Address Provided Is Valid. - + The Password Provided Does Not Meet The Password Policy. Please Verify The Minimum Password Length And Complexity Requirements. - + Please Register Me For Major Product Updates And Security Bulletins @@ -168,4 +168,16 @@ Username: + + Enter a complete connection string including all parameters and delimiters + + + String: + + + Enter Connection Parameters + + + Enter Connection String + \ No newline at end of file