Merge pull request #1759 from sbwalker/dev

fix #1746 - SQL Server installation needs to allow configuration of encryption setting on .NET 6
oqtane · Nov 3, 2021 · 404bcad · 404bcad
2 parents 1761c47 + bd5a827
commit 404bcad
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
 @inject IStringLocalizer<SqlServerConfig> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
     <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
@@ -38,13 +39,23 @@
         </div>
     </div>
 }
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="encryption" HelpText="Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment." ResourceKey="Encryption">Encryption:</Label>
+    <div class="col-sm-9">
+        <select id="encryption" class="form-select custom-select" @bind="@_encryption">
+            <option value="true">@SharedLocalizer["True"]</option>
+            <option value="false">@SharedLocalizer["False"]</option>
+        </select>
+    </div>
+</div>
 
 @code {
     private string _server = String.Empty;
     private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
     private string _security = "integrated";
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _encryption = "false";
 
     public string GetConnectionString()
     {
@@ -61,15 +72,9 @@
         }
         else
         {
-            if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
-            {
-                connectionString += $"User ID={_uid};Password={_pwd};";
-            }
-            else
-            {
-                connectionString = String.Empty;
-            }
+            connectionString += $"User ID={_uid};Password={_pwd};";
         }
+		connectionString += $"Encrypt={_encryption};";
 
         return connectionString;
     }

diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
@@ -153,4 +153,10 @@
   <data name="Integrated" xml:space="preserve">
     <value>Integrated</value>
   </data>
+  <data name="Encryption,Text" xml:space="preserve">
+    <value>Encryption:</value>
+  </data>
+  <data name="Encryption.HelpText" xml:space="preserve">
+    <value>Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment.</value>
+  </data>
 </root>