Feature/launcher

QS.Cloud.Client/BasicAuthInfoProvider.cs

@@ -9,13 +9,17 @@ public BasicAuthInfoProvider(string userName, string password)
 
 		public string UserName { get; }
 
-		public string Password { get; }
+		public string Password { get; private set; }
+
+		public void UpdatePassword(string newPassword) => Password = newPassword;
 	}
 
 	public interface IBasicAuthInfoProvider
 	{
 		string UserName { get; }
 
 		string Password { get; }
+
+		void UpdatePassword(string newPassword);
 	}
 }

QS.Cloud.Client/Clients/Base/CloudClientByBasicAuth.cs

@@ -4,19 +4,44 @@
 
 namespace QS.Cloud.Client
 {
-	public class CloudClientByBasicAuth : CloudClientServiceBase
-	{
+	public class CloudClientByBasicAuth : CloudClientServiceBase {
+		private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
+		/// <summary>Столько ждём соединения в CanConnect - это проверка доступности, а не сама операция</summary>
+		private const int ConnectTimeoutSeconds = 5;
+
+		private readonly IBasicAuthInfoProvider authInfo;
+
 		public CloudClientByBasicAuth(IBasicAuthInfoProvider basicAuthInfoProvider, string serviceAddress, int servicePort)
-			: base(serviceAddress, servicePort)
-		{
-			headers = new Metadata
-			{ {
-				"Authorization",
-				$"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{basicAuthInfoProvider.UserName}:{basicAuthInfoProvider.Password}"))}"
-			} };
-
+			: base(serviceAddress, servicePort) {
+			authInfo = basicAuthInfoProvider ?? throw new ArgumentNullException(nameof(basicAuthInfoProvider));
+			headers = BuildHeaders();
 		}
 
-		public override bool CanConnect => throw new NotImplementedException();
+		private Metadata BuildHeaders() => new Metadata
+		{ {
+			"Authorization",
+			$"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{authInfo.UserName}:{authInfo.Password}"))}"
+		} };
+
+		public virtual void UpdatePassword(string newPassword) {
+			authInfo.UpdatePassword(newPassword);
+			headers = BuildHeaders();
+		}
+
+		public override bool CanConnect { get {
+				try {
+					Channel.ConnectAsync(DateTime.UtcNow.AddSeconds(ConnectTimeoutSeconds))
+						.GetAwaiter().GetResult();
+					return true;
+				}
+				catch(Exception ex) {
+					// Недоступное облако здесь - штатный ответ «нельзя», операцию не валим.
+					// Но причину молча терять нельзя: без неё непонятно, почему пропали кнопки.
+					logger.Debug(ex, "Нет соединения с облаком QS");
+					return false;
+				}
+			}
+		}
 	}
 }

QS.Cloud.Client/Clients/Base/CloudClientServiceBase.cs

@@ -5,6 +5,8 @@ namespace QS.Cloud.Client
 {
 	public abstract class CloudClientServiceBase : IDisposable
 	{
+		private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
 		private readonly string serviceAddress;
 		private readonly int servicePort;
 		private readonly ChannelCredentials credentials;
@@ -39,10 +41,20 @@ protected Channel Channel
 
 		public abstract bool CanConnect { get; }
 
-		public virtual async void Dispose()
+		public virtual void Dispose()
 		{
-			if(channel != null)
-				await channel.ShutdownAsync();
+			var opened = channel;
+			channel = null;
+			if(opened == null)
+				return;
+
+			try {
+				opened.ShutdownAsync().GetAwaiter().GetResult();
+			}
+			catch(Exception ex) {
+				// исключение из Dispose подменяет собой настоящую причину, по которой закрывались.
+				logger.Debug(ex, "Не удалось закрыть канал к облаку QS");
+			}
 		}
 	}
 }

QS.Cloud.Client/Clients/DatabaseManagementCloudClient.cs

