diff --git a/Moonlight/App/ApiClients/CloudPanel/Requests/AddDatabase.cs b/Moonlight/App/ApiClients/CloudPanel/Requests/AddDatabase.cs new file mode 100644 index 00000000..26d8d4bb --- /dev/null +++ b/Moonlight/App/ApiClients/CloudPanel/Requests/AddDatabase.cs @@ -0,0 +1,18 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.ApiClients.CloudPanel.Requests; + +public class AddDatabase +{ + [JsonProperty("domainName")] + public string DomainName { get; set; } + + [JsonProperty("databaseName")] + public string DatabaseName { get; set; } + + [JsonProperty("databaseUserName")] + public string DatabaseUserName { get; set; } + + [JsonProperty("databaseUserPassword")] + public string DatabaseUserPassword { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/ApiClients/CloudPanel/Requests/InstallLetsEncrypt.cs b/Moonlight/App/ApiClients/CloudPanel/Requests/InstallLetsEncrypt.cs new file mode 100644 index 00000000..e10068fd --- /dev/null +++ b/Moonlight/App/ApiClients/CloudPanel/Requests/InstallLetsEncrypt.cs @@ -0,0 +1,9 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.ApiClients.CloudPanel.Requests; + +public class InstallLetsEncrypt +{ + [JsonProperty("domainName")] + public string DomainName { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Forms/DomainOrderDataModel.cs b/Moonlight/App/Models/Forms/DomainOrderDataModel.cs index c49dd8e3..b3b8a93f 100644 --- a/Moonlight/App/Models/Forms/DomainOrderDataModel.cs +++ b/Moonlight/App/Models/Forms/DomainOrderDataModel.cs @@ -7,7 +7,7 @@ public class DomainOrderDataModel { [Required(ErrorMessage = "You need to specify a name")] [MaxLength(32, ErrorMessage = "The max lenght for the name is 32 characters")] - [RegularExpression(@"^[a-z]+$", ErrorMessage = "The name should only consist of lower case characters")] + [RegularExpression(@"^[a-z0-9]+$", ErrorMessage = "The name should only consist of lower case characters or numbers")] public string Name { get; set; } = ""; [Required(ErrorMessage = "You need to specify a shared domain")] diff --git a/Moonlight/App/Services/SmartDeployService.cs b/Moonlight/App/Services/SmartDeployService.cs index e5e69f87..38d013a0 100644 --- a/Moonlight/App/Services/SmartDeployService.cs +++ b/Moonlight/App/Services/SmartDeployService.cs @@ -6,18 +6,20 @@ namespace Moonlight.App.Services; public class SmartDeployService { private readonly NodeRepository NodeRepository; - private readonly PleskServerRepository PleskServerRepository; + private readonly Repository CloudPanelRepository; private readonly WebSpaceService WebSpaceService; private readonly NodeService NodeService; public SmartDeployService( NodeRepository nodeRepository, - NodeService nodeService, PleskServerRepository pleskServerRepository, WebSpaceService webSpaceService) + NodeService nodeService, + WebSpaceService webSpaceService, + Repository cloudPanelRepository) { NodeRepository = nodeRepository; NodeService = nodeService; - PleskServerRepository = pleskServerRepository; WebSpaceService = webSpaceService; + CloudPanelRepository = cloudPanelRepository; } public async Task GetNode() @@ -38,13 +40,14 @@ public class SmartDeployService return data.MaxBy(x => x.Value).Key; } - public async Task GetPleskServer() + public async Task GetCloudPanel() { - var result = new List(); + var result = new List(); - foreach (var pleskServer in PleskServerRepository.Get().ToArray()) + foreach (var cloudPanel in CloudPanelRepository.Get().ToArray()) { - result.Add(pleskServer); + if (await WebSpaceService.IsHostUp(cloudPanel)) + result.Add(cloudPanel); } return result.FirstOrDefault(); diff --git a/Moonlight/App/Services/WebSpaceService.cs b/Moonlight/App/Services/WebSpaceService.cs index 549c44dc..91a3d718 100644 --- a/Moonlight/App/Services/WebSpaceService.cs +++ b/Moonlight/App/Services/WebSpaceService.cs @@ -17,13 +17,16 @@ public class WebSpaceService { private readonly Repository CloudPanelRepository; private readonly Repository WebSpaceRepository; + private readonly Repository DatabaseRepository; + private readonly CloudPanelApiHelper CloudPanelApiHelper; - public WebSpaceService(Repository cloudPanelRepository, Repository webSpaceRepository, CloudPanelApiHelper cloudPanelApiHelper) + public WebSpaceService(Repository cloudPanelRepository, Repository webSpaceRepository, CloudPanelApiHelper cloudPanelApiHelper, Repository databaseRepository) { CloudPanelRepository = cloudPanelRepository; WebSpaceRepository = webSpaceRepository; CloudPanelApiHelper = cloudPanelApiHelper; + DatabaseRepository = databaseRepository; } public async Task Create(string domain, User owner, CloudPanel? ps = null) @@ -83,14 +86,16 @@ public class WebSpaceService { try { - //var res = await PleskApiHelper.Get(pleskServer, "server"); + await CloudPanelApiHelper.Post(cloudPanel, "", null); return true; - - //if (res != null) - // return true; } - catch (Exception e) + catch (CloudPanelException e) + { + if (e.StatusCode == 404) + return true; + } + catch (Exception) { // ignored } @@ -105,40 +110,60 @@ public class WebSpaceService return await IsHostUp(webSpace.CloudPanel); } - #region SSL - public async Task GetSslCertificates(WebSpace w) + public async Task IssueSslCertificate(WebSpace w) { - var certs = new List(); - return certs.ToArray(); - } + var webspace = EnsureData(w); - public async Task CreateSslCertificate(WebSpace w) - { - + await CloudPanelApiHelper.Post(webspace.CloudPanel, "letsencrypt/install/certificate", new InstallLetsEncrypt() + { + DomainName = webspace.Domain + }); } - public async Task DeleteSslCertificate(WebSpace w, string name) - { - - } - - #endregion - #region Databases - public async Task GetDatabases(WebSpace w) + public Task GetDatabases(WebSpace w) { - return Array.Empty(); + return Task.FromResult(WebSpaceRepository + .Get() + .Include(x => x.Databases) + .First(x => x.Id == w.Id) + .Databases.ToArray()); } public async Task CreateDatabase(WebSpace w, string name, string password) { + if (DatabaseRepository.Get().Any(x => x.UserName == name)) + throw new DisplayException("A database with this name does already exist"); + + var webspace = EnsureData(w); + + var database = new MySqlDatabase() + { + UserName = name, + Password = password + }; + + await CloudPanelApiHelper.Post(webspace.CloudPanel, "db", new AddDatabase() + { + DomainName = webspace.Domain, + DatabaseName = database.UserName, + DatabaseUserName = database.UserName, + DatabaseUserPassword = database.Password + }); + webspace.Databases.Add(database); + WebSpaceRepository.Update(webspace); } - public async Task DeleteDatabase(WebSpace w, Models.Plesk.Resources.Database database) + public async Task DeleteDatabase(WebSpace w, MySqlDatabase database) { + var webspace = EnsureData(w); + await CloudPanelApiHelper.Delete(webspace.CloudPanel, $"db/{database.UserName}", null); + + webspace.Databases.Remove(database); + WebSpaceRepository.Update(webspace); } #endregion diff --git a/Moonlight/Shared/Components/Partials/Navbar.razor b/Moonlight/Shared/Components/Partials/Navbar.razor index f0f01e56..79fe3f9d 100644 --- a/Moonlight/Shared/Components/Partials/Navbar.razor +++ b/Moonlight/Shared/Components/Partials/Navbar.razor @@ -9,33 +9,36 @@ @inject NavigationManager NavigationManager @inject CookieService CookieService -
-
-
- - +@if (User != null) +{ +
+
+
+ + +
-
+}
diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor index c7e6c692..9926d16e 100644 --- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor +++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor @@ -45,11 +45,11 @@ else
- + - Websites + Webspaces
@@ -148,11 +148,11 @@ else
- + - Websites + Webspaces
diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor index ab158cd8..aa961870 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor @@ -1,8 +1,10 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Services +@using Moonlight.App.Services.Interop @inject WebSpaceService WebSpaceService @inject SmartTranslateService SmartTranslateService +@inject AlertService AlertService
@@ -26,54 +28,10 @@ + OnClick="IssueCertificate">
-
- @if (Certs.Any()) - { - - - - - - - - - - @foreach (var cert in Certs) - { - - - - - - } - -
-
- - - -
- 		- @(cert) - - - -
- } - else - { -
- No SSL certificates found -
- } -
@@ -87,25 +45,16 @@ [CascadingParameter] public WebSpace CurrentWebSpace { get; set; } - private string[] Certs; - private LazyLoader LazyLoader; - private async Task Load(LazyLoader lazyLoader) + private Task Load(LazyLoader lazyLoader) { - await lazyLoader.SetText("Loading certificates"); - Certs = await WebSpaceService.GetSslCertificates(CurrentWebSpace); + return Task.CompletedTask; } - private async Task CreateCertificate() + private async Task IssueCertificate() { - await WebSpaceService.CreateSslCertificate(CurrentWebSpace); - await LazyLoader.Reload(); - } - - private async Task DeleteCertificate(string name) - { - await WebSpaceService.DeleteSslCertificate(CurrentWebSpace, name); - await LazyLoader.Reload(); + await WebSpaceService.IssueSslCertificate(CurrentWebSpace); + await AlertService.Success(SmartTranslateService.Translate("Lets Encrypt certificate successfully issued")); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor index 5b83af5c..9645f2f1 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor @@ -9,7 +9,7 @@
- +
@@ -34,7 +34,7 @@
- @(database.Name) - @(database.Type.ToUpper().Replace("MYSQL", "MySQL")) + @(database.UserName) - @(database.UserName.ToUpper().Replace("MYSQL", "MySQL"))
@@ -46,7 +46,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -66,7 +66,17 @@ - + + + + + + + + + @@ -76,7 +86,7 @@ - + @@ -104,9 +114,7 @@ public WebSpace CurrentWebSpace { get; set; } private LazyLoader LazyLoader; - private Database[] Databases; - private DatabaseServer DatabaseServer; - private string Host; + private MySqlDatabase[] Databases; private DatabaseDataModel Model = new(); @@ -122,7 +130,7 @@ await LazyLoader.Reload(); } - private async Task DeleteDatabase(Database database) + private async Task DeleteDatabase(MySqlDatabase database) { await WebSpaceService.DeleteDatabase(CurrentWebSpace, database); await LazyLoader.Reload(); diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor index 1d28f88c..e615e10e 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor @@ -34,8 +34,8 @@
  • - - Ftp + + Sftp
  • diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceFtp.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceSftp.razor similarity index 92% rename from Moonlight/Shared/Components/WebsiteControl/WebSpaceFtp.razor rename to Moonlight/Shared/Components/WebsiteControl/WebSpaceSftp.razor index ffa1de43..9ca94d13 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceFtp.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceSftp.razor @@ -8,7 +8,7 @@
    @@ -18,7 +18,7 @@
    @@ -28,7 +28,7 @@
    @@ -38,7 +38,7 @@
    diff --git a/Moonlight/Shared/Views/Admin/Index.razor b/Moonlight/Shared/Views/Admin/Index.razor index 8263e25f..b340e241 100644 --- a/Moonlight/Shared/Views/Admin/Index.razor +++ b/Moonlight/Shared/Views/Admin/Index.razor @@ -2,17 +2,18 @@ @using Moonlight.App.Repositories.Servers @using Moonlight.App.Repositories @using Moonlight.App.Repositories.Domains +@using Moonlight.App.Database.Entities @inject ServerRepository ServerRepository @inject UserRepository UserRepository -@inject WebsiteRepository WebsiteRepository +@inject Repository WebSpaceRepository @inject DomainRepository DomainRepository
    - +
    @@ -38,10 +39,10 @@
    - Websites + Webspaces
    - @(WebsiteCount) + @(WebSpaceCount)
    @@ -54,7 +55,7 @@
    - +
    @@ -75,7 +76,7 @@
    - +
    @@ -104,14 +105,14 @@ private int ServerCount = 0; private int UserCount = 0; private int DomainCount = 0; - private int WebsiteCount = 0; + private int WebSpaceCount = 0; private Task Load(LazyLoader lazyLoader) { ServerCount = ServerRepository.Get().Count(); UserCount = UserRepository.Get().Count(); DomainCount = DomainRepository.Get().Count(); - WebsiteCount = WebsiteRepository.Get().Count(); + WebSpaceCount = WebSpaceRepository.Get().Count(); return Task.CompletedTask; } diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Shared/Views/Index.razor index 33385548..47bddf8c 100644 --- a/Moonlight/Shared/Views/Index.razor +++ b/Moonlight/Shared/Views/Index.razor @@ -82,12 +82,12 @@
    - +
    - Websites + Webspaces
    @(WebsiteCount) diff --git a/Moonlight/Shared/Views/Webspace/Index.razor b/Moonlight/Shared/Views/Webspace/Index.razor index acb41c0f..3e654e1f 100644 --- a/Moonlight/Shared/Views/Webspace/Index.razor +++ b/Moonlight/Shared/Views/Webspace/Index.razor @@ -8,7 +8,6 @@ @inject Repository WebSpaceRepository @inject WebSpaceService WebSpaceService -@inject ToastService ToastService @if (CurrentWebspace == null) @@ -40,7 +39,7 @@ case "files": index = 1; break; - case "ftp": + case "sftp": index = 2; break; case "databases": @@ -58,8 +57,8 @@ case "files": break; - case "ftp": - + case "sftp": + break; case "databases": diff --git a/Moonlight/Shared/Views/Webspaces/Create.razor b/Moonlight/Shared/Views/Webspaces/Create.razor index 04051606..b842fc18 100644 --- a/Moonlight/Shared/Views/Webspaces/Create.razor +++ b/Moonlight/Shared/Views/Webspaces/Create.razor @@ -7,23 +7,23 @@ @inject SubscriptionService SubscriptionService @inject WebSpaceService WebSpaceService -@inject WebsiteRepository WebsiteRepository +@inject Repository WebSpaceRepository @inject SmartDeployService SmartDeployService @inject SmartTranslateService SmartTranslateService @inject NavigationManager NavigationManager - @if (PleskServer == null) + @if (CloudPanel == null) {
    Not found image

    - No plesk server found + No web host found

    - No plesk server found to deploy to + No web host found to deploy to

    @@ -37,7 +37,7 @@

    - Website details + Webspace details

    @@ -45,9 +45,9 @@
    -
    @(PleskServer.Name)
    +
    @(CloudPanel.Name)
    @if (AllowOrder) { @@ -67,7 +67,7 @@

    - Configure your website + Configure your webspaces

    @@ -90,7 +90,7 @@ {
    - You reached the maximum amount of websites in your subscription: @(Subscription == null ? SmartTranslateService.Translate("Default") : Subscription.Name) + You reached the maximum amount of webspaces in your subscription: @(Subscription == null ? SmartTranslateService.Translate("Default") : Subscription.Name)
    } @@ -108,7 +108,7 @@ public User User { get; set; } private Subscription? Subscription; - private PleskServer? PleskServer; + private CloudPanel? CloudPanel; private bool AllowOrder = false; private WebsiteOrderDataModel Model = new(); @@ -121,10 +121,10 @@ await lazyLoader.SetText(SmartTranslateService.Translate("Loading your subscription")); Subscription = await SubscriptionService.GetCurrent(); - await lazyLoader.SetText(SmartTranslateService.Translate("Searching for deploy plesk server")); - PleskServer = await SmartDeployService.GetPleskServer(); + await lazyLoader.SetText(SmartTranslateService.Translate("Searching for deploy web host")); + CloudPanel = await SmartDeployService.GetCloudPanel(); - AllowOrder = WebsiteRepository + AllowOrder = WebSpaceRepository .Get() .Include(x => x.Owner) .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit("websites")).Amount; @@ -132,14 +132,14 @@ private async Task OnValidSubmit() { - if (WebsiteRepository + if (WebSpaceRepository .Get() .Include(x => x.Owner) .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit("websites")).Amount) { - //var website = await WebsiteService.Create(Model.BaseDomain, User, PleskServer); + var webSpace = await WebSpaceService.Create(Model.BaseDomain, User, CloudPanel); - //NavigationManager.NavigateTo($"/website/{website.Id}"); + NavigationManager.NavigateTo($"/webspace/{webSpace.Id}"); } } } \ No newline at end of file