Remove save password functionality

Author: sergiisyrovatchenko

Console/CmdWorker.cs

@@ -19,7 +19,7 @@ public CmdWorker(List<CmdArgument> args) {
           case "connection":
             SqlConnectionStringBuilder sb = new SqlConnectionStringBuilder(cmd.Params[0]);
             host.Server = sb.DataSource;
-            host.AuthType = sb.IntegratedSecurity ? AuthTypes.WINDOWS : AuthTypes.SQLSERVER;
+            host.AuthType = sb.IntegratedSecurity ? AuthTypes.Windows : AuthTypes.Sql;
             host.User = sb.UserID;
             if (!string.IsNullOrEmpty(sb.InitialCatalog)) {
               host.Databases.Add(sb.InitialCatalog);

Forms/ConnectionBox.Designer.cs

@@ -24,7 +24,6 @@ public Host GetHost() {
         AuthType = _authType,
         User = _user,
         Password = _password,
-        SavePassword = _savePassword,
         Databases = _databases,
         IsUserConnection = true,
         ServerInfo = _serverInfo
@@ -122,11 +121,6 @@ private string _password {
       set => boxPassword.Text = value;
     }
 
-    private bool _savePassword {
-      get => boxSavePassword.Checked;
-      set => boxSavePassword.Checked = value;
-    }
-
     private List<string> _databases;
     private ServerInfo _serverInfo;
 
@@ -151,28 +145,24 @@ private void BoxServerSelectionChanged(object sender, EventArgs e) {
         _authType = host.AuthType;
         _user = host.User;
         _password = host.Password;
-        _savePassword = host.SavePassword;
         _databases = host.Databases;
       }
     }
 
     private void BoxAuthTypeSelectionChanged(object sender, EventArgs e) {
-      bool sqlAuth = (_authType == AuthTypes.SQLSERVER);
+      bool sqlAuth = (_authType == AuthTypes.Sql);
       boxUser.Enabled =
-          boxPassword.Enabled =
-              boxSavePassword.Enabled = sqlAuth;
+          boxPassword.Enabled = sqlAuth;
 
       if (!sqlAuth) {
         _user = _password = null;
-        _savePassword = false;
       }
       else {
         _user = "sa";
       }
     }
 
     private void UpdateControlUsage(bool enabled) {
-
       foreach(Control c in Controls) {
         c.Enabled = enabled;
       }
@@ -182,14 +172,13 @@ private void UpdateControlUsage(bool enabled) {
 
       if (enabled) {
         boxUser.Enabled =
-            boxPassword.Enabled =
-                boxSavePassword.Enabled = (_authType == AuthTypes.SQLSERVER);
+            boxPassword.Enabled = (_authType == AuthTypes.Sql);
       }
     }
 
     private void EditValueChanged(object sender, EventArgs e) {
       buttonOK.Enabled =
-          !string.IsNullOrEmpty(_server) && !(string.IsNullOrEmpty(_user) && _authType == AuthTypes.SQLSERVER);
+          !string.IsNullOrEmpty(_server) && !(string.IsNullOrEmpty(_user) && _authType == AuthTypes.Sql);
     }
 
     #endregion

Forms/ConnectionBox.cs

@@ -459,7 +459,7 @@ private void FixIndexesFinish(object sender, RunWorkerCompletedEventArgs e) {
     #region Dialogs
 
     private void MainBox_Shown(object sender, EventArgs e) {
-      ShowConnectionBox();
+      ShowConnectionManagerBox();
     }
 
     private void ShowDatabaseBox(bool isConnectionChanged) {
@@ -483,6 +483,15 @@ private void ShowDatabaseBox(bool isConnectionChanged) {
       }
     }
 
+    private void ShowConnectionManagerBox() {
+      using (ConnectionBox form = new ConnectionBox()) {
+        if (form.ShowDialog(this) == DialogResult.OK) {
+          Host host = form.GetHost();
+          Host lastHost = Settings.Hosts[0];
+        }
+      }
+    }
+
     private void ShowConnectionBox() {
       using (ConnectionBox form = new ConnectionBox()) {
         if (form.ShowDialog(this) == DialogResult.OK) {

Forms/MainBox.cs

@@ -13,7 +13,7 @@ private static string GetConnectionString(Host host, string database) {
         InitialCatalog = database ?? "master"
       };
 
-      if (host.AuthType == AuthTypes.WINDOWS) {
+      if (host.AuthType == AuthTypes.Windows) {
         builder.IntegratedSecurity = true;
       }
       else {

Server/Connection.cs

@@ -8,31 +8,28 @@ namespace SQLIndexManager {
   public class Host {
 
     [XmlAttribute]
-    public string Server;
+    public string Server { get; set; }
 
     [XmlAttribute]
-    public AuthTypes AuthType;
+    public AuthTypes AuthType { get; set; }
 
     [XmlAttribute]
-    public string User;
+    public string User { get; set; }
 
     [XmlAttribute]
-    public string Password;
+    public string Password { get; set; }
 
     [XmlElement]
-    public List<string> Databases;
+    public List<string> Databases { get; set; }
 
     [XmlIgnore]
-    public bool IsUserConnection;
+    public bool IsUserConnection { get; set; }
 
     [XmlIgnore]
-    public bool SavePassword;
-
-    [XmlIgnore]
-    public ServerInfo ServerInfo;
+    public ServerInfo ServerInfo { get; set; }
 
     public Host() {
-      AuthType = AuthTypes.WINDOWS;
+      AuthType = AuthTypes.Windows;
       Databases = new List<string>();
     }
 

Server/Host.cs

@@ -31,7 +31,10 @@ public static Host ActiveHost {
 
     public static ServerInfo ServerInfo => _activeHost.ServerInfo;
 
-    public static List<Host> Hosts => Instance.Hosts;
+    public static List<Host> Hosts {
+      get => Instance.Hosts;
+      set => Instance.Hosts = value;
+    }
 
     public static Options Options {
       get => Instance.Options;
@@ -71,10 +74,8 @@ private static void Save() {
         using (FileStream writer = File.OpenWrite(AppInfo.SettingFileName)) {
           _current.Hosts.RemoveAll(s => !s.IsUserConnection);
           _current.Hosts.ForEach(s => {
-            if (s.AuthType == AuthTypes.SQLSERVER && s.Password != null) {
-              s.Password = s.SavePassword
-                              ? AES.Encrypt(s.Password)
-                              : null;
+            if (s.AuthType == AuthTypes.Sql && s.Password != null) {
+              s.Password = AES.Encrypt(s.Password);
             }
           });
 
@@ -98,9 +99,8 @@ private static void Load() {
             _current.Hosts.RemoveAll(_ => _.Server == null);
             _current.Hosts.ForEach(s => {
               s.IsUserConnection = true;
-              if (s.AuthType == AuthTypes.SQLSERVER && !string.IsNullOrEmpty(s.Password)) {
+              if (s.AuthType == AuthTypes.Sql && !string.IsNullOrEmpty(s.Password)) {
                 s.Password = AES.Decrypt(s.Password);
-                s.SavePassword = true;
               }
             });
 

Settings/Settings.cs

@@ -1,8 +1,8 @@
 namespace SQLIndexManager {
 
   public enum AuthTypes {
-    WINDOWS = 0,
-    SQLSERVER = 1
+    Windows = 0,
+    Sql = 1
   }
 
 }