ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-27 09:35:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespaces for code moved to separate class libraries (#263)

Browse Source 
* Create ServiceHost a service-specific class

* Renaming hosting namespace

* Rename credentials namespace

* Fix namespaces
This commit is contained in:
Karl Burtram
2017-03-02 14:41:06 -08:00
committed by GitHub
parent 1166778249
commit f00136cffb
219 changed files with 522 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.SqlTools.Credentials/Credentials/Contracts/Credential.cs
View File

@@ -3,10 +3,10 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Hosting.Protocol.Contracts;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Contracts
namespace Microsoft.SqlTools.Credentials.Contracts
{
/// <summary>
/// A Credential containing information needed to log into a resource. This is primarily

14
src/Microsoft.SqlTools.Credentials/Credentials/CredentialService.cs
View File

@@ -6,14 +6,14 @@
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.ServiceLayer.Credentials.Linux;
using Microsoft.SqlTools.ServiceLayer.Credentials.OSX;
using Microsoft.SqlTools.ServiceLayer.Credentials.Win32;
using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Credentials.Contracts;
using Microsoft.SqlTools.Credentials.Linux;
using Microsoft.SqlTools.Credentials.OSX;
using Microsoft.SqlTools.Credentials.Win32;
using Microsoft.SqlTools.Hosting.Protocol;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
/// <summary>
/// Service responsible for securing credentials in a platform-neutral manner. This provides

4
src/Microsoft.SqlTools.Credentials/Credentials/ICredentialStore.cs
View File

@@ -3,9 +3,9 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.Credentials.Contracts;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
/// <summary>
/// An <see cref="ICredentialStore"/> support securely saving and retrieving passwords

2
src/Microsoft.SqlTools.Credentials/Credentials/InteropUtils.cs
View File

@@ -7,7 +7,7 @@ using System;
using System.Runtime.InteropServices;
using System.Text;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
internal static class InteropUtils
{

4
src/Microsoft.SqlTools.Credentials/Credentials/Linux/CredentialsWrapper.cs
View File

@@ -4,9 +4,9 @@
//
using System.Collections.Generic;
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.Credentials.Contracts;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux
namespace Microsoft.SqlTools.Credentials.Linux
{
/// <summary>
/// Simplified class to enable writing a set of credentials to/from disk

8
src/Microsoft.SqlTools.Credentials/Credentials/Linux/FileTokenStorage.cs
View File

@@ -6,12 +6,12 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Credentials.Contracts;
using Microsoft.SqlTools.Hosting.Protocol;
using Microsoft.SqlTools.Utility;
using Newtonsoft.Json;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux
namespace Microsoft.SqlTools.Credentials.Linux
{
#if !WINDOWS_ONLY_BUILD

2
src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Errors.cs
View File

@@ -6,7 +6,7 @@
using System;
using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
#if !WINDOWS_ONLY_BUILD

2
src/Microsoft.SqlTools.Credentials/Credentials/Linux/Interop.Sys.cs
View File

@@ -6,7 +6,7 @@
using System;
using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
#if !WINDOWS_ONLY_BUILD

6
src/Microsoft.SqlTools.Credentials/Credentials/Linux/LinuxCredentialStore.cs
View File

@@ -9,10 +9,10 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Credentials.Contracts;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Linux
namespace Microsoft.SqlTools.Credentials.Linux
{
/// <summary>
/// Store configuration struct

2
src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.CoreFoundation.cs
View File

@@ -5,7 +5,7 @@
using System;
using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
internal static partial class Interop
{

2
src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Libraries.cs
View File

@@ -3,7 +3,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
internal static partial class Interop
{

2
src/Microsoft.SqlTools.Credentials/Credentials/OSX/Interop.Security.cs
View File

@@ -6,7 +6,7 @@
using System;
using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
internal partial class Interop
{

6
src/Microsoft.SqlTools.Credentials/Credentials/OSX/OSXCredentialStore.cs
View File

@@ -5,10 +5,10 @@
using System;
using System.Runtime.InteropServices;
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Credentials.Contracts;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.OSX
namespace Microsoft.SqlTools.Credentials.OSX
{
#if !WINDOWS_ONLY_BUILD

2
src/Microsoft.SqlTools.Credentials/Credentials/OSX/SafeCreateHandle.OSX.cs
View File

@@ -5,7 +5,7 @@
using System;
using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Credentials
namespace Microsoft.SqlTools.Credentials
{
/// <summary>

2
src/Microsoft.SqlTools.Credentials/Credentials/SecureStringHelper.cs
View File

@@ -7,7 +7,7 @@ using System;
using System.Runtime.InteropServices;
using System.Security;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials
{
internal static class SecureStringHelper
{

4
src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialSet.cs
View File

@@ -8,9 +8,9 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
public class CredentialSet: List<Win32Credential>, IDisposable
{

2
src/Microsoft.SqlTools.Credentials/Credentials/Win32/CredentialType.cs
View File

@@ -3,7 +3,7 @@
// Licensed under the Apache License 2.0
//
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
public enum CredentialType: uint
{

3
src/Microsoft.SqlTools.Credentials/Credentials/Win32/NativeMethods.cs
View File

@@ -6,9 +6,8 @@
using System;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.SqlTools.Credentials;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
internal class NativeMethods
{

2
src/Microsoft.SqlTools.Credentials/Credentials/Win32/PersistanceType.cs
View File

@@ -3,7 +3,7 @@
// Licensed under the Apache License 2.0
//
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
public enum PersistanceType : uint
{

3
src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32Credential.cs
View File

@@ -7,9 +7,8 @@ using System;
using System.Runtime.InteropServices;
using System.Security;
using System.Text;
using Microsoft.SqlTools.Credentials;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
public class Win32Credential: IDisposable
{

6
src/Microsoft.SqlTools.Credentials/Credentials/Win32/Win32CredentialStore.cs
View File

@@ -3,10 +3,10 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
using Microsoft.SqlTools.ServiceLayer.Credentials.Contracts;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Credentials.Contracts;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.ServiceLayer.Credentials.Win32
namespace Microsoft.SqlTools.Credentials.Win32
{
/// <summary>
/// Win32 implementation of the credential store

175
src/Microsoft.SqlTools.Credentials/CredentialsServiceHost.cs Normal file
View File

@@ -0,0 +1,175 @@
//
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.SqlTools.Hosting;
using Microsoft.SqlTools.Hosting.Contracts;
using Microsoft.SqlTools.Hosting.Protocol;
using Microsoft.SqlTools.Hosting.Protocol.Channel;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.Credentials
{
/// <summary>
/// SQL Tools Credentials Service request handler. Provides the entire JSON RPC
/// implementation for sending/receiving JSON requests and dispatching the requests to
/// handlers that are registered prior to startup.
/// </summary>
public sealed class CredentialsServiceHost : ServiceHostBase
{
/// <summary>
/// This timeout limits the amount of time that shutdown tasks can take to complete
/// prior to the process shutting down.
/// </summary>
private const int ShutdownTimeoutInSeconds = 120;
#region Singleton Instance Code
/// <summary>
/// Singleton instance of the service host for internal storage
/// </summary>
private static readonly Lazy<CredentialsServiceHost> instance = new Lazy<CredentialsServiceHost>(() => new CredentialsServiceHost());
/// <summary>
/// Current instance of the ServiceHost
/// </summary>
public static CredentialsServiceHost Instance
{
get { return instance.Value; }
}
/// <summary>
/// Constructs new instance of ServiceHost using the host and profile details provided.
/// Access is private to ensure only one instance exists at a time.
/// </summary>
private CredentialsServiceHost() : base(new StdioServerChannel())
{
// Initialize the shutdown activities
shutdownCallbacks = new List<ShutdownCallback>();
initializeCallbacks = new List<InitializeCallback>();
}
/// <summary>
/// Provide initialization that must occur after the service host is started
/// </summary>
public void InitializeRequestHandlers()
{
// Register the requests that this service host will handle
this.SetRequestHandler(InitializeRequest.Type, this.HandleInitializeRequest);
this.SetRequestHandler(ShutdownRequest.Type, this.HandleShutdownRequest);
this.SetRequestHandler(VersionRequest.Type, HandleVersionRequest);
}
#endregion
#region Member Variables
/// <summary>
/// Delegate definition for the host shutdown event
/// </summary>
/// <param name="shutdownParams"></param>
/// <param name="shutdownRequestContext"></param>
public delegate Task ShutdownCallback(object shutdownParams, RequestContext<object> shutdownRequestContext);
/// <summary>
/// Delegate definition for the host initialization event
/// </summary>
/// <param name="startupParams"></param>
/// <param name="requestContext"></param>
public delegate Task InitializeCallback(InitializeRequest startupParams, RequestContext<InitializeResult> requestContext);
private readonly List<ShutdownCallback> shutdownCallbacks;
private readonly List<InitializeCallback> initializeCallbacks;
private static readonly Version serviceVersion = Assembly.GetEntryAssembly().GetName().Version;
#endregion
#region Public Methods
/// <summary>
/// Adds a new callback to be called when the shutdown request is submitted
/// </summary>
/// <param name="callback">Callback to perform when a shutdown request is submitted</param>
public void RegisterShutdownTask(ShutdownCallback callback)
{
shutdownCallbacks.Add(callback);
}
/// <summary>
/// Add a new method to be called when the initialize request is submitted
/// </summary>
/// <param name="callback">Callback to perform when an initialize request is submitted</param>
public void RegisterInitializeTask(InitializeCallback callback)
{
initializeCallbacks.Add(callback);
}
#endregion
#region Request Handlers
/// <summary>
/// Handles the shutdown event for the Language Server
/// </summary>
private async Task HandleShutdownRequest(object shutdownParams, RequestContext<object> requestContext)
{
Logger.Write(LogLevel.Normal, "Service host is shutting down...");
// Call all the shutdown methods provided by the service components
Task[] shutdownTasks = shutdownCallbacks.Select(t => t(shutdownParams, requestContext)).ToArray();
TimeSpan shutdownTimeout = TimeSpan.FromSeconds(ShutdownTimeoutInSeconds);
// shut down once all tasks are completed, or after the timeout expires, whichever comes first.
await Task.WhenAny(Task.WhenAll(shutdownTasks), Task.Delay(shutdownTimeout)).ContinueWith(t => Environment.Exit(0));
}
/// <summary>
/// Handles the initialization request
/// </summary>
/// <param name="initializeParams"></param>
/// <param name="requestContext"></param>
/// <returns></returns>
internal async Task HandleInitializeRequest(InitializeRequest initializeParams, RequestContext<InitializeResult> requestContext)
{
// Call all tasks that registered on the initialize request
var initializeTasks = initializeCallbacks.Select(t => t(initializeParams, requestContext));
await Task.WhenAll(initializeTasks);
// TODO: Figure out where this needs to go to be agnostic of the language
// Send back what this server can do
await requestContext.SendResult(
new InitializeResult
{
Capabilities = new ServerCapabilities
{
DefinitionProvider = false,
ReferencesProvider = false,
DocumentFormattingProvider = false,
DocumentRangeFormattingProvider = false,
DocumentHighlightProvider = false,
HoverProvider = false
}
});
}
/// <summary>
/// Handles the version request. Sends back the server version as result.
/// </summary>
private static async Task HandleVersionRequest(
object versionRequestParams,
RequestContext<string> requestContext)
{
await requestContext.SendResult(serviceVersion.ToString());
}
#endregion
}
}

17
src/Microsoft.SqlTools.Credentials/HostLoader.cs
View File

@@ -2,14 +2,9 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Credentials;
using Microsoft.SqlTools.ServiceLayer.Extensibility;
using Microsoft.SqlTools.ServiceLayer.Hosting;
using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
using Microsoft.SqlTools.Extensibility;
using Microsoft.SqlTools.Hosting;
using Microsoft.SqlTools.Hosting.Protocol;
using Microsoft.SqlTools.ServiceLayer.SqlContext;
namespace Microsoft.SqlTools.Credentials
@@ -23,9 +18,9 @@ namespace Microsoft.SqlTools.Credentials
private static object lockObject = new object();
private static bool isLoaded;
internal static ServiceHost CreateAndStartServiceHost(SqlToolsContext sqlToolsContext)
internal static CredentialsServiceHost CreateAndStartServiceHost(SqlToolsContext sqlToolsContext)
{
ServiceHost serviceHost = ServiceHost.Instance;
CredentialsServiceHost serviceHost = CredentialsServiceHost.Instance;
lock (lockObject)
{
if (!isLoaded)
@@ -45,7 +40,7 @@ namespace Microsoft.SqlTools.Credentials
return serviceHost;
}
private static void InitializeRequestHandlersAndServices(ServiceHost serviceHost, SqlToolsContext sqlToolsContext)
private static void InitializeRequestHandlersAndServices(CredentialsServiceHost serviceHost, SqlToolsContext sqlToolsContext)
{
// Load extension provider, which currently finds all exports in current DLL. Can be changed to find based
// on directory or assembly list quite easily in the future

5
src/Microsoft.SqlTools.Credentials/Program.cs
View File

@@ -4,9 +4,8 @@
using System;
using Microsoft.SqlTools.Credentials.Utility;
using Microsoft.SqlTools.ServiceLayer.Hosting;
using Microsoft.SqlTools.ServiceLayer.SqlContext;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Microsoft.SqlTools.Utility;
namespace Microsoft.SqlTools.Credentials
{
@@ -39,7 +38,7 @@ namespace Microsoft.SqlTools.Credentials
version: new Version(1, 0));
SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails);
ServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext);
CredentialsServiceHost serviceHost = HostLoader.CreateAndStartServiceHost(sqlToolsContext);
serviceHost.WaitForExit();
}