From 33cfb257b184d074c635f7d58b003c6da451b618 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 28 May 2021 11:01:59 +0200
Subject: [PATCH] use new Encryption methods

---
 GUIs.Monitor/frmMonitor.vb | 7 ++++---
 GUIs.ZooFlow/ClassInit.vb  | 8 ++------
 SQLConfig/frmSQLConfig.vb  | 7 ++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb
index 36ea69ae..b882ce44 100644
--- a/GUIs.Monitor/frmMonitor.vb
+++ b/GUIs.Monitor/frmMonitor.vb
@@ -74,7 +74,6 @@ Public Class frmMonitor
         Try
             LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor")
             ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.UserAppDataPath, Application.StartupPath)
-            ConfigManager.DecryptConnectionStrings()
             Init(LogConfig)
 
             If ConfigManager.Config.ConnectionString = String.Empty Then
@@ -82,6 +81,7 @@ Public Class frmMonitor
                 If oSQLConfig.ShowDialog() = DialogResult.OK Then
                     ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
                     ConfigManager.Save()
+                    Application.Restart()
                 Else
                     ShowErrorMessage("No Database configured. Application will close!")
                     Application.Exit()
@@ -89,7 +89,8 @@ Public Class frmMonitor
                 End If
             End If
 
-            Database = New MSSQLServer(LogConfig, ConfigManager.Config.ConnectionString)
+            Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
+            Database = New MSSQLServer(LogConfig, oConnectionString)
             GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4})
             GridBuilder.
                 WithDefaults().
@@ -133,7 +134,7 @@ Public Class frmMonitor
 
     Private Function LoadGDPicture() As String
         Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
-        Return Database.GetScalarValue(oSQL).ToString()
+        Return Database.GetScalarValue(oSQL)
     End Function
 
     Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb
index 51e3b3c6..906d1a7f 100644
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -116,12 +116,8 @@ Public Class ClassInit
     End Sub
 
     Private Sub CheckConnectivity(MyApplication As My.MyApplication)
-        Dim oCrypt As New EncryptionLegacy()
-        Dim oBuilder = My.SystemConfig.GetConnectionStringBuilder(My.SystemConfig.ConnectionString)
-        oBuilder.Password = oCrypt.DecryptData(oBuilder.Password)
-        Dim oDecryptedConnectionString = oBuilder.ToString
-
-        My.Database = New MSSQLServer(My.LogConfig, oDecryptedConnectionString)
+        Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString)
+        My.Database = New MSSQLServer(My.LogConfig, oConnectionString)
 
         If My.Database.DBInitialized = False Then
             _Logger.Warn("Could not initialize DD_ECM-Database!")
diff --git a/SQLConfig/frmSQLConfig.vb b/SQLConfig/frmSQLConfig.vb
index 297dc446..8a4e98c7 100644
--- a/SQLConfig/frmSQLConfig.vb
+++ b/SQLConfig/frmSQLConfig.vb
@@ -129,11 +129,8 @@ Public Class frmSQLConfig
             Dim oResult = MessageBox.Show(STRING_CONNECTION_SUCCESSFUL, Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
 
             If oResult = DialogResult.Yes Then
-                Dim oCrypt As New EncryptionLegacy()
-                Dim oEncryptedPassword = oCrypt.EncryptData(txtPassword.Text)
-                Dim oEncryptedConnectionString = $"Server={txtServerName.Text};Database={cmbDatabase.Text};User Id={txtUserName.Text};Password={oEncryptedPassword};"
-
-                ConnectionString = oEncryptedConnectionString
+                Dim oPlainTextConnectionString = $"Server={txtServerName.Text};Database={cmbDatabase.Text};User Id={txtUserName.Text};Password={txtPassword.Text};"
+                ConnectionString = MSSQLServer.EncryptConnectionString(oPlainTextConnectionString)
                 Close()
             End If
         Catch ex As Exception