@@ -0,0 +1,38 @@
+using Grpc.Core;
+using QS.Cloud.Core;
+using QS.Project.Versioning;
+using System.Threading;
+
+namespace QS.Cloud.Client.Clients {
+	public class DatabaseManagementCloudClient : CloudClientByBasicAuth {
+		private readonly uint ProductCode;
+		public DatabaseManagementCloudClient(IBasicAuthInfoProvider basicAuthInfoProvider, uint productCode)
+						: base(basicAuthInfoProvider, "core.cloud.qsolution.ru", 443)
+		{
+			ProductCode = productCode;
+		}
+		public virtual ClearDatabaseResponse ClearDatabase(int baseId) {
+			var client = new DatabaseManagement.DatabaseManagementClient(Channel);
+			var request = new ClearDatabaseRequest { BaseId = baseId, ProductId = ProductCode };
+			return client.ClearDatabase(request, headers);
+		}
+
+		public virtual CheckDatabaseExistsResponse CheckDatabaseExists(string dbName) {
+			var client = new DatabaseManagement.DatabaseManagementClient(Channel);
+			var request = new CheckDatabaseExistsRequest { Name = dbName, ProductId = ProductCode };
+			return client.CheckDatabaseExists(request, headers);
+		}
+
+		public virtual CreateDatabaseResponse CreateDatabase(string dbName, string dbTitle) {
+			var client = new DatabaseManagement.DatabaseManagementClient(Channel);
+			var request = new CreateDatabaseRequest { Name = dbName, Title = dbTitle, ProductId = ProductCode };
+			return client.CreateDatabase(request, headers);
+		}
+
+		public virtual DropDatabaseResponse DropDatabase(int baseId) {
+			var client = new DatabaseManagement.DatabaseManagementClient(Channel);
+			var request = new DropDatabaseRequest { BaseId = baseId, ProductId = ProductCode };
+			return client.DropDatabase(request, headers);
+		}
+	}
+}

QS.Cloud.Client/Clients/LoginManagementCloudClient.cs

@@ -9,14 +9,14 @@ public class LoginManagementCloudClient : CloudClientByBasicAuth
 		public LoginManagementCloudClient(IBasicAuthInfoProvider basicAuthInfoProvider)
                         : base(basicAuthInfoProvider, "core.cloud.qsolution.ru", 443) { }
 
-		public StartResponse Start(string launcherVersion) {
+		public virtual StartResponse Start(string launcherVersion) {
 			var client = new LoginManagement.LoginManagementClient(Channel);
 			var request = new StartRequest { LauncherVersion = launcherVersion };
 			var response = client.Start(request, headers);
 			return response;
 		}
 
-		public StartSessionResponse StartSession(int baseId)
+		public virtual StartSessionResponse StartSession(int baseId)
 		{
 			var client = new LoginManagement.LoginManagementClient(Channel);
 
@@ -29,7 +29,7 @@ public StartSessionResponse StartSession(int baseId)
 			return response;
 		}
 
-		public List<BaseInfo> GetBasesForUser(uint productId)
+		public virtual List<BaseInfo> GetBasesForUser(uint productId)
 		{
 			var client = new LoginManagement.LoginManagementClient(Channel);
 			var request = new GetBasesForUserRequest();
@@ -38,7 +38,7 @@ public List<BaseInfo> GetBasesForUser(uint productId)
 			return response.Bases.ToList();
 		}
 
-		public ChangePasswordResponse ChangePassword(string newPassword) {
+		public virtual ChangePasswordResponse ChangePassword(string newPassword) {
 			var client = new LoginManagement.LoginManagementClient(Channel);
 			var request = new ChangePasswordRequest { NewPassword = newPassword };
 			var response = client.ChangePassword(request, headers);

QS.Cloud.Client/Clients/UserManagementCloudClient.cs

@@ -1,63 +1,81 @@
+using System.Collections.Generic;
+using System.Linq;
 using QS.Cloud.Core;
 
 namespace QS.Cloud.Client
 {
-	public class UserManagementCloudClient : CloudClientBySession
+	public class UserManagementCloudClient : CloudClientByBasicAuth
 	{
-		public UserManagementCloudClient(ISessionInfoProvider sessionInfoProvider)
-                        : base(sessionInfoProvider, "core.cloud.qsolution.ru", 443) { }
+		public UserManagementCloudClient(IBasicAuthInfoProvider basicAuthInfoProvider)
+			: base(basicAuthInfoProvider, "core.cloud.qsolution.ru", 443) { }
 
-
-		public CreateUserResponse CreateUser(string login, string userName, string email, string password)
+		public virtual List<UserInfo> GetUsers()
 		{
 			var client = new UserManagement.UserManagementClient(Channel);
+			var response = client.GetUsers(new GetUsersRequest(), headers);
+			return response.Users.ToList();
+		}
 
-			var request = new CreateUserRequest
-			{
-				Login = login, Name = userName, Email = email, Password = password
+		public virtual CreateUserResponse CreateUser(UserInfo user, string password)
+		{
+			var client = new UserManagement.UserManagementClient(Channel);
+			var request = new CreateUserRequest {
+				Login = user.Login,
+				Name = user.Name ?? "",
+				Email = user.Email ?? "",
+				Password = password ?? "",
+				Phone = user.Phone ?? "",
+				Post = user.Post ?? "",
+				Comment = user.Comment ?? "",
+				IsAccountAdmin = user.IsAccountAdmin
 			};
-
-			var response = client.CreateUser(request, headers);
-
-			return response;
+			return client.CreateUser(request, headers);
 		}
 
-		public DeleteUserResponse DeleteUser(string login)
+		public virtual UpdateUserResponse UpdateUser(UserInfo user, string newPassword)
 		{
 			var client = new UserManagement.UserManagementClient(Channel);
+			var request = new UpdateUserRequest {
+				Login = user.Login,
+				Name = user.Name ?? "",
+				Email = user.Email ?? "",
+				Phone = user.Phone ?? "",
+				Post = user.Post ?? "",
+				Comment = user.Comment ?? "",
+				Disabled = user.Disabled,
+				IsAccountAdmin = user.IsAccountAdmin,
+				NewPassword = newPassword ?? ""
+			};
+			return client.UpdateUser(request, headers);
+		}
 
+		public virtual DeleteUserResponse DeleteUser(string login)
+		{
+			var client = new UserManagement.UserManagementClient(Channel);
 			var request = new DeleteUserRequest { User = login };
-			var response = client.DeleteUser(request, headers);
-
-			return response;
+			return client.DeleteUser(request, headers);
 		}
 
-		// strange, but protobuf has the same signature
-		public UpdateUserResponse UpdateUser()
+		public virtual List<BaseAccessInfo> GetUserBaseAccess(string login, uint productId)
 		{
 			var client = new UserManagement.UserManagementClient(Channel);
-
-			var request = new UpdateUserRequest();
-			var response = client.UpdateUser(request, headers);
-
-			return response;
+			var request = new GetUserBaseAccessRequest { User = login, ProductId = productId };
+			var response = client.GetUserBaseAccess(request, headers);
+			return response.Bases.ToList();
 		}
 
-		public bool ChangeBaseAccess(string user, int baseId, bool grant, bool admin)
+		public virtual ChangeBaseAccessResponse ChangeBaseAccess(string user, int baseId, bool grant, bool admin, bool readOnly, uint productId)
 		{
 			var client = new UserManagement.UserManagementClient(Channel);
-
-			var request = new ChangeBaseAccessRequest
-			{
+			var request = new ChangeBaseAccessRequest {
 				User = user,
 				BaseId = baseId,
 				Grant = grant,
-				Admin = admin
+				Admin = admin,
+				ReadOnly = readOnly,
+				ProductId = productId
 			};
-
-			var response = client.ChangeBaseAccess(request);
-
-			return response.Success;
+			return client.ChangeBaseAccess(request, headers);
 		}
 	}
 }

QS.Cloud.Client/Database/CloudDbSession.cs

@@ -0,0 +1,53 @@
+using System;
+using MySqlConnector;
+using QS.Cloud.Client.Clients;
+using QS.Cloud.Core;
+
+namespace QS.Cloud.Client.Database {
+	/// <summary>
+	/// Временное подключение к облачной базе
+	/// </summary>
+	public sealed class CloudDbSession : IDisposable {
+		private readonly AliveCloudClient sessionLife;
+
+		public bool Success { get; }
+		public string Description { get; }
+		public bool IsAdmin { get; }
+		public BaseConnection Db { get; }
+		public MySqlConnectionStringBuilder ConnectionStringBuilder { get; }
+
+		private CloudDbSession(StartSessionResponse session, AliveCloudClient sessionLife, MySqlConnectionStringBuilder connectionStringBuilder) {
+			Success = session.Success;
+			Description = session.Description;
+			IsAdmin = session.IsAdmin;
+			Db = session.Db;
+			this.sessionLife = sessionLife;
+			ConnectionStringBuilder = connectionStringBuilder;
+		}
+
+		/// <summary>
+		/// Открывает сессию к базе. При успехе запускает keep-alive и собирает строку подключения;
+		/// при отказе возвращает сессию с <see cref="Success"/> = false
+		/// </summary>
+		public static CloudDbSession Open(LoginManagementCloudClient loginClient, int baseId) {
+			var session = loginClient.StartSession(baseId);
+			if(!session.Success)
+				return new CloudDbSession(session, null, null);
+
+			var sessionLife = new AliveCloudClient(new SessionInfoProvider(session.SessionId));
+			sessionLife.KeepAlive();
+
+			var builder = new MySqlConnectionStringBuilder {
+				Server = session.Db.Server,
+				Port = session.Db.Port,
+				UserID = session.Db.Login,
+				Password = session.Db.Password,
+				Database = session.Db.BaseName,
+				AllowUserVariables = true
+			};
+			return new CloudDbSession(session, sessionLife, builder);
+		}
+
+		public void Dispose() => sessionLife?.Dispose();
+	}
+}