From b3ae394fa6450084f0138d243cf641fdb745a4ba Mon Sep 17 00:00:00 2001
From: Hai Cao <hacao@microsoft.com>
Date: Fri, 17 Feb 2023 14:24:34 -0800
Subject: [PATCH] Login handlers: address comments and fix dispose (#1870)

---
 .../Security/Contracts/LoginRequest.cs                | 11 +++++------
 .../Security/LoginData.cs                             |  6 +++---
 .../Security/SecurityService.cs                       |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/LoginRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/LoginRequest.cs
index 5f5d168c..6f93f4e6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/LoginRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/LoginRequest.cs
@@ -6,14 +6,13 @@
 #nullable disable
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
 {    
     /// <summary>
     /// Create Login parameters
     /// </summary>
-    public class CreateLoginParams : GeneralRequestDetails
+    public class CreateLoginParams
     {
         public string ContextId { get; set; }
 
@@ -36,7 +35,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
     /// <summary>
     /// Delete Login params
     /// </summary>
-    public class DeleteLoginParams : GeneralRequestDetails
+    public class DeleteLoginParams
     {
         public string ConnectionUri { get; set; }
 
@@ -59,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
     /// <summary>
     /// Update Login params
     /// </summary>
-    public class UpdateLoginParams : GeneralRequestDetails
+    public class UpdateLoginParams
     {
         public string ContextId { get; set; }
 
@@ -83,7 +82,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
     /// <summary>
     /// Update Login params
     /// </summary>
-    public class DisposeLoginViewRequestParams : GeneralRequestDetails
+    public class DisposeLoginViewRequestParams
     {
         public string ContextId { get; set; }
     }
@@ -105,7 +104,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
     /// Initialize Login View Request params
     /// </summary>
 
-    public class InitializeLoginViewRequestParams : GeneralRequestDetails
+    public class InitializeLoginViewRequestParams
     {
         public string ConnectionUri { get; set; }
         public string ContextId { get; set; }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/LoginData.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/LoginData.cs
index 7334ddd5..d19e9896 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/LoginData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/LoginData.cs
@@ -914,7 +914,7 @@ INNER JOIN sys.sql_logins AS sql_logins
             private Microsoft.SqlServer.Management.Smo.Server server;
             private static string       defaultLanguageDisplay;
             private bool                windowsAuthSupported = true;
-            private bool                aADAuthSupported = false;
+            private bool                aadAuthSupported = false;
 
             private StringCollection credentials = null;
             #endregion
@@ -1067,10 +1067,10 @@ INNER JOIN sys.sql_logins AS sql_logins
                 {
                     if (this.server.ServerType == DatabaseEngineType.SqlAzureDatabase)
                     {
-                        this.aADAuthSupported = true;
+                        this.aadAuthSupported = true;
                     }
 
-                    return this.aADAuthSupported;
+                    return this.aadAuthSupported;
                 }
             }
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
index 1b26a266..3527f1da 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
@@ -251,6 +251,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Security
             CDataContainer dataContainer = CDataContainer.CreateDataContainer(connInfo, databaseExists: true);
             LoginViewInfo loginViewInfo = new LoginViewInfo();
 
+            // TODO cache databases and languages
             string[] databases = new string[dataContainer.Server.Databases.Count];
             for (int i = 0; i < dataContainer.Server.Databases.Count; i++)
             {
@@ -327,7 +328,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Security
 
         internal async Task HandleDisposeLoginViewRequest(DisposeLoginViewRequestParams parameters, RequestContext<object> requestContext)
         {
-            contextIdToConnectionUriMap.Remove(parameters.ContextId);
             await requestContext.SendResult(new object());
         }
         #endregion