From 98dc0589d3bf3f18f0361931afe0a1c953121acf Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Wed, 22 Mar 2023 10:13:32 +0100 Subject: [PATCH 01/39] Added database stuff for plesk servers --- Moonlight/App/Database/DataContext.cs | 1 + .../App/Database/Entities/PleskServer.cs | 8 + ...0230322091250_AddedPleskServer.Designer.cs | 1085 +++++++++++++++++ .../20230322091250_AddedPleskServer.cs | 39 + .../Migrations/DataContextModelSnapshot.cs | 19 + .../App/Repositories/PleskServerRepository.cs | 44 + Moonlight/Program.cs | 1 + 7 files changed, 1197 insertions(+) create mode 100644 Moonlight/App/Database/Entities/PleskServer.cs create mode 100644 Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs create mode 100644 Moonlight/App/Repositories/PleskServerRepository.cs diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index c8575c4..1311d16 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -42,6 +42,7 @@ public class DataContext : DbContext public DbSet AaPanels { get; set; } public DbSet Websites { get; set; } public DbSet DdosAttacks { get; set; } + public DbSet PleskServers { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Moonlight/App/Database/Entities/PleskServer.cs b/Moonlight/App/Database/Entities/PleskServer.cs new file mode 100644 index 0000000..deaad00 --- /dev/null +++ b/Moonlight/App/Database/Entities/PleskServer.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Database.Entities; + +public class PleskServer +{ + public int Id { get; set; } + public string BaseUrl { get; set; } = ""; + public string ApiKey { get; set; } = ""; +} \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs new file mode 100644 index 0000000..5276f33 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs @@ -0,0 +1,1085 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230322091250_AddedPleskServer")] + partial class AddedPleskServer + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("BaseUrl") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PleskServers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordDiscriminator") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("DiscordUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs new file mode 100644 index 0000000..a6d4baf --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs @@ -0,0 +1,39 @@ +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class AddedPleskServer : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "PleskServers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + BaseUrl = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + ApiKey = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_PleskServers", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "PleskServers"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index 85cc920..783df5f 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -446,6 +446,25 @@ namespace Moonlight.App.Database.Migrations b.ToTable("NotificationClients"); }); + modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("BaseUrl") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PleskServers"); + }); + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => { b.Property("Id") diff --git a/Moonlight/App/Repositories/PleskServerRepository.cs b/Moonlight/App/Repositories/PleskServerRepository.cs new file mode 100644 index 0000000..5374263 --- /dev/null +++ b/Moonlight/App/Repositories/PleskServerRepository.cs @@ -0,0 +1,44 @@ +using Microsoft.EntityFrameworkCore; +using Moonlight.App.Database; +using Moonlight.App.Database.Entities; + +namespace Moonlight.App.Repositories; + +public class PleskServerRepository : IDisposable +{ + private readonly DataContext DataContext; + + public PleskServerRepository(DataContext dataContext) + { + DataContext = dataContext; + } + + public DbSet Get() + { + return DataContext.PleskServers; + } + + public PleskServer Add(PleskServer pleskServer) + { + var x = DataContext.PleskServers.Add(pleskServer); + DataContext.SaveChanges(); + return x.Entity; + } + + public void Update(PleskServer pleskServer) + { + DataContext.PleskServers.Update(pleskServer); + DataContext.SaveChanges(); + } + + public void Delete(PleskServer pleskServer) + { + DataContext.PleskServers.Remove(pleskServer); + DataContext.SaveChanges(); + } + + public void Dispose() + { + DataContext.Dispose(); + } +} \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 4543609..bcd5de7 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -65,6 +65,7 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); From 40504a4b717bdc09dc03d32b4565f64eb3a812fd Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Thu, 23 Mar 2023 10:23:27 +0100 Subject: [PATCH 02/39] Added plesk module. Implemented create and delete actions --- .../App/Database/Entities/PleskServer.cs | 1 + Moonlight/App/Database/Entities/Website.cs | 9 +- ...2093852_AddedNameToPleskServer.Designer.cs | 1089 +++++++++++++++++ .../20230322093852_AddedNameToPleskServer.cs | 29 + ...322094525_SwitchedToPleskModel.Designer.cs | 1073 ++++++++++++++++ .../20230322094525_SwitchedToPleskModel.cs | 124 ++ ...84631_AddedBaseDomainToWebsite.Designer.cs | 1077 ++++++++++++++++ ...20230323084631_AddedBaseDomainToWebsite.cs | 29 + .../Migrations/DataContextModelSnapshot.cs | 46 +- Moonlight/App/Exceptions/PleskException.cs | 32 + Moonlight/App/Helpers/PleskApiHelper.cs | 120 ++ .../App/Models/Plesk/Requests/CreateDomain.cs | 42 + .../App/Models/Plesk/Resources/Client.cs | 39 + .../App/Models/Plesk/Resources/Identifier.cs | 12 + Moonlight/App/Services/WebsiteService.cs | 111 +- Moonlight/Program.cs | 1 + .../Shared/Components/Forms/WSelect.razor | 43 + .../Navigations/AdminWebsiteNavigation.razor | 22 + .../Components/Partials/SidebarMenu.razor | 29 +- .../Shared/Views/Admin/Websites/Index.razor | 93 ++ .../Shared/Views/Admin/Websites/New.razor | 122 ++ .../Views/Admin/Websites/Servers/Index.razor | 58 + .../Views/Admin/Websites/Servers/New.razor | 64 + Moonlight/resources/lang/de_de.lang | 11 + 24 files changed, 4199 insertions(+), 77 deletions(-) create mode 100644 Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs create mode 100644 Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs create mode 100644 Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs create mode 100644 Moonlight/App/Exceptions/PleskException.cs create mode 100644 Moonlight/App/Helpers/PleskApiHelper.cs create mode 100644 Moonlight/App/Models/Plesk/Requests/CreateDomain.cs create mode 100644 Moonlight/App/Models/Plesk/Resources/Client.cs create mode 100644 Moonlight/App/Models/Plesk/Resources/Identifier.cs create mode 100644 Moonlight/Shared/Components/Forms/WSelect.razor create mode 100644 Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor create mode 100644 Moonlight/Shared/Views/Admin/Websites/Index.razor create mode 100644 Moonlight/Shared/Views/Admin/Websites/New.razor create mode 100644 Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor create mode 100644 Moonlight/Shared/Views/Admin/Websites/Servers/New.razor diff --git a/Moonlight/App/Database/Entities/PleskServer.cs b/Moonlight/App/Database/Entities/PleskServer.cs index deaad00..1c88ff5 100644 --- a/Moonlight/App/Database/Entities/PleskServer.cs +++ b/Moonlight/App/Database/Entities/PleskServer.cs @@ -5,4 +5,5 @@ public class PleskServer public int Id { get; set; } public string BaseUrl { get; set; } = ""; public string ApiKey { get; set; } = ""; + public string Name { get; set; } = ""; } \ No newline at end of file diff --git a/Moonlight/App/Database/Entities/Website.cs b/Moonlight/App/Database/Entities/Website.cs index d5c86d9..7672dd0 100644 --- a/Moonlight/App/Database/Entities/Website.cs +++ b/Moonlight/App/Database/Entities/Website.cs @@ -3,11 +3,8 @@ public class Website { public int Id { get; set; } - public int InternalAaPanelId { get; set; } - public AaPanel AaPanel { get; set; } + public int PleskId { get; set; } public User Owner { get; set; } - public string DomainName { get; set; } - public string PhpVersion { get; set; } - public string FtpUsername { get; set; } - public string FtpPassword { get; set; } + public PleskServer PleskServer { get; set; } + public string BaseDomain { get; set; } } \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs new file mode 100644 index 0000000..d4a778e --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs @@ -0,0 +1,1089 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230322093852_AddedNameToPleskServer")] + partial class AddedNameToPleskServer + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("BaseUrl") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PleskServers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordDiscriminator") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("DiscordUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs new file mode 100644 index 0000000..d19f2dc --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class AddedNameToPleskServer : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Name", + table: "PleskServers", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Name", + table: "PleskServers"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs new file mode 100644 index 0000000..ca85bf2 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs @@ -0,0 +1,1073 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230322094525_SwitchedToPleskModel")] + partial class SwitchedToPleskModel + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("BaseUrl") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PleskServers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordDiscriminator") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("DiscordUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PleskId") + .HasColumnType("int"); + + b.Property("PleskServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("PleskServerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") + .WithMany() + .HasForeignKey("PleskServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("PleskServer"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs new file mode 100644 index 0000000..4f02ef5 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs @@ -0,0 +1,124 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class SwitchedToPleskModel : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Websites_AaPanels_AaPanelId", + table: "Websites"); + + migrationBuilder.DropIndex( + name: "IX_Websites_AaPanelId", + table: "Websites"); + + migrationBuilder.DropColumn( + name: "DomainName", + table: "Websites"); + + migrationBuilder.DropColumn( + name: "FtpPassword", + table: "Websites"); + + migrationBuilder.DropColumn( + name: "FtpUsername", + table: "Websites"); + + migrationBuilder.DropColumn( + name: "PhpVersion", + table: "Websites"); + + migrationBuilder.RenameColumn( + name: "InternalAaPanelId", + table: "Websites", + newName: "PleskServerId"); + + migrationBuilder.RenameColumn( + name: "AaPanelId", + table: "Websites", + newName: "PleskId"); + + migrationBuilder.CreateIndex( + name: "IX_Websites_PleskServerId", + table: "Websites", + column: "PleskServerId"); + + migrationBuilder.AddForeignKey( + name: "FK_Websites_PleskServers_PleskServerId", + table: "Websites", + column: "PleskServerId", + principalTable: "PleskServers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Websites_PleskServers_PleskServerId", + table: "Websites"); + + migrationBuilder.DropIndex( + name: "IX_Websites_PleskServerId", + table: "Websites"); + + migrationBuilder.RenameColumn( + name: "PleskServerId", + table: "Websites", + newName: "InternalAaPanelId"); + + migrationBuilder.RenameColumn( + name: "PleskId", + table: "Websites", + newName: "AaPanelId"); + + migrationBuilder.AddColumn( + name: "DomainName", + table: "Websites", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AddColumn( + name: "FtpPassword", + table: "Websites", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AddColumn( + name: "FtpUsername", + table: "Websites", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AddColumn( + name: "PhpVersion", + table: "Websites", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_Websites_AaPanelId", + table: "Websites", + column: "AaPanelId"); + + migrationBuilder.AddForeignKey( + name: "FK_Websites_AaPanels_AaPanelId", + table: "Websites", + column: "AaPanelId", + principalTable: "AaPanels", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs new file mode 100644 index 0000000..21da56d --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs @@ -0,0 +1,1077 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230323084631_AddedBaseDomainToWebsite")] + partial class AddedBaseDomainToWebsite + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ApiKey") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("BaseUrl") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("PleskServers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordDiscriminator") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("DiscordUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PleskId") + .HasColumnType("int"); + + b.Property("PleskServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("PleskServerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") + .WithMany() + .HasForeignKey("PleskServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("PleskServer"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs new file mode 100644 index 0000000..2cde8fc --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class AddedBaseDomainToWebsite : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "BaseDomain", + table: "Websites", + type: "longtext", + nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "BaseDomain", + table: "Websites"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index 783df5f..46aff90 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -460,6 +460,10 @@ namespace Moonlight.App.Database.Migrations .IsRequired() .HasColumnType("longtext"); + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + b.HasKey("Id"); b.ToTable("PleskServers"); @@ -814,37 +818,25 @@ namespace Moonlight.App.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("int"); - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("DomainName") + b.Property("BaseDomain") .IsRequired() .HasColumnType("longtext"); - b.Property("FtpPassword") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FtpUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - b.Property("OwnerId") .HasColumnType("int"); - b.Property("PhpVersion") - .IsRequired() - .HasColumnType("longtext"); + b.Property("PleskId") + .HasColumnType("int"); + + b.Property("PleskServerId") + .HasColumnType("int"); b.HasKey("Id"); - b.HasIndex("AaPanelId"); - b.HasIndex("OwnerId"); + b.HasIndex("PleskServerId"); + b.ToTable("Websites"); }); @@ -1034,21 +1026,21 @@ namespace Moonlight.App.Database.Migrations modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") .WithMany() .HasForeignKey("OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("AaPanel"); + b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") + .WithMany() + .HasForeignKey("PleskServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); b.Navigation("Owner"); + + b.Navigation("PleskServer"); }); modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => diff --git a/Moonlight/App/Exceptions/PleskException.cs b/Moonlight/App/Exceptions/PleskException.cs new file mode 100644 index 0000000..2623091 --- /dev/null +++ b/Moonlight/App/Exceptions/PleskException.cs @@ -0,0 +1,32 @@ +using System.Runtime.Serialization; + +namespace Moonlight.App.Exceptions; + +[Serializable] +public class PleskException : Exception +{ + public int StatusCode { private get; set; } + + public PleskException() + { + } + + public PleskException(string message, int statusCode) : base(message) + { + StatusCode = statusCode; + } + + public PleskException(string message) : base(message) + { + } + + public PleskException(string message, Exception inner) : base(message, inner) + { + } + + protected PleskException( + SerializationInfo info, + StreamingContext context) : base(info, context) + { + } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/PleskApiHelper.cs b/Moonlight/App/Helpers/PleskApiHelper.cs new file mode 100644 index 0000000..6b3b07c --- /dev/null +++ b/Moonlight/App/Helpers/PleskApiHelper.cs @@ -0,0 +1,120 @@ +using System.Text; +using Moonlight.App.Database.Entities; +using Moonlight.App.Exceptions; +using Newtonsoft.Json; +using RestSharp; + +namespace Moonlight.App.Helpers; + +public class PleskApiHelper +{ + private readonly RestClient Client; + + public PleskApiHelper() + { + Client = new(); + } + + public async Task Get(PleskServer server, string resource) + { + var request = CreateRequest(server, resource); + + var response = await Client.GetAsync(request); + + if (!response.IsSuccessful) + { + if (response.StatusCode != 0) + { + throw new PleskException( + $"An error occured: ({response.StatusCode}) {response.Content}", + (int)response.StatusCode + ); + } + else + { + throw new Exception($"An internal error occured: {response.ErrorMessage}"); + } + } + + return JsonConvert.DeserializeObject(response.Content!)!; + } + + public async Task Post(PleskServer server, string resource, object? body) + { + var request = CreateRequest(server, resource); + + request.AddParameter("text/plain", + JsonConvert.SerializeObject(body), + ParameterType.RequestBody + ); + + var response = await Client.PostAsync(request); + + if (!response.IsSuccessful) + { + if (response.StatusCode != 0) + { + throw new PleskException( + $"An error occured: ({response.StatusCode}) {response.Content}", + (int)response.StatusCode + ); + } + else + { + throw new Exception($"An internal error occured: {response.ErrorMessage}"); + } + } + + return JsonConvert.DeserializeObject(response.Content!)!; + } + + public async Task Delete(PleskServer server, string resource, object? body) + { + var request = CreateRequest(server, resource); + + if(body != null) + request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); + + var response = await Client.DeleteAsync(request); + + if (!response.IsSuccessful) + { + if (response.StatusCode != 0) + { + throw new PleskException( + $"An error occured: ({response.StatusCode}) {response.Content}", + (int)response.StatusCode + ); + } + else + { + throw new Exception($"An internal error occured: {response.ErrorMessage}"); + } + } + } + + private RestRequest CreateRequest(PleskServer server, string resource) + { + RestRequest request = new(server.BaseUrl + "/" + resource); + + request.AddHeader("Content-Type", "application/json"); + request.AddHeader("Accept", "application/json"); + + // Implementation of auth method using auth header and api key + // https://docs.plesk.com/en-US/obsidian/api-rpc/about-rest-api.79359/#authentication-methods + + if (server.ApiKey.Contains(":")) + { + var base64 = Convert.ToBase64String( + Encoding.ASCII.GetBytes(server.ApiKey) + ); + + request.AddHeader("Authorization", "Basic " + base64); + } + else + request.AddHeader("X-API-Key", server.ApiKey); + + + return request; + } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs b/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs new file mode 100644 index 0000000..255bb09 --- /dev/null +++ b/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs @@ -0,0 +1,42 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Plesk.Requests; + +public class CreateDomain +{ + [JsonProperty("name")] + public string Name { get; set; } + + [JsonProperty("description")] + public string Description { get; set; } + + [JsonProperty("hosting_type")] + public string HostingType { get; set; } + + [JsonProperty("hosting_settings")] public HostingSettings HostingSettings { get; set; } = new(); + + [JsonProperty("owner_client")] public OwnerClient OwnerClient { get; set; } = new(); + + [JsonProperty("plan")] public Plan Plan { get; set; } = new(); +} + +public partial class HostingSettings +{ + [JsonProperty("ftp_login")] + public string FtpLogin { get; set; } + + [JsonProperty("ftp_password")] + public string FtpPassword { get; set; } +} + +public partial class OwnerClient +{ + [JsonProperty("id")] + public long Id { get; set; } +} + +public partial class Plan +{ + [JsonProperty("name")] + public string Name { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Client.cs b/Moonlight/App/Models/Plesk/Resources/Client.cs new file mode 100644 index 0000000..409bad5 --- /dev/null +++ b/Moonlight/App/Models/Plesk/Resources/Client.cs @@ -0,0 +1,39 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Plesk.Resources; + +public class Client +{ + [JsonProperty("id")] + public int Id { get; set; } + + [JsonProperty("created")] + public DateTimeOffset Created { get; set; } + + [JsonProperty("name")] + public string Name { get; set; } + + [JsonProperty("company")] + public string Company { get; set; } + + [JsonProperty("login")] + public string Login { get; set; } + + [JsonProperty("status")] + public long Status { get; set; } + + [JsonProperty("email")] + public string Email { get; set; } + + [JsonProperty("locale")] + public string Locale { get; set; } + + [JsonProperty("guid")] + public Guid Guid { get; set; } + + [JsonProperty("description")] + public string Description { get; set; } + + [JsonProperty("type")] + public string Type { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Identifier.cs b/Moonlight/App/Models/Plesk/Resources/Identifier.cs new file mode 100644 index 0000000..c99eec6 --- /dev/null +++ b/Moonlight/App/Models/Plesk/Resources/Identifier.cs @@ -0,0 +1,12 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Plesk.Resources; + +public class Identifier +{ + [JsonProperty("id")] + public int Id { get; set; } + + [JsonProperty("guid")] + public Guid Guid { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Services/WebsiteService.cs b/Moonlight/App/Services/WebsiteService.cs index 4cdda65..595e8d5 100644 --- a/Moonlight/App/Services/WebsiteService.cs +++ b/Moonlight/App/Services/WebsiteService.cs @@ -1,7 +1,9 @@ -using aaPanelSharp; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; +using Moonlight.App.Helpers; +using Moonlight.App.Models.Plesk.Requests; +using Moonlight.App.Models.Plesk.Resources; using Moonlight.App.Repositories; namespace Moonlight.App.Services; @@ -9,31 +11,100 @@ namespace Moonlight.App.Services; public class WebsiteService { private readonly WebsiteRepository WebsiteRepository; + private readonly PleskServerRepository PleskServerRepository; + private readonly PleskApiHelper PleskApiHelper; - public WebsiteService(WebsiteRepository websiteRepository) + public WebsiteService(WebsiteRepository websiteRepository, PleskServerRepository pleskServerRepository, + PleskApiHelper pleskApiHelper) { WebsiteRepository = websiteRepository; + PleskServerRepository = pleskServerRepository; + PleskApiHelper = pleskApiHelper; } - public Website Create(AaPanel aaPanel, User user, string name) + public async Task Create(User owner, string baseDomain, string ftpPassword, PleskServer? ps = null) { - if (WebsiteRepository.Get().Any(x => x.DomainName == name)) - throw new DisplayException("A website with this domain has already been created"); + var pleskServer = ps ?? PleskServerRepository.Get().FirstOrDefault(); - var access = new aaPanel(aaPanel.Url, aaPanel.Key); - return null; - } - - private aaPanel CreateApiAccess(Website website) - { - if (website.AaPanel == null) - { - website = WebsiteRepository - .Get() - .Include(x => x.AaPanel) - .First(x => x.Id == website.Id); - } + if (pleskServer == null) + throw new DisplayException("No plesk server found to deploy the website"); - return new aaPanel(website.AaPanel.Url, website.AaPanel.Key); + var website = WebsiteRepository.Add(new Website() + { + PleskServer = pleskServer, + Owner = owner, + BaseDomain = baseDomain + }); + + try + { + var userId = await GetAdminAccountForDeploy(pleskServer); + + string ftpUsername = baseDomain.Replace(".", "_"); + + var createDomain = new CreateDomain() + { + Description = "Moonlight website " + website.Id, + Name = baseDomain, + OwnerClient = new() + { + Id = userId + }, + Plan = new() + { + Name = "Unlimited" + }, + HostingType = "virtual", + HostingSettings = new() + { + FtpLogin = ftpUsername, + FtpPassword = ftpPassword + } + }; + + var identifier = await PleskApiHelper.Post( + pleskServer, + "domains", + createDomain + ); + + website.PleskId = identifier.Id; + + WebsiteRepository.Update(website); + + return website; + } + catch (Exception e) + { + WebsiteRepository.Delete(website); + + throw; + } + } + + public async Task Delete(Website w) + { + var website = WebsiteRepository + .Get() + .Include(x => x.PleskServer) + .FirstOrDefault(x => x.Id == w.Id); + + if (website == null) + throw new DisplayException("Website not found"); + + await PleskApiHelper.Delete(website.PleskServer, $"domains/{website.PleskId}", null); + + WebsiteRepository.Delete(website); + } + + private async Task GetAdminAccountForDeploy(PleskServer pleskServer) + { + var clients = await PleskApiHelper.Get(pleskServer, "clients"); + var adminClient = clients.FirstOrDefault(x => x.Type == "admin"); + + if (adminClient == null) + throw new DisplayException("Unable to deploy website. Plesk admin account is missing"); + + return adminClient.Id; } } \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index bcd5de7..d1cf4b6 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -121,6 +121,7 @@ namespace Moonlight builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddScoped(); + builder.Services.AddScoped(); // Background services builder.Services.AddSingleton(); diff --git a/Moonlight/Shared/Components/Forms/WSelect.razor b/Moonlight/Shared/Components/Forms/WSelect.razor new file mode 100644 index 0000000..040a9ff --- /dev/null +++ b/Moonlight/Shared/Components/Forms/WSelect.razor @@ -0,0 +1,43 @@ +@typeparam TItem + + + +@code +{ + [Parameter] + public TItem[] Items { get; set; } + + [Parameter] + public Func DisplayField { get; set; } + + [Parameter] + public Action OnChange { get; set; } + + private int Binding + { + get + { + if (Value == null) + return -1; + + return Value.GetHashCode(); + } + set + { + var i = Items.FirstOrDefault(x => x!.GetHashCode() == value); + + if (i != null) + { + Value = i; + OnChange?.Invoke(Value); + } + } + } + + private TItem Value; +} diff --git a/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor b/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor new file mode 100644 index 0000000..40b9802 --- /dev/null +++ b/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor @@ -0,0 +1,22 @@ +
+
+ +
+
+ +@code +{ + [Parameter] + public int Index { get; set; } = 0; +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor index 5ce76e1..88778c2 100644 --- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor +++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor @@ -155,32 +155,13 @@ else -
- +
+ - + - aaPanel - - -
-
- - - - - Overview - -
-
- - - - - Databases - -
-
+ Websites +
diff --git a/Moonlight/Shared/Views/Admin/Websites/Index.razor b/Moonlight/Shared/Views/Admin/Websites/Index.razor new file mode 100644 index 0000000..e7be04b --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Websites/Index.razor @@ -0,0 +1,93 @@ +@page "/admin/websites/" + +@using Moonlight.Shared.Components.Navigations +@using BlazorTable +@using Microsoft.EntityFrameworkCore +@using Moonlight.App.Database.Entities +@using Moonlight.App.Repositories +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject WebsiteRepository WebsiteRepository +@inject SmartTranslateService SmartTranslateService +@inject ToastService ToastService +@inject WebsiteService WebsiteService + + + + + +
+
+

+ + Websites + +

+
+ + + Add new website + +
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+
+ + + +@code +{ + private LazyLoader LazyLoader; + + private Website[] Websites; + + private Task Load(LazyLoader lazyLoader) + { + Websites = WebsiteRepository + .Get() + .Include(x => x.Owner) + .Include(x => x.PleskServer) + .ToArray(); + + return Task.CompletedTask; + } + + private async Task Delete(Website website) + { + await WebsiteService.Delete(website); + await ToastService.Success(SmartTranslateService.Translate("Successfully deleted website")); + await LazyLoader.Reload(); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Websites/New.razor b/Moonlight/Shared/Views/Admin/Websites/New.razor new file mode 100644 index 0000000..7f515db --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Websites/New.razor @@ -0,0 +1,122 @@ +@page "/admin/websites/new" + +@using Blazored.Typeahead +@using Logging.Net +@using Moonlight.App.Database.Entities +@using Moonlight.App.Repositories +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject UserRepository UserRepository +@inject PleskServerRepository PleskServerRepository +@inject SmartTranslateService SmartTranslateService +@inject WebsiteService WebsiteService +@inject NavigationManager NavigationManager +@inject ToastService ToastService + + +
+ +
+
+
+
+
+ + +
+
+ + +
+
+
+ + + @(context.Email) + + + @(context.Email) + + +
+
+
+ + + +
+
+ + + + Back + +
+
+
+
+
+ +
+ + +@code +{ + // Cached data + private User[] Users; + private PleskServer[] PleskServers; + + private User User; + private PleskServer? PleskServer; + private string BaseDomain = ""; + private string FtpPassword = ""; + + private Task Load(LazyLoader lazyLoader) + { + Users = UserRepository + .Get() + .ToArray(); + + User = Users.First(); + + PleskServers = PleskServerRepository + .Get() + .ToArray(); + + return Task.CompletedTask; + } + + private Task> SearchUsers(string input) + { + if (string.IsNullOrEmpty(input)) + { + return Task.FromResult(Array.Empty().Cast()); + } + else + { + return Task.FromResult(Users.Where(x => x.Email.ToLower().StartsWith(input))); + } + } + + private async Task Create() + { + await WebsiteService.Create(User, BaseDomain, FtpPassword, PleskServer); + + await ToastService.Success(SmartTranslateService.Translate("Website successfully created")); + NavigationManager.NavigateTo("/admin/websites"); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor b/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor new file mode 100644 index 0000000..512ba61 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor @@ -0,0 +1,58 @@ +@page "/admin/websites/servers" + +@using Moonlight.App.Repositories +@using Moonlight.App.Services +@using BlazorTable +@using Moonlight.App.Database.Entities +@using Moonlight.Shared.Components.Navigations + +@inject PleskServerRepository PleskServerRepository +@inject SmartTranslateService SmartTranslateService + + + + + +
+
+

+ + Plesk servers + +

+
+ + + Add new plesk server + +
+
+
+
+ + + + + +
+
+
+
+ + + +@code +{ + private LazyLoader LazyLoader; + + private PleskServer[] PleskServers; + + private Task Load(LazyLoader lazyLoader) + { + PleskServers = PleskServerRepository + .Get() + .ToArray(); + + return Task.CompletedTask; + } +} diff --git a/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor b/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor new file mode 100644 index 0000000..bb79e50 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor @@ -0,0 +1,64 @@ +@page "/admin/websites/servers/new" +@using Moonlight.App.Repositories +@using Moonlight.App.Services +@using Microsoft.AspNetCore.Components +@using Moonlight.App.Database.Entities + +@inject PleskServerRepository PleskServerRepository +@inject SmartTranslateService SmartTranslateService +@inject NavigationManager NavigationManager + + +
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + + Back + +
+
+
+
+
+
+ + +@code +{ + private PleskServer NewServer = new(); + + private Task Create() + { + PleskServerRepository.Add(NewServer); + + NavigationManager.NavigateTo("/admin/websites/servers"); + + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 485272e..c1974b6 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -393,3 +393,14 @@ Successfully updated user;Successfully updated user Discord id;Discord id Discord username;Discord username Discord discriminator;Discord discriminator +Plesk servers;Plesk servers +Add new plesk server;Add new plesk server +Base url;Base url +Api key;Api key +Add new website;Add new website +Plesk id;Plesk id +Plesk server;Plesk server +Base domain;Base domain +Ftp password;Ftp password +Website successfully created;Website successfully created +Successfully deleted website;Successfully deleted website From beef6dcd1d39696df3c24dc1abfc1c008aaf6725 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 24 Mar 2023 19:51:13 +0100 Subject: [PATCH 03/39] Added smart form. Added smart select --- Moonlight/App/Database/Entities/Domain.cs | 6 +- Moonlight/App/Helpers/FieldCssHelper.cs | 11 +++ .../Shared/Components/Forms/SmartForm.razor | 73 +++++++++++++++++++ .../Shared/Components/Forms/SmartSelect.razor | 59 +++++++++++++++ Moonlight/Shared/Views/Test.razor | 53 ++++++++++++++ Moonlight/resources/lang/de_de.lang | 1 + 6 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 Moonlight/App/Helpers/FieldCssHelper.cs create mode 100644 Moonlight/Shared/Components/Forms/SmartForm.razor create mode 100644 Moonlight/Shared/Components/Forms/SmartSelect.razor diff --git a/Moonlight/App/Database/Entities/Domain.cs b/Moonlight/App/Database/Entities/Domain.cs index 3b65089..2f7645a 100644 --- a/Moonlight/App/Database/Entities/Domain.cs +++ b/Moonlight/App/Database/Entities/Domain.cs @@ -1,8 +1,12 @@ -namespace Moonlight.App.Database.Entities; +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Database.Entities; public class Domain { public int Id { get; set; } + + [Required] public string Name { get; set; } public SharedDomain SharedDomain { get; set; } public User Owner { get; set; } diff --git a/Moonlight/App/Helpers/FieldCssHelper.cs b/Moonlight/App/Helpers/FieldCssHelper.cs new file mode 100644 index 0000000..557532a --- /dev/null +++ b/Moonlight/App/Helpers/FieldCssHelper.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Components.Forms; + +namespace Moonlight.App.Helpers; + +public class FieldCssHelper : FieldCssClassProvider +{ + public override string GetFieldCssClass(EditContext editContext, in FieldIdentifier fieldIdentifier) + { + return editContext.GetValidationMessages(fieldIdentifier).Any() ? "is-invalid" : "is-valid"; + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Forms/SmartForm.razor b/Moonlight/Shared/Components/Forms/SmartForm.razor new file mode 100644 index 0000000..615ebef --- /dev/null +++ b/Moonlight/Shared/Components/Forms/SmartForm.razor @@ -0,0 +1,73 @@ +@using Moonlight.App.Helpers + +
+ + + @if (ErrorMessages.Any()) + { +
+ @foreach (var msg in ErrorMessages) + { + @(msg) +
+ } +
+ } + @(ChildContent) + +
+ +@code +{ + [Parameter] + public object Model { get; set; } + + [Parameter] + public EventCallback OnValidSubmit { get; set; } + + [Parameter] + public EventCallback OnInvalidSubmit { get; set; } + + [Parameter] + public EventCallback OnSubmit { get; set; } + + [Parameter] + public RenderFragment ChildContent { get; set; } + + private EditForm EditForm; + + private List ErrorMessages = new(); + + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + EditForm.EditContext!.SetFieldCssClassProvider(new FieldCssHelper()); + } + } + + private async Task ValidSubmit(EditContext context) + { + ErrorMessages.Clear(); + await InvokeAsync(StateHasChanged); + + await OnValidSubmit.InvokeAsync(context); + await OnSubmit.InvokeAsync(context); + } + + private async Task InvalidSubmit(EditContext context) + { + ErrorMessages.Clear(); + context.Validate(); + + foreach (var message in context.GetValidationMessages()) + { + ErrorMessages.Add(message); + } + + await InvokeAsync(StateHasChanged); + + await OnInvalidSubmit.InvokeAsync(context); + await OnSubmit.InvokeAsync(context); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Forms/SmartSelect.razor b/Moonlight/Shared/Components/Forms/SmartSelect.razor new file mode 100644 index 0000000..ea24682 --- /dev/null +++ b/Moonlight/Shared/Components/Forms/SmartSelect.razor @@ -0,0 +1,59 @@ +@typeparam TField +@inherits InputBase + + + +@code +{ + [Parameter] + public TField[] Items { get; set; } + + [Parameter] + public Func DisplayField { get; set; } + + protected override void OnInitialized() + { + + } + + protected override string? FormatValueAsString(TField? value) + { + if (value == null) + return null; + + return DisplayField.Invoke(value); + } + + protected override bool TryParseValueFromString(string? value, out TField result, out string? validationErrorMessage) + { + validationErrorMessage = ""; + result = default(TField)!; + return false; + } + + private int Binding + { + get + { + if (Value == null) + return -1; + + return Value.GetHashCode(); + } + set + { + var i = Items.FirstOrDefault(x => x!.GetHashCode() == value); + + if (i != null) + { + Value = i; + ValueChanged.InvokeAsync(i); + } + } + } +} diff --git a/Moonlight/Shared/Views/Test.razor b/Moonlight/Shared/Views/Test.razor index 257b451..948e8c3 100644 --- a/Moonlight/Shared/Views/Test.razor +++ b/Moonlight/Shared/Views/Test.razor @@ -1,2 +1,55 @@ @page "/test" +@using Moonlight.App.Services.Interop +@using Moonlight.App.Database.Entities +@using Moonlight.App.Repositories.Domains +@inject ToastService ToastService +@inject SharedDomainRepository SharedDomainRepository + + + +
+ + +
+
+ + + +
+
+ +
+ + + +@code +{ + private App.Database.Entities.Domain Domain = new(); + + private SharedDomain[] SharedDomains; + + private async Task Callback(EditContext obj) + { + Console.WriteLine(Domain.Name); + Console.WriteLine(Domain.SharedDomain.Name); + + await ToastService.Success("SUCCESS"); + } + + private Task Load(LazyLoader arg) + { + SharedDomains = SharedDomainRepository + .Get() + .ToArray(); + + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 485272e..038b7e8 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -393,3 +393,4 @@ Successfully updated user;Successfully updated user Discord id;Discord id Discord username;Discord username Discord discriminator;Discord discriminator +The Name field is required.;The Name field is required. From 3611b745ff1ef0115c08ab007b5b080678d3cf0c Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 24 Mar 2023 20:11:18 +0100 Subject: [PATCH 04/39] Revert "Merge branch 'PleskIntegration' into main" This reverts commit 18c205d8a021e9aabea3aeaf613f8d907b0e6a93, reversing changes made to c5be86b695b986166aaedbc4389de3c4ce529ba8. --- Moonlight/App/Database/DataContext.cs | 1 - .../App/Database/Entities/PleskServer.cs | 9 - Moonlight/App/Database/Entities/Website.cs | 9 +- ...0230322091250_AddedPleskServer.Designer.cs | 1085 ---------------- .../20230322091250_AddedPleskServer.cs | 39 - ...2093852_AddedNameToPleskServer.Designer.cs | 1089 ----------------- .../20230322093852_AddedNameToPleskServer.cs | 29 - ...322094525_SwitchedToPleskModel.Designer.cs | 1073 ---------------- .../20230322094525_SwitchedToPleskModel.cs | 124 -- ...84631_AddedBaseDomainToWebsite.Designer.cs | 1077 ---------------- ...20230323084631_AddedBaseDomainToWebsite.cs | 29 - .../Migrations/DataContextModelSnapshot.cs | 65 +- Moonlight/App/Exceptions/PleskException.cs | 32 - Moonlight/App/Helpers/PleskApiHelper.cs | 120 -- .../App/Models/Plesk/Requests/CreateDomain.cs | 42 - .../App/Models/Plesk/Resources/Client.cs | 39 - .../App/Models/Plesk/Resources/Identifier.cs | 12 - .../App/Repositories/PleskServerRepository.cs | 44 - Moonlight/App/Services/WebsiteService.cs | 107 +- Moonlight/Program.cs | 2 - .../Shared/Components/Forms/WSelect.razor | 43 - .../Navigations/AdminWebsiteNavigation.razor | 22 - .../Components/Partials/SidebarMenu.razor | 29 +- .../Shared/Views/Admin/Websites/Index.razor | 93 -- .../Shared/Views/Admin/Websites/New.razor | 122 -- .../Views/Admin/Websites/Servers/Index.razor | 58 - .../Views/Admin/Websites/Servers/New.razor | 64 - Moonlight/resources/lang/de_de.lang | 11 - 28 files changed, 75 insertions(+), 5394 deletions(-) delete mode 100644 Moonlight/App/Database/Entities/PleskServer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs delete mode 100644 Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs delete mode 100644 Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs delete mode 100644 Moonlight/App/Exceptions/PleskException.cs delete mode 100644 Moonlight/App/Helpers/PleskApiHelper.cs delete mode 100644 Moonlight/App/Models/Plesk/Requests/CreateDomain.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/Client.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/Identifier.cs delete mode 100644 Moonlight/App/Repositories/PleskServerRepository.cs delete mode 100644 Moonlight/Shared/Components/Forms/WSelect.razor delete mode 100644 Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor delete mode 100644 Moonlight/Shared/Views/Admin/Websites/Index.razor delete mode 100644 Moonlight/Shared/Views/Admin/Websites/New.razor delete mode 100644 Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor delete mode 100644 Moonlight/Shared/Views/Admin/Websites/Servers/New.razor diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index 1311d16..c8575c4 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -42,7 +42,6 @@ public class DataContext : DbContext public DbSet AaPanels { get; set; } public DbSet Websites { get; set; } public DbSet DdosAttacks { get; set; } - public DbSet PleskServers { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Moonlight/App/Database/Entities/PleskServer.cs b/Moonlight/App/Database/Entities/PleskServer.cs deleted file mode 100644 index 1c88ff5..0000000 --- a/Moonlight/App/Database/Entities/PleskServer.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Moonlight.App.Database.Entities; - -public class PleskServer -{ - public int Id { get; set; } - public string BaseUrl { get; set; } = ""; - public string ApiKey { get; set; } = ""; - public string Name { get; set; } = ""; -} \ No newline at end of file diff --git a/Moonlight/App/Database/Entities/Website.cs b/Moonlight/App/Database/Entities/Website.cs index 7672dd0..d5c86d9 100644 --- a/Moonlight/App/Database/Entities/Website.cs +++ b/Moonlight/App/Database/Entities/Website.cs @@ -3,8 +3,11 @@ public class Website { public int Id { get; set; } - public int PleskId { get; set; } + public int InternalAaPanelId { get; set; } + public AaPanel AaPanel { get; set; } public User Owner { get; set; } - public PleskServer PleskServer { get; set; } - public string BaseDomain { get; set; } + public string DomainName { get; set; } + public string PhpVersion { get; set; } + public string FtpUsername { get; set; } + public string FtpPassword { get; set; } } \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs deleted file mode 100644 index 5276f33..0000000 --- a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.Designer.cs +++ /dev/null @@ -1,1085 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Moonlight.App.Database; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230322091250_AddedPleskServer")] - partial class AddedPleskServer - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("BaseDomain") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Url") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("AaPanels"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Databases"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Data") - .HasColumnType("bigint"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Ongoing") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.ToTable("DdosAttacks"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Default") - .HasColumnType("tinyint(1)"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("DockerImages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("SharedDomainId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("SharedDomainId"); - - b.ToTable("Domains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Allocations") - .HasColumnType("int"); - - b.Property("ConfigFiles") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallDockerImage") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallEntrypoint") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallScript") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Startup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StartupDetection") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StopCommand") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TagsJson") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("Images"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("ImageTags"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("DefaultValue") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("ImageVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("LoadingMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("AuditLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Class") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Stacktrace") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.ToTable("ErrorLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("SecurityLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Fqdn") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("HttpPort") - .HasColumnType("int"); - - b.Property("MoonlightDaemonPort") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SftpPort") - .HasColumnType("int"); - - b.Property("Ssl") - .HasColumnType("tinyint(1)"); - - b.Property("Token") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TokenId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Nodes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Port") - .HasColumnType("int"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.HasIndex("ServerId"); - - b.ToTable("NodeAllocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Action") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NotificationClientId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NotificationClientId"); - - b.ToTable("NotificationActions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("NotificationClients"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("ApiKey") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("BaseUrl") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("PleskServers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Identifier") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Revokes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("bigint"); - - b.Property("DockerImageIndex") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Installing") - .HasColumnType("tinyint(1)"); - - b.Property("MainAllocationId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("bigint"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("OverrideStartup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("Suspended") - .HasColumnType("tinyint(1)"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("MainAllocationId"); - - b.HasIndex("NodeId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Servers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Bytes") - .HasColumnType("bigint"); - - b.Property("Created") - .HasColumnType("tinyint(1)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerBackups"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Value") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CloudflareId") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("SharedDomains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Duration") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SellPassId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Subscriptions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Amount") - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("SubscriptionLimits"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Answer") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsQuestion") - .HasColumnType("tinyint(1)"); - - b.Property("IsSupport") - .HasColumnType("tinyint(1)"); - - b.Property("IsSystem") - .HasColumnType("tinyint(1)"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipientId") - .HasColumnType("int"); - - b.Property("SenderId") - .HasColumnType("int"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("RecipientId"); - - b.HasIndex("SenderId"); - - b.ToTable("SupportMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Address") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Admin") - .HasColumnType("tinyint(1)"); - - b.Property("City") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Country") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("DiscordDiscriminator") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("DiscordId") - .HasColumnType("bigint"); - - b.Property("DiscordUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Email") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FirstName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("LastName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Password") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("State") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("SubscriptionDuration") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.Property("SubscriptionSince") - .HasColumnType("datetime(6)"); - - b.Property("SupportPending") - .HasColumnType("tinyint(1)"); - - b.Property("TokenValidTime") - .HasColumnType("datetime(6)"); - - b.Property("TotpEnabled") - .HasColumnType("tinyint(1)"); - - b.Property("TotpSecret") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("DomainName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FtpPassword") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FtpUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("PhpVersion") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Websites"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Node"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("DockerImages") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") - .WithMany() - .HasForeignKey("SharedDomainId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("SharedDomain"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("Variables") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", null) - .WithMany("Allocations") - .HasForeignKey("NodeId"); - - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Allocations") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") - .WithMany() - .HasForeignKey("NotificationClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("NotificationClient"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") - .WithMany() - .HasForeignKey("MainAllocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Image"); - - b.Navigation("MainAllocation"); - - b.Navigation("Node"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Backups") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Variables") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Subscription", null) - .WithMany("Limits") - .HasForeignKey("SubscriptionId"); - - b.Navigation("Image"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") - .WithMany() - .HasForeignKey("RecipientId"); - - b.HasOne("Moonlight.App.Database.Entities.User", "Sender") - .WithMany() - .HasForeignKey("SenderId"); - - b.Navigation("Recipient"); - - b.Navigation("Sender"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") - .WithMany() - .HasForeignKey("SubscriptionId"); - - b.Navigation("Subscription"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Navigation("DockerImages"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Navigation("Allocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Navigation("Allocations"); - - b.Navigation("Backups"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Navigation("Limits"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs b/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs deleted file mode 100644 index a6d4baf..0000000 --- a/Moonlight/App/Database/Migrations/20230322091250_AddedPleskServer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - /// - public partial class AddedPleskServer : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "PleskServers", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - BaseUrl = table.Column(type: "longtext", nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"), - ApiKey = table.Column(type: "longtext", nullable: false) - .Annotation("MySql:CharSet", "utf8mb4") - }, - constraints: table => - { - table.PrimaryKey("PK_PleskServers", x => x.Id); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "PleskServers"); - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs deleted file mode 100644 index d4a778e..0000000 --- a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.Designer.cs +++ /dev/null @@ -1,1089 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Moonlight.App.Database; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230322093852_AddedNameToPleskServer")] - partial class AddedNameToPleskServer - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("BaseDomain") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Url") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("AaPanels"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Databases"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Data") - .HasColumnType("bigint"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Ongoing") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.ToTable("DdosAttacks"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Default") - .HasColumnType("tinyint(1)"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("DockerImages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("SharedDomainId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("SharedDomainId"); - - b.ToTable("Domains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Allocations") - .HasColumnType("int"); - - b.Property("ConfigFiles") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallDockerImage") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallEntrypoint") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallScript") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Startup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StartupDetection") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StopCommand") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TagsJson") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("Images"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("ImageTags"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("DefaultValue") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("ImageVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("LoadingMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("AuditLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Class") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Stacktrace") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.ToTable("ErrorLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("SecurityLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Fqdn") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("HttpPort") - .HasColumnType("int"); - - b.Property("MoonlightDaemonPort") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SftpPort") - .HasColumnType("int"); - - b.Property("Ssl") - .HasColumnType("tinyint(1)"); - - b.Property("Token") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TokenId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Nodes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Port") - .HasColumnType("int"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.HasIndex("ServerId"); - - b.ToTable("NodeAllocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Action") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NotificationClientId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NotificationClientId"); - - b.ToTable("NotificationActions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("NotificationClients"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("ApiKey") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("BaseUrl") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("PleskServers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Identifier") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Revokes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("bigint"); - - b.Property("DockerImageIndex") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Installing") - .HasColumnType("tinyint(1)"); - - b.Property("MainAllocationId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("bigint"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("OverrideStartup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("Suspended") - .HasColumnType("tinyint(1)"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("MainAllocationId"); - - b.HasIndex("NodeId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Servers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Bytes") - .HasColumnType("bigint"); - - b.Property("Created") - .HasColumnType("tinyint(1)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerBackups"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Value") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CloudflareId") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("SharedDomains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Duration") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SellPassId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Subscriptions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Amount") - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("SubscriptionLimits"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Answer") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsQuestion") - .HasColumnType("tinyint(1)"); - - b.Property("IsSupport") - .HasColumnType("tinyint(1)"); - - b.Property("IsSystem") - .HasColumnType("tinyint(1)"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipientId") - .HasColumnType("int"); - - b.Property("SenderId") - .HasColumnType("int"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("RecipientId"); - - b.HasIndex("SenderId"); - - b.ToTable("SupportMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Address") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Admin") - .HasColumnType("tinyint(1)"); - - b.Property("City") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Country") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("DiscordDiscriminator") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("DiscordId") - .HasColumnType("bigint"); - - b.Property("DiscordUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Email") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FirstName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("LastName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Password") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("State") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("SubscriptionDuration") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.Property("SubscriptionSince") - .HasColumnType("datetime(6)"); - - b.Property("SupportPending") - .HasColumnType("tinyint(1)"); - - b.Property("TokenValidTime") - .HasColumnType("datetime(6)"); - - b.Property("TotpEnabled") - .HasColumnType("tinyint(1)"); - - b.Property("TotpSecret") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("DomainName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FtpPassword") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FtpUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("PhpVersion") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Websites"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Node"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("DockerImages") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") - .WithMany() - .HasForeignKey("SharedDomainId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("SharedDomain"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("Variables") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", null) - .WithMany("Allocations") - .HasForeignKey("NodeId"); - - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Allocations") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") - .WithMany() - .HasForeignKey("NotificationClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("NotificationClient"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") - .WithMany() - .HasForeignKey("MainAllocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Image"); - - b.Navigation("MainAllocation"); - - b.Navigation("Node"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Backups") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Variables") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Subscription", null) - .WithMany("Limits") - .HasForeignKey("SubscriptionId"); - - b.Navigation("Image"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") - .WithMany() - .HasForeignKey("RecipientId"); - - b.HasOne("Moonlight.App.Database.Entities.User", "Sender") - .WithMany() - .HasForeignKey("SenderId"); - - b.Navigation("Recipient"); - - b.Navigation("Sender"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") - .WithMany() - .HasForeignKey("SubscriptionId"); - - b.Navigation("Subscription"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Navigation("DockerImages"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Navigation("Allocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Navigation("Allocations"); - - b.Navigation("Backups"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Navigation("Limits"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs b/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs deleted file mode 100644 index d19f2dc..0000000 --- a/Moonlight/App/Database/Migrations/20230322093852_AddedNameToPleskServer.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - /// - public partial class AddedNameToPleskServer : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "Name", - table: "PleskServers", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Name", - table: "PleskServers"); - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs deleted file mode 100644 index ca85bf2..0000000 --- a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.Designer.cs +++ /dev/null @@ -1,1073 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Moonlight.App.Database; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230322094525_SwitchedToPleskModel")] - partial class SwitchedToPleskModel - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("BaseDomain") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Url") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("AaPanels"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Databases"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Data") - .HasColumnType("bigint"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Ongoing") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.ToTable("DdosAttacks"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Default") - .HasColumnType("tinyint(1)"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("DockerImages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("SharedDomainId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("SharedDomainId"); - - b.ToTable("Domains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Allocations") - .HasColumnType("int"); - - b.Property("ConfigFiles") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallDockerImage") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallEntrypoint") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallScript") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Startup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StartupDetection") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StopCommand") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TagsJson") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("Images"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("ImageTags"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("DefaultValue") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("ImageVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("LoadingMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("AuditLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Class") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Stacktrace") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.ToTable("ErrorLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("SecurityLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Fqdn") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("HttpPort") - .HasColumnType("int"); - - b.Property("MoonlightDaemonPort") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SftpPort") - .HasColumnType("int"); - - b.Property("Ssl") - .HasColumnType("tinyint(1)"); - - b.Property("Token") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TokenId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Nodes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Port") - .HasColumnType("int"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.HasIndex("ServerId"); - - b.ToTable("NodeAllocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Action") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NotificationClientId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NotificationClientId"); - - b.ToTable("NotificationActions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("NotificationClients"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("ApiKey") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("BaseUrl") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("PleskServers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Identifier") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Revokes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("bigint"); - - b.Property("DockerImageIndex") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Installing") - .HasColumnType("tinyint(1)"); - - b.Property("MainAllocationId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("bigint"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("OverrideStartup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("Suspended") - .HasColumnType("tinyint(1)"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("MainAllocationId"); - - b.HasIndex("NodeId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Servers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Bytes") - .HasColumnType("bigint"); - - b.Property("Created") - .HasColumnType("tinyint(1)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerBackups"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Value") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CloudflareId") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("SharedDomains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Duration") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SellPassId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Subscriptions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Amount") - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("SubscriptionLimits"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Answer") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsQuestion") - .HasColumnType("tinyint(1)"); - - b.Property("IsSupport") - .HasColumnType("tinyint(1)"); - - b.Property("IsSystem") - .HasColumnType("tinyint(1)"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipientId") - .HasColumnType("int"); - - b.Property("SenderId") - .HasColumnType("int"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("RecipientId"); - - b.HasIndex("SenderId"); - - b.ToTable("SupportMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Address") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Admin") - .HasColumnType("tinyint(1)"); - - b.Property("City") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Country") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("DiscordDiscriminator") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("DiscordId") - .HasColumnType("bigint"); - - b.Property("DiscordUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Email") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FirstName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("LastName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Password") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("State") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("SubscriptionDuration") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.Property("SubscriptionSince") - .HasColumnType("datetime(6)"); - - b.Property("SupportPending") - .HasColumnType("tinyint(1)"); - - b.Property("TokenValidTime") - .HasColumnType("datetime(6)"); - - b.Property("TotpEnabled") - .HasColumnType("tinyint(1)"); - - b.Property("TotpSecret") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("PleskId") - .HasColumnType("int"); - - b.Property("PleskServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("PleskServerId"); - - b.ToTable("Websites"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Node"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("DockerImages") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") - .WithMany() - .HasForeignKey("SharedDomainId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("SharedDomain"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("Variables") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", null) - .WithMany("Allocations") - .HasForeignKey("NodeId"); - - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Allocations") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") - .WithMany() - .HasForeignKey("NotificationClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("NotificationClient"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") - .WithMany() - .HasForeignKey("MainAllocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Image"); - - b.Navigation("MainAllocation"); - - b.Navigation("Node"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Backups") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Variables") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Subscription", null) - .WithMany("Limits") - .HasForeignKey("SubscriptionId"); - - b.Navigation("Image"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") - .WithMany() - .HasForeignKey("RecipientId"); - - b.HasOne("Moonlight.App.Database.Entities.User", "Sender") - .WithMany() - .HasForeignKey("SenderId"); - - b.Navigation("Recipient"); - - b.Navigation("Sender"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") - .WithMany() - .HasForeignKey("SubscriptionId"); - - b.Navigation("Subscription"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") - .WithMany() - .HasForeignKey("PleskServerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("PleskServer"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Navigation("DockerImages"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Navigation("Allocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Navigation("Allocations"); - - b.Navigation("Backups"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Navigation("Limits"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs b/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs deleted file mode 100644 index 4f02ef5..0000000 --- a/Moonlight/App/Database/Migrations/20230322094525_SwitchedToPleskModel.cs +++ /dev/null @@ -1,124 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - /// - public partial class SwitchedToPleskModel : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Websites_AaPanels_AaPanelId", - table: "Websites"); - - migrationBuilder.DropIndex( - name: "IX_Websites_AaPanelId", - table: "Websites"); - - migrationBuilder.DropColumn( - name: "DomainName", - table: "Websites"); - - migrationBuilder.DropColumn( - name: "FtpPassword", - table: "Websites"); - - migrationBuilder.DropColumn( - name: "FtpUsername", - table: "Websites"); - - migrationBuilder.DropColumn( - name: "PhpVersion", - table: "Websites"); - - migrationBuilder.RenameColumn( - name: "InternalAaPanelId", - table: "Websites", - newName: "PleskServerId"); - - migrationBuilder.RenameColumn( - name: "AaPanelId", - table: "Websites", - newName: "PleskId"); - - migrationBuilder.CreateIndex( - name: "IX_Websites_PleskServerId", - table: "Websites", - column: "PleskServerId"); - - migrationBuilder.AddForeignKey( - name: "FK_Websites_PleskServers_PleskServerId", - table: "Websites", - column: "PleskServerId", - principalTable: "PleskServers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Websites_PleskServers_PleskServerId", - table: "Websites"); - - migrationBuilder.DropIndex( - name: "IX_Websites_PleskServerId", - table: "Websites"); - - migrationBuilder.RenameColumn( - name: "PleskServerId", - table: "Websites", - newName: "InternalAaPanelId"); - - migrationBuilder.RenameColumn( - name: "PleskId", - table: "Websites", - newName: "AaPanelId"); - - migrationBuilder.AddColumn( - name: "DomainName", - table: "Websites", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "FtpPassword", - table: "Websites", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "FtpUsername", - table: "Websites", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.AddColumn( - name: "PhpVersion", - table: "Websites", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - - migrationBuilder.CreateIndex( - name: "IX_Websites_AaPanelId", - table: "Websites", - column: "AaPanelId"); - - migrationBuilder.AddForeignKey( - name: "FK_Websites_AaPanels_AaPanelId", - table: "Websites", - column: "AaPanelId", - principalTable: "AaPanels", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs deleted file mode 100644 index 21da56d..0000000 --- a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.Designer.cs +++ /dev/null @@ -1,1077 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Moonlight.App.Database; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230323084631_AddedBaseDomainToWebsite")] - partial class AddedBaseDomainToWebsite - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("BaseDomain") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Url") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("AaPanels"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("AaPanelId") - .HasColumnType("int"); - - b.Property("InternalAaPanelId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("AaPanelId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Databases"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Data") - .HasColumnType("bigint"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Ongoing") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.ToTable("DdosAttacks"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Default") - .HasColumnType("tinyint(1)"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("DockerImages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("SharedDomainId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("SharedDomainId"); - - b.ToTable("Domains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Allocations") - .HasColumnType("int"); - - b.Property("ConfigFiles") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallDockerImage") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallEntrypoint") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("InstallScript") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Startup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StartupDetection") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("StopCommand") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TagsJson") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.ToTable("Images"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("ImageTags"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("DefaultValue") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.ToTable("ImageVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("LoadingMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("AuditLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Class") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Stacktrace") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.HasKey("Id"); - - b.ToTable("ErrorLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Ip") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("JsonData") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("System") - .HasColumnType("tinyint(1)"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("SecurityLog"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Fqdn") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("HttpPort") - .HasColumnType("int"); - - b.Property("MoonlightDaemonPort") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SftpPort") - .HasColumnType("int"); - - b.Property("Ssl") - .HasColumnType("tinyint(1)"); - - b.Property("Token") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("TokenId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Nodes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("Port") - .HasColumnType("int"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NodeId"); - - b.HasIndex("ServerId"); - - b.ToTable("NodeAllocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Action") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NotificationClientId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("NotificationClientId"); - - b.ToTable("NotificationActions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("NotificationClients"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("ApiKey") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("BaseUrl") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("PleskServers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Identifier") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Revokes"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("bigint"); - - b.Property("DockerImageIndex") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Installing") - .HasColumnType("tinyint(1)"); - - b.Property("MainAllocationId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("bigint"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("NodeId") - .HasColumnType("int"); - - b.Property("OverrideStartup") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("Suspended") - .HasColumnType("tinyint(1)"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("MainAllocationId"); - - b.HasIndex("NodeId"); - - b.HasIndex("OwnerId"); - - b.ToTable("Servers"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Bytes") - .HasColumnType("bigint"); - - b.Property("Created") - .HasColumnType("tinyint(1)"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Uuid") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerBackups"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Key") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.Property("Value") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.HasIndex("ServerId"); - - b.ToTable("ServerVariables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("CloudflareId") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("SharedDomains"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Duration") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SellPassId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Subscriptions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Amount") - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("SubscriptionLimits"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Answer") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("IsQuestion") - .HasColumnType("tinyint(1)"); - - b.Property("IsSupport") - .HasColumnType("tinyint(1)"); - - b.Property("IsSystem") - .HasColumnType("tinyint(1)"); - - b.Property("Message") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("RecipientId") - .HasColumnType("int"); - - b.Property("SenderId") - .HasColumnType("int"); - - b.Property("Type") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("RecipientId"); - - b.HasIndex("SenderId"); - - b.ToTable("SupportMessages"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Address") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Admin") - .HasColumnType("tinyint(1)"); - - b.Property("City") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Country") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("CreatedAt") - .HasColumnType("datetime(6)"); - - b.Property("DiscordDiscriminator") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("DiscordId") - .HasColumnType("bigint"); - - b.Property("DiscordUsername") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Email") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("FirstName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("LastName") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Password") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("State") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("SubscriptionDuration") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.Property("SubscriptionSince") - .HasColumnType("datetime(6)"); - - b.Property("SupportPending") - .HasColumnType("tinyint(1)"); - - b.Property("TokenValidTime") - .HasColumnType("datetime(6)"); - - b.Property("TotpEnabled") - .HasColumnType("tinyint(1)"); - - b.Property("TotpSecret") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("UpdatedAt") - .HasColumnType("datetime(6)"); - - b.HasKey("Id"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("BaseDomain") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("OwnerId") - .HasColumnType("int"); - - b.Property("PleskId") - .HasColumnType("int"); - - b.Property("PleskServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OwnerId"); - - b.HasIndex("PleskServerId"); - - b.ToTable("Websites"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => - { - b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") - .WithMany() - .HasForeignKey("AaPanelId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("AaPanel"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Node"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("DockerImages") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") - .WithMany() - .HasForeignKey("SharedDomainId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("SharedDomain"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", null) - .WithMany("Variables") - .HasForeignKey("ImageId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => - { - b.HasOne("Moonlight.App.Database.Entities.Node", null) - .WithMany("Allocations") - .HasForeignKey("NodeId"); - - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Allocations") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => - { - b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") - .WithMany() - .HasForeignKey("NotificationClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("NotificationClient"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("User"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") - .WithMany() - .HasForeignKey("MainAllocationId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Node", "Node") - .WithMany() - .HasForeignKey("NodeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Image"); - - b.Navigation("MainAllocation"); - - b.Navigation("Node"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Backups") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => - { - b.HasOne("Moonlight.App.Database.Entities.Server", null) - .WithMany("Variables") - .HasForeignKey("ServerId"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Subscription", null) - .WithMany("Limits") - .HasForeignKey("SubscriptionId"); - - b.Navigation("Image"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") - .WithMany() - .HasForeignKey("RecipientId"); - - b.HasOne("Moonlight.App.Database.Entities.User", "Sender") - .WithMany() - .HasForeignKey("SenderId"); - - b.Navigation("Recipient"); - - b.Navigation("Sender"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") - .WithMany() - .HasForeignKey("SubscriptionId"); - - b.Navigation("Subscription"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => - { - b.HasOne("Moonlight.App.Database.Entities.User", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") - .WithMany() - .HasForeignKey("PleskServerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Owner"); - - b.Navigation("PleskServer"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => - { - b.Navigation("DockerImages"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => - { - b.Navigation("Allocations"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => - { - b.Navigation("Allocations"); - - b.Navigation("Backups"); - - b.Navigation("Variables"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Navigation("Limits"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs b/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs deleted file mode 100644 index 2cde8fc..0000000 --- a/Moonlight/App/Database/Migrations/20230323084631_AddedBaseDomainToWebsite.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Moonlight.App.Database.Migrations -{ - /// - public partial class AddedBaseDomainToWebsite : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "BaseDomain", - table: "Websites", - type: "longtext", - nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "BaseDomain", - table: "Websites"); - } - } -} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index 2b03d4b..566e4e6 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -446,29 +446,6 @@ namespace Moonlight.App.Database.Migrations b.ToTable("NotificationClients"); }); - modelBuilder.Entity("Moonlight.App.Database.Entities.PleskServer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("ApiKey") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("BaseUrl") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("PleskServers"); - }); - modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => { b.Property("Id") @@ -810,24 +787,36 @@ namespace Moonlight.App.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("int"); - b.Property("BaseDomain") + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") .IsRequired() .HasColumnType("longtext"); + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + b.Property("OwnerId") .HasColumnType("int"); - b.Property("PleskId") - .HasColumnType("int"); - - b.Property("PleskServerId") - .HasColumnType("int"); + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); b.HasKey("Id"); - b.HasIndex("OwnerId"); + b.HasIndex("AaPanelId"); - b.HasIndex("PleskServerId"); + b.HasIndex("OwnerId"); b.ToTable("Websites"); }); @@ -1018,21 +1007,21 @@ namespace Moonlight.App.Database.Migrations modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") .WithMany() .HasForeignKey("OwnerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Moonlight.App.Database.Entities.PleskServer", "PleskServer") - .WithMany() - .HasForeignKey("PleskServerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + b.Navigation("AaPanel"); b.Navigation("Owner"); - - b.Navigation("PleskServer"); }); modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => diff --git a/Moonlight/App/Exceptions/PleskException.cs b/Moonlight/App/Exceptions/PleskException.cs deleted file mode 100644 index 2623091..0000000 --- a/Moonlight/App/Exceptions/PleskException.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Runtime.Serialization; - -namespace Moonlight.App.Exceptions; - -[Serializable] -public class PleskException : Exception -{ - public int StatusCode { private get; set; } - - public PleskException() - { - } - - public PleskException(string message, int statusCode) : base(message) - { - StatusCode = statusCode; - } - - public PleskException(string message) : base(message) - { - } - - public PleskException(string message, Exception inner) : base(message, inner) - { - } - - protected PleskException( - SerializationInfo info, - StreamingContext context) : base(info, context) - { - } -} \ No newline at end of file diff --git a/Moonlight/App/Helpers/PleskApiHelper.cs b/Moonlight/App/Helpers/PleskApiHelper.cs deleted file mode 100644 index 6b3b07c..0000000 --- a/Moonlight/App/Helpers/PleskApiHelper.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System.Text; -using Moonlight.App.Database.Entities; -using Moonlight.App.Exceptions; -using Newtonsoft.Json; -using RestSharp; - -namespace Moonlight.App.Helpers; - -public class PleskApiHelper -{ - private readonly RestClient Client; - - public PleskApiHelper() - { - Client = new(); - } - - public async Task Get(PleskServer server, string resource) - { - var request = CreateRequest(server, resource); - - var response = await Client.GetAsync(request); - - if (!response.IsSuccessful) - { - if (response.StatusCode != 0) - { - throw new PleskException( - $"An error occured: ({response.StatusCode}) {response.Content}", - (int)response.StatusCode - ); - } - else - { - throw new Exception($"An internal error occured: {response.ErrorMessage}"); - } - } - - return JsonConvert.DeserializeObject(response.Content!)!; - } - - public async Task Post(PleskServer server, string resource, object? body) - { - var request = CreateRequest(server, resource); - - request.AddParameter("text/plain", - JsonConvert.SerializeObject(body), - ParameterType.RequestBody - ); - - var response = await Client.PostAsync(request); - - if (!response.IsSuccessful) - { - if (response.StatusCode != 0) - { - throw new PleskException( - $"An error occured: ({response.StatusCode}) {response.Content}", - (int)response.StatusCode - ); - } - else - { - throw new Exception($"An internal error occured: {response.ErrorMessage}"); - } - } - - return JsonConvert.DeserializeObject(response.Content!)!; - } - - public async Task Delete(PleskServer server, string resource, object? body) - { - var request = CreateRequest(server, resource); - - if(body != null) - request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - - var response = await Client.DeleteAsync(request); - - if (!response.IsSuccessful) - { - if (response.StatusCode != 0) - { - throw new PleskException( - $"An error occured: ({response.StatusCode}) {response.Content}", - (int)response.StatusCode - ); - } - else - { - throw new Exception($"An internal error occured: {response.ErrorMessage}"); - } - } - } - - private RestRequest CreateRequest(PleskServer server, string resource) - { - RestRequest request = new(server.BaseUrl + "/" + resource); - - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - - // Implementation of auth method using auth header and api key - // https://docs.plesk.com/en-US/obsidian/api-rpc/about-rest-api.79359/#authentication-methods - - if (server.ApiKey.Contains(":")) - { - var base64 = Convert.ToBase64String( - Encoding.ASCII.GetBytes(server.ApiKey) - ); - - request.AddHeader("Authorization", "Basic " + base64); - } - else - request.AddHeader("X-API-Key", server.ApiKey); - - - return request; - } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs b/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs deleted file mode 100644 index 255bb09..0000000 --- a/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Requests; - -public class CreateDomain -{ - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("hosting_type")] - public string HostingType { get; set; } - - [JsonProperty("hosting_settings")] public HostingSettings HostingSettings { get; set; } = new(); - - [JsonProperty("owner_client")] public OwnerClient OwnerClient { get; set; } = new(); - - [JsonProperty("plan")] public Plan Plan { get; set; } = new(); -} - -public partial class HostingSettings -{ - [JsonProperty("ftp_login")] - public string FtpLogin { get; set; } - - [JsonProperty("ftp_password")] - public string FtpPassword { get; set; } -} - -public partial class OwnerClient -{ - [JsonProperty("id")] - public long Id { get; set; } -} - -public partial class Plan -{ - [JsonProperty("name")] - public string Name { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Client.cs b/Moonlight/App/Models/Plesk/Resources/Client.cs deleted file mode 100644 index 409bad5..0000000 --- a/Moonlight/App/Models/Plesk/Resources/Client.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class Client -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("created")] - public DateTimeOffset Created { get; set; } - - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("company")] - public string Company { get; set; } - - [JsonProperty("login")] - public string Login { get; set; } - - [JsonProperty("status")] - public long Status { get; set; } - - [JsonProperty("email")] - public string Email { get; set; } - - [JsonProperty("locale")] - public string Locale { get; set; } - - [JsonProperty("guid")] - public Guid Guid { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("type")] - public string Type { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Identifier.cs b/Moonlight/App/Models/Plesk/Resources/Identifier.cs deleted file mode 100644 index c99eec6..0000000 --- a/Moonlight/App/Models/Plesk/Resources/Identifier.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class Identifier -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("guid")] - public Guid Guid { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Repositories/PleskServerRepository.cs b/Moonlight/App/Repositories/PleskServerRepository.cs deleted file mode 100644 index 5374263..0000000 --- a/Moonlight/App/Repositories/PleskServerRepository.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Moonlight.App.Database; -using Moonlight.App.Database.Entities; - -namespace Moonlight.App.Repositories; - -public class PleskServerRepository : IDisposable -{ - private readonly DataContext DataContext; - - public PleskServerRepository(DataContext dataContext) - { - DataContext = dataContext; - } - - public DbSet Get() - { - return DataContext.PleskServers; - } - - public PleskServer Add(PleskServer pleskServer) - { - var x = DataContext.PleskServers.Add(pleskServer); - DataContext.SaveChanges(); - return x.Entity; - } - - public void Update(PleskServer pleskServer) - { - DataContext.PleskServers.Update(pleskServer); - DataContext.SaveChanges(); - } - - public void Delete(PleskServer pleskServer) - { - DataContext.PleskServers.Remove(pleskServer); - DataContext.SaveChanges(); - } - - public void Dispose() - { - DataContext.Dispose(); - } -} \ No newline at end of file diff --git a/Moonlight/App/Services/WebsiteService.cs b/Moonlight/App/Services/WebsiteService.cs index 595e8d5..4cdda65 100644 --- a/Moonlight/App/Services/WebsiteService.cs +++ b/Moonlight/App/Services/WebsiteService.cs @@ -1,9 +1,7 @@ -using Microsoft.EntityFrameworkCore; +using aaPanelSharp; +using Microsoft.EntityFrameworkCore; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; -using Moonlight.App.Helpers; -using Moonlight.App.Models.Plesk.Requests; -using Moonlight.App.Models.Plesk.Resources; using Moonlight.App.Repositories; namespace Moonlight.App.Services; @@ -11,100 +9,31 @@ namespace Moonlight.App.Services; public class WebsiteService { private readonly WebsiteRepository WebsiteRepository; - private readonly PleskServerRepository PleskServerRepository; - private readonly PleskApiHelper PleskApiHelper; - public WebsiteService(WebsiteRepository websiteRepository, PleskServerRepository pleskServerRepository, - PleskApiHelper pleskApiHelper) + public WebsiteService(WebsiteRepository websiteRepository) { WebsiteRepository = websiteRepository; - PleskServerRepository = pleskServerRepository; - PleskApiHelper = pleskApiHelper; } - public async Task Create(User owner, string baseDomain, string ftpPassword, PleskServer? ps = null) + public Website Create(AaPanel aaPanel, User user, string name) { - var pleskServer = ps ?? PleskServerRepository.Get().FirstOrDefault(); + if (WebsiteRepository.Get().Any(x => x.DomainName == name)) + throw new DisplayException("A website with this domain has already been created"); - if (pleskServer == null) - throw new DisplayException("No plesk server found to deploy the website"); - - var website = WebsiteRepository.Add(new Website() + var access = new aaPanel(aaPanel.Url, aaPanel.Key); + return null; + } + + private aaPanel CreateApiAccess(Website website) + { + if (website.AaPanel == null) { - PleskServer = pleskServer, - Owner = owner, - BaseDomain = baseDomain - }); - - try - { - var userId = await GetAdminAccountForDeploy(pleskServer); - - string ftpUsername = baseDomain.Replace(".", "_"); - - var createDomain = new CreateDomain() - { - Description = "Moonlight website " + website.Id, - Name = baseDomain, - OwnerClient = new() - { - Id = userId - }, - Plan = new() - { - Name = "Unlimited" - }, - HostingType = "virtual", - HostingSettings = new() - { - FtpLogin = ftpUsername, - FtpPassword = ftpPassword - } - }; - - var identifier = await PleskApiHelper.Post( - pleskServer, - "domains", - createDomain - ); - - website.PleskId = identifier.Id; - - WebsiteRepository.Update(website); - - return website; + website = WebsiteRepository + .Get() + .Include(x => x.AaPanel) + .First(x => x.Id == website.Id); } - catch (Exception e) - { - WebsiteRepository.Delete(website); - - throw; - } - } - - public async Task Delete(Website w) - { - var website = WebsiteRepository - .Get() - .Include(x => x.PleskServer) - .FirstOrDefault(x => x.Id == w.Id); - - if (website == null) - throw new DisplayException("Website not found"); - - await PleskApiHelper.Delete(website.PleskServer, $"domains/{website.PleskId}", null); - WebsiteRepository.Delete(website); - } - - private async Task GetAdminAccountForDeploy(PleskServer pleskServer) - { - var clients = await PleskApiHelper.Get(pleskServer, "clients"); - var adminClient = clients.FirstOrDefault(x => x.Type == "admin"); - - if (adminClient == null) - throw new DisplayException("Unable to deploy website. Plesk admin account is missing"); - - return adminClient.Id; + return new aaPanel(website.AaPanel.Url, website.AaPanel.Key); } } \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index d1cf4b6..4543609 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -65,7 +65,6 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -121,7 +120,6 @@ namespace Moonlight builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddScoped(); - builder.Services.AddScoped(); // Background services builder.Services.AddSingleton(); diff --git a/Moonlight/Shared/Components/Forms/WSelect.razor b/Moonlight/Shared/Components/Forms/WSelect.razor deleted file mode 100644 index 040a9ff..0000000 --- a/Moonlight/Shared/Components/Forms/WSelect.razor +++ /dev/null @@ -1,43 +0,0 @@ -@typeparam TItem - - - -@code -{ - [Parameter] - public TItem[] Items { get; set; } - - [Parameter] - public Func DisplayField { get; set; } - - [Parameter] - public Action OnChange { get; set; } - - private int Binding - { - get - { - if (Value == null) - return -1; - - return Value.GetHashCode(); - } - set - { - var i = Items.FirstOrDefault(x => x!.GetHashCode() == value); - - if (i != null) - { - Value = i; - OnChange?.Invoke(Value); - } - } - } - - private TItem Value; -} diff --git a/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor b/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor deleted file mode 100644 index 40b9802..0000000 --- a/Moonlight/Shared/Components/Navigations/AdminWebsiteNavigation.razor +++ /dev/null @@ -1,22 +0,0 @@ -
-
- -
-
- -@code -{ - [Parameter] - public int Index { get; set; } = 0; -} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor index 88778c2..5ce76e1 100644 --- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor +++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor @@ -155,13 +155,32 @@ else
-
- +
+ - + - Websites - + aaPanel + + +
+
+ + + + + Overview + +
+
+ + + + + Databases + +
+
diff --git a/Moonlight/Shared/Views/Admin/Websites/Index.razor b/Moonlight/Shared/Views/Admin/Websites/Index.razor deleted file mode 100644 index e7be04b..0000000 --- a/Moonlight/Shared/Views/Admin/Websites/Index.razor +++ /dev/null @@ -1,93 +0,0 @@ -@page "/admin/websites/" - -@using Moonlight.Shared.Components.Navigations -@using BlazorTable -@using Microsoft.EntityFrameworkCore -@using Moonlight.App.Database.Entities -@using Moonlight.App.Repositories -@using Moonlight.App.Services -@using Moonlight.App.Services.Interop - -@inject WebsiteRepository WebsiteRepository -@inject SmartTranslateService SmartTranslateService -@inject ToastService ToastService -@inject WebsiteService WebsiteService - - - - - -
-
-

- - Websites - -

-
- - - Add new website - -
-
-
-
- - - - - - - - - - - - - - - -
-
-
-
- - - -@code -{ - private LazyLoader LazyLoader; - - private Website[] Websites; - - private Task Load(LazyLoader lazyLoader) - { - Websites = WebsiteRepository - .Get() - .Include(x => x.Owner) - .Include(x => x.PleskServer) - .ToArray(); - - return Task.CompletedTask; - } - - private async Task Delete(Website website) - { - await WebsiteService.Delete(website); - await ToastService.Success(SmartTranslateService.Translate("Successfully deleted website")); - await LazyLoader.Reload(); - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Websites/New.razor b/Moonlight/Shared/Views/Admin/Websites/New.razor deleted file mode 100644 index 7f515db..0000000 --- a/Moonlight/Shared/Views/Admin/Websites/New.razor +++ /dev/null @@ -1,122 +0,0 @@ -@page "/admin/websites/new" - -@using Blazored.Typeahead -@using Logging.Net -@using Moonlight.App.Database.Entities -@using Moonlight.App.Repositories -@using Moonlight.App.Services -@using Moonlight.App.Services.Interop - -@inject UserRepository UserRepository -@inject PleskServerRepository PleskServerRepository -@inject SmartTranslateService SmartTranslateService -@inject WebsiteService WebsiteService -@inject NavigationManager NavigationManager -@inject ToastService ToastService - - -
- -
-
-
-
-
- - -
-
- - -
-
-
- - - @(context.Email) - - - @(context.Email) - - -
-
-
- - - -
-
- - - - Back - -
-
-
-
-
- -
- - -@code -{ - // Cached data - private User[] Users; - private PleskServer[] PleskServers; - - private User User; - private PleskServer? PleskServer; - private string BaseDomain = ""; - private string FtpPassword = ""; - - private Task Load(LazyLoader lazyLoader) - { - Users = UserRepository - .Get() - .ToArray(); - - User = Users.First(); - - PleskServers = PleskServerRepository - .Get() - .ToArray(); - - return Task.CompletedTask; - } - - private Task> SearchUsers(string input) - { - if (string.IsNullOrEmpty(input)) - { - return Task.FromResult(Array.Empty().Cast()); - } - else - { - return Task.FromResult(Users.Where(x => x.Email.ToLower().StartsWith(input))); - } - } - - private async Task Create() - { - await WebsiteService.Create(User, BaseDomain, FtpPassword, PleskServer); - - await ToastService.Success(SmartTranslateService.Translate("Website successfully created")); - NavigationManager.NavigateTo("/admin/websites"); - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor b/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor deleted file mode 100644 index 512ba61..0000000 --- a/Moonlight/Shared/Views/Admin/Websites/Servers/Index.razor +++ /dev/null @@ -1,58 +0,0 @@ -@page "/admin/websites/servers" - -@using Moonlight.App.Repositories -@using Moonlight.App.Services -@using BlazorTable -@using Moonlight.App.Database.Entities -@using Moonlight.Shared.Components.Navigations - -@inject PleskServerRepository PleskServerRepository -@inject SmartTranslateService SmartTranslateService - - - - - -
-
-

- - Plesk servers - -

-
- - - Add new plesk server - -
-
-
-
- - - - - -
-
-
-
- - - -@code -{ - private LazyLoader LazyLoader; - - private PleskServer[] PleskServers; - - private Task Load(LazyLoader lazyLoader) - { - PleskServers = PleskServerRepository - .Get() - .ToArray(); - - return Task.CompletedTask; - } -} diff --git a/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor b/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor deleted file mode 100644 index bb79e50..0000000 --- a/Moonlight/Shared/Views/Admin/Websites/Servers/New.razor +++ /dev/null @@ -1,64 +0,0 @@ -@page "/admin/websites/servers/new" -@using Moonlight.App.Repositories -@using Moonlight.App.Services -@using Microsoft.AspNetCore.Components -@using Moonlight.App.Database.Entities - -@inject PleskServerRepository PleskServerRepository -@inject SmartTranslateService SmartTranslateService -@inject NavigationManager NavigationManager - - -
-
-
-
-
-
- - -
-
- - -
-
- - -
-
- - - - Back - -
-
-
-
-
-
- - -@code -{ - private PleskServer NewServer = new(); - - private Task Create() - { - PleskServerRepository.Add(NewServer); - - NavigationManager.NavigateTo("/admin/websites/servers"); - - return Task.CompletedTask; - } -} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 5ad43d4..038b7e8 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -394,14 +394,3 @@ Discord id;Discord id Discord username;Discord username Discord discriminator;Discord discriminator The Name field is required.;The Name field is required. -Plesk servers;Plesk servers -Add new plesk server;Add new plesk server -Base url;Base url -Api key;Api key -Add new website;Add new website -Plesk id;Plesk id -Plesk server;Plesk server -Base domain;Base domain -Ftp password;Ftp password -Website successfully created;Website successfully created -Successfully deleted website;Successfully deleted website \ No newline at end of file From b5b2dea0c756758920e67b0695d8f2c7cb2f4ed1 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 27 Mar 2023 03:25:41 +0200 Subject: [PATCH 05/39] Added form proccessing screen (not finished). Some ui changes. User model form validations partly --- Moonlight/App/Database/Entities/User.cs | 9 +++- Moonlight/Shared/Components/Auth/Login.razor | 40 +++++++------- .../Shared/Components/Forms/SmartForm.razor | 52 +++++++++++++------ .../Shared/Components/Partials/Navbar.razor | 12 ++--- Moonlight/resources/lang/de_de.lang | 5 ++ 5 files changed, 71 insertions(+), 47 deletions(-) diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs index 76d23e4..0196571 100644 --- a/Moonlight/App/Database/Entities/User.cs +++ b/Moonlight/App/Database/Entities/User.cs @@ -1,4 +1,5 @@ -using Moonlight.App.Models.Misc; +using System.ComponentModel.DataAnnotations; +using Moonlight.App.Models.Misc; namespace Moonlight.App.Database.Entities; @@ -10,7 +11,13 @@ public class User public string FirstName { get; set; } = ""; public string LastName { get; set; } = ""; + + [Required(ErrorMessage = "You need to enter an email address")] + [EmailAddress(ErrorMessage = "You need to enter a valid email address")] public string Email { get; set; } = ""; + + [Required(ErrorMessage = "You need to enter a password")] + [MinLength(8, ErrorMessage = "You need to enter a password with minimum 8 characters in lenght")] public string Password { get; set; } = ""; public string Address { get; set; } = ""; public string City { get; set; } = ""; diff --git a/Moonlight/Shared/Components/Auth/Login.razor b/Moonlight/Shared/Components/Auth/Login.razor index ccf9177..f9b27e7 100644 --- a/Moonlight/Shared/Components/Auth/Login.razor +++ b/Moonlight/Shared/Components/Auth/Login.razor @@ -9,6 +9,7 @@ @using Moonlight.App.Services @using Moonlight.App.Exceptions @using Logging.Net +@using Moonlight.App.Database.Entities @using Moonlight.App.Services.OAuth2 @using Moonlight.App.Services.Sessions @@ -24,10 +25,10 @@
-
+ @if (!TotpRequired) { -
+

Sign In

@@ -61,12 +62,12 @@
-
- +
+
-
- +
+
@@ -78,11 +79,9 @@
- - +
} else @@ -106,7 +105,7 @@ Sign up
-
+
@@ -114,8 +113,7 @@ @code { - private string Email = ""; - private string Password = ""; + private User User = new(); private bool TotpRequired = false; private string TotpCode = ""; @@ -124,16 +122,16 @@ { try { - Email = Email.ToLower().Trim(); - - TotpRequired = await UserService.CheckTotp(Email, Password); + User.Email = User.Email.ToLower().Trim(); + + TotpRequired = await UserService.CheckTotp(User.Email, User.Password); if (!TotpRequired) { - var token = await UserService.Login(Email, Password); + var token = await UserService.Login(User.Email, User.Password); await CookieService.SetValue("token", token, 10); - - if(NavigationManager.Uri.EndsWith("login")) + + if (NavigationManager.Uri.EndsWith("login")) NavigationManager.NavigateTo("/", true); else NavigationManager.NavigateTo(NavigationManager.Uri, true); @@ -167,7 +165,7 @@ var url = await GoogleOAuth2Service.GetUrl(); NavigationManager.NavigateTo(url, true); } - + private async Task DoDiscord() { var url = await DiscordOAuth2Service.GetUrl(); diff --git a/Moonlight/Shared/Components/Forms/SmartForm.razor b/Moonlight/Shared/Components/Forms/SmartForm.razor index 615ebef..0eb2300 100644 --- a/Moonlight/Shared/Components/Forms/SmartForm.razor +++ b/Moonlight/Shared/Components/Forms/SmartForm.razor @@ -3,17 +3,27 @@
- @if (ErrorMessages.Any()) + @if (Working) { -
- @foreach (var msg in ErrorMessages) - { - @(msg) -
- } +
+ + Proccessing
} - @(ChildContent) + else + { + if (ErrorMessages.Any()) + { +
+ @foreach (var msg in ErrorMessages) + { + @(msg) +
+ } +
+ } + @(ChildContent) + }
@@ -21,16 +31,16 @@ { [Parameter] public object Model { get; set; } - - [Parameter] + + [Parameter] public EventCallback OnValidSubmit { get; set; } - + [Parameter] public EventCallback OnInvalidSubmit { get; set; } - + [Parameter] public EventCallback OnSubmit { get; set; } - + [Parameter] public RenderFragment ChildContent { get; set; } @@ -38,6 +48,8 @@ private List ErrorMessages = new(); + private bool Working = false; + protected override void OnAfterRender(bool firstRender) { if (firstRender) @@ -49,10 +61,18 @@ private async Task ValidSubmit(EditContext context) { ErrorMessages.Clear(); + Working = true; + await InvokeAsync(StateHasChanged); - await OnValidSubmit.InvokeAsync(context); - await OnSubmit.InvokeAsync(context); + await Task.Run(async () => + { + await InvokeAsync(() => OnValidSubmit.InvokeAsync(context)); + await InvokeAsync(() => OnSubmit.InvokeAsync(context)); + + Working = false; + await InvokeAsync(StateHasChanged); + }); } private async Task InvalidSubmit(EditContext context) @@ -66,7 +86,7 @@ } await InvokeAsync(StateHasChanged); - + await OnInvalidSubmit.InvokeAsync(context); await OnSubmit.InvokeAsync(context); } diff --git a/Moonlight/Shared/Components/Partials/Navbar.razor b/Moonlight/Shared/Components/Partials/Navbar.razor index 75bdcf6..9952884 100644 --- a/Moonlight/Shared/Components/Partials/Navbar.razor +++ b/Moonlight/Shared/Components/Partials/Navbar.razor @@ -20,15 +20,9 @@ @if (User != null) {
-
- - - - - - - -
+ + +
diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 038b7e8..fa0b798 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -394,3 +394,8 @@ Discord id;Discord id Discord username;Discord username Discord discriminator;Discord discriminator The Name field is required.;The Name field is required. +An error occured while logging you in;An error occured while logging you in +You need to enter an email address;You need to enter an email address +You need to enter a password;You need to enter a password +You need to enter a password with minimum 8 characters in lenght;You need to enter a password with minimum 8 characters in lenght +Proccessing;Proccessing From 863c8cad7f8f26b758d94708bf71ae45ba2489cc Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 27 Mar 2023 15:51:27 +0200 Subject: [PATCH 06/39] Update Index.razor --- Moonlight/Shared/Views/Index.razor | 36 +++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Shared/Views/Index.razor index c07a66b..44de796 100644 --- a/Moonlight/Shared/Views/Index.razor +++ b/Moonlight/Shared/Views/Index.razor @@ -96,11 +96,16 @@
-
-
- - Create something new - + +
+
+
+

+ Create something new +

+
+
+
@@ -115,6 +120,7 @@
+
@@ -128,6 +134,7 @@
+
@@ -141,6 +148,7 @@
+
@@ -157,11 +165,16 @@
-
-
- - Manage your services - + +
+
+
+

+ Manage your services +

+
+
+
@@ -176,6 +189,7 @@
+
@@ -189,6 +203,7 @@
+
@@ -202,6 +217,7 @@
+
From dc3d2b77f9ebe52279ca0b86b8b91c588d310829 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:14:38 +0200 Subject: [PATCH 07/39] User Settings form --- Moonlight/Shared/Views/Profile/Index.razor | 83 +++++++++++++++++++++- Moonlight/resources/lang/de_de.lang | 7 ++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor index 5f0511c..bbac5f7 100644 --- a/Moonlight/Shared/Views/Profile/Index.razor +++ b/Moonlight/Shared/Views/Profile/Index.razor @@ -1,4 +1,85 @@ @page "/profile" @using Moonlight.Shared.Components.Navigations +@using Moonlight.App.Services.Sessions +@using Moonlight.App.Database.Entities +@inject IdentityService IdentityService - \ No newline at end of file + + + + +
+
+
+

Persönliche Daten

+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ + + +@code +{ + private User User = new User(); + + + private async Task Load(LazyLoader loader) + { + User = await IdentityService.Get(); + } +} diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 038b7e8..37f97fd 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -394,3 +394,10 @@ Discord id;Discord id Discord username;Discord username Discord discriminator;Discord discriminator The Name field is required.;The Name field is required. +The FirstName field is required.;The FirstName field is required. +The LastName field is required.;The LastName field is required. +The Address field is required.;The Address field is required. +The City field is required.;The City field is required. +The State field is required.;The State field is required. +The Country field is required.;The Country field is required. +Street and house number requered;Street and house number requered From f178c59661b520ad143cb2f0359c19e536be2ba8 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:15:07 +0200 Subject: [PATCH 08/39] regexes; thank you, google --- Moonlight/App/Database/Entities/User.cs | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs index 76d23e4..40f0eae 100644 --- a/Moonlight/App/Database/Entities/User.cs +++ b/Moonlight/App/Database/Entities/User.cs @@ -1,4 +1,5 @@ -using Moonlight.App.Models.Misc; +using System.ComponentModel.DataAnnotations; +using Moonlight.App.Models.Misc; namespace Moonlight.App.Database.Entities; @@ -8,13 +9,35 @@ public class User // Personal data + [Required] + [MinLength(3, ErrorMessage = "Invalid first name")] public string FirstName { get; set; } = ""; + + [Required] + [MinLength(3, ErrorMessage = "Invalid last name")] public string LastName { get; set; } = ""; + + [Required] + [RegularExpression(@"^((((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)[;]?)+$", + ErrorMessage = "Must be a valid email")] public string Email { get; set; } = ""; + public string Password { get; set; } = ""; + + [Required] + [RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$", ErrorMessage = "Street and house number required")] public string Address { get; set; } = ""; + + [Required] + [MinLength(3, ErrorMessage = "Invalid city")] public string City { get; set; } = ""; + + [Required] + [MinLength(3, ErrorMessage = "Invalid state")] public string State { get; set; } = ""; + + [Required] + [MinLength(3, ErrorMessage = "Invalid country")] public string Country { get; set; } = ""; // States From 37c8e640a7527ad135c9048a020d70181bff46cc Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:20:08 +0200 Subject: [PATCH 09/39] Account data save --- Moonlight/Shared/Views/Profile/Index.razor | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor index bbac5f7..81fd74d 100644 --- a/Moonlight/Shared/Views/Profile/Index.razor +++ b/Moonlight/Shared/Views/Profile/Index.razor @@ -1,13 +1,17 @@ @page "/profile" + @using Moonlight.Shared.Components.Navigations @using Moonlight.App.Services.Sessions @using Moonlight.App.Database.Entities +@using Moonlight.App.Repositories + @inject IdentityService IdentityService +@inject UserRepository UserRepository - +
@@ -82,4 +86,9 @@ { User = await IdentityService.Get(); } + + private void Save() + { + UserRepository.Update(User); + } } From ee661f7fd4f750d9d810d0df4a217e022d670af8 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:23:56 +0200 Subject: [PATCH 10/39] more form validation --- Moonlight/App/Database/Entities/User.cs | 10 +++++++++- Moonlight/resources/lang/de_de.lang | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs index 40f0eae..e0f4583 100644 --- a/Moonlight/App/Database/Entities/User.cs +++ b/Moonlight/App/Database/Entities/User.cs @@ -11,33 +11,41 @@ public class User [Required] [MinLength(3, ErrorMessage = "Invalid first name")] + [MaxLength(64, ErrorMessage = "Max lenght reached")] public string FirstName { get; set; } = ""; [Required] [MinLength(3, ErrorMessage = "Invalid last name")] + [MaxLength(64, ErrorMessage = "Max lenght reached")] public string LastName { get; set; } = ""; [Required] [RegularExpression(@"^((((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)[;]?)+$", ErrorMessage = "Must be a valid email")] + [MaxLength(128, ErrorMessage = "Max lenght reached")] public string Email { get; set; } = ""; public string Password { get; set; } = ""; [Required] - [RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$", ErrorMessage = "Street and house number required")] + [RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$", + ErrorMessage = "Street and house number required")] + [MaxLength(128, ErrorMessage = "Max lenght reached")] public string Address { get; set; } = ""; [Required] [MinLength(3, ErrorMessage = "Invalid city")] + [MaxLength(128, ErrorMessage = "Max lenght reached")] public string City { get; set; } = ""; [Required] [MinLength(3, ErrorMessage = "Invalid state")] + [MaxLength(64, ErrorMessage = "Max lenght reached")] public string State { get; set; } = ""; [Required] [MinLength(3, ErrorMessage = "Invalid country")] + [MaxLength(64, ErrorMessage = "Max lenght reached")] public string Country { get; set; } = ""; // States diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 37f97fd..4c4a41a 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -401,3 +401,4 @@ The City field is required.;The City field is required. The State field is required.;The State field is required. The Country field is required.;The Country field is required. Street and house number requered;Street and house number requered +Max lenght reached;Max lenght reached From b38d9d2924cebdac29dfb2a291e0087bfbef2b0a Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Tue, 28 Mar 2023 18:45:38 +0200 Subject: [PATCH 11/39] Enhanced terminal ui and file editor ui --- Moonlight/Moonlight.csproj | 1 - Moonlight/Pages/_Layout.cshtml | 1 + .../FileManagerPartials/FileEditor.razor | 47 ++++++++++--------- .../ServerControl/ServerConsole.razor | 27 +++++------ Moonlight/Shared/Views/Server/Index.razor | 14 ++++-- Moonlight/resources/lang/de_de.lang | 4 +- Moonlight/wwwroot/assets/js/monacoTheme.js | 12 +++++ Moonlight/wwwroot/assets/media/svg/nodata.svg | 1 + 8 files changed, 66 insertions(+), 41 deletions(-) create mode 100644 Moonlight/wwwroot/assets/js/monacoTheme.js create mode 100644 Moonlight/wwwroot/assets/media/svg/nodata.svg diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index fa894e5..6ec2786 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -66,7 +66,6 @@ - diff --git a/Moonlight/Pages/_Layout.cshtml b/Moonlight/Pages/_Layout.cshtml index cbfcf6e..523da77 100644 --- a/Moonlight/Pages/_Layout.cshtml +++ b/Moonlight/Pages/_Layout.cshtml @@ -101,6 +101,7 @@ + diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor b/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor index 0a2888c..9af01b0 100644 --- a/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor +++ b/Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor @@ -3,27 +3,30 @@ @using Moonlight.Shared.Components.Partials @inject SmartTranslateService TranslationService +@inject IJSRuntime JsRuntime -
- -
- -@if (!HideControls) -{ -
-
- - -
+
+
+
-} + + @if (!HideControls) + { +
+
+ + +
+
+ } +
@code { @@ -53,8 +56,8 @@ { AutomaticLayout = true, Language = "plaintext", - Value = "Wird geladen", - Theme = "vs-dark", + Value = "Loading content", + Theme = "moonlight-theme", Contextmenu = false, Minimap = new() { @@ -68,6 +71,8 @@ { if (firstRender) { + await JsRuntime.InvokeVoidAsync("initMonacoTheme"); + Editor.OnDidInit = new EventCallback(this, async () => { EditorOptions.Language = Language; diff --git a/Moonlight/Shared/Components/ServerControl/ServerConsole.razor b/Moonlight/Shared/Components/ServerControl/ServerConsole.razor index 4beda00..474efa2 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerConsole.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerConsole.razor @@ -15,21 +15,20 @@ @inject AlertService AlertService @inject SmartTranslateService TranslationService -
- - -
-
+
+
+ +
- - + function checkEnter(event) + { + if (event.keyCode === 13) { + event.preventDefault(); + document.getElementById("sendCmd").click(); + } + } + +
diff --git a/Moonlight/Shared/Views/Server/Index.razor b/Moonlight/Shared/Views/Server/Index.razor index fbda472..3c10117 100644 --- a/Moonlight/Shared/Views/Server/Index.razor +++ b/Moonlight/Shared/Views/Server/Index.razor @@ -8,7 +8,6 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Helpers @using Moonlight.App.Repositories -@using Moonlight.App.Services.Sessions @using Moonlight.Shared.Components.Xterm @using Moonlight.Shared.Components.ServerControl @using Newtonsoft.Json @@ -16,13 +15,20 @@ @inject ImageRepository ImageRepository @inject ServerRepository ServerRepository @inject WingsConsoleHelper WingsConsoleHelper -@inject IdentityService IdentityService @if (CurrentServer == null) { -
- Server not found +
+
+ Not found image +
+

Server not found

+

+ A server with that id cannot be found or you have no access for this server +

+
+
} else diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 8f280da..1a6ac10 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -406,4 +406,6 @@ The City field is required.;The City field is required. The State field is required.;The State field is required. The Country field is required.;The Country field is required. Street and house number requered;Street and house number requered -Max lenght reached;Max lenght reached \ No newline at end of file +Max lenght reached;Max lenght reached +Server not found;Server not found +A server with that id cannot be found or you have no access for this server;A server with that id cannot be found or you have no access for this server diff --git a/Moonlight/wwwroot/assets/js/monacoTheme.js b/Moonlight/wwwroot/assets/js/monacoTheme.js new file mode 100644 index 0000000..168437a --- /dev/null +++ b/Moonlight/wwwroot/assets/js/monacoTheme.js @@ -0,0 +1,12 @@ +window.initMonacoTheme = function () +{ + monaco.editor.defineTheme('moonlight-theme', { + base: 'vs-dark', + inherit: true, + rules: [ + ], + colors: { + 'editor.background': '#000000' + } + }); +} \ No newline at end of file diff --git a/Moonlight/wwwroot/assets/media/svg/nodata.svg b/Moonlight/wwwroot/assets/media/svg/nodata.svg new file mode 100644 index 0000000..acdce06 --- /dev/null +++ b/Moonlight/wwwroot/assets/media/svg/nodata.svg @@ -0,0 +1 @@ + \ No newline at end of file From 02f6386f959b206620bff696d00f53e857ca899c Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Wed, 29 Mar 2023 21:34:14 +0200 Subject: [PATCH 12/39] Implementing new file manager. Not completed --- Moonlight/App/Helpers/Files/ContextAction.cs | 8 + Moonlight/App/Helpers/Files/FileData.cs | 8 + Moonlight/App/Helpers/Files/IFileAccess.cs | 19 + .../App/Helpers/Files/WingsFileAccess.cs | 118 ++++ .../App/Models/Files/FileContextAction.cs | 8 + .../FileManagerPartials/FileManager.razor | 523 ++--------------- .../FileManagerPartials/FileManager2.razor | 529 ++++++++++++++++++ .../FileManagerPartials/FileView.razor | 223 ++++++++ ...ServerPlugins.razor => ServerAddons.razor} | 2 +- .../ServerControl/ServerFiles.razor | 2 +- .../ServerControl/ServerNavigation.razor | 4 +- Moonlight/Shared/Views/Server/Index.razor | 6 +- Moonlight/Shared/Views/Test.razor | 58 +- Moonlight/resources/lang/de_de.lang | 2 + 14 files changed, 1002 insertions(+), 508 deletions(-) create mode 100644 Moonlight/App/Helpers/Files/ContextAction.cs create mode 100644 Moonlight/App/Helpers/Files/FileData.cs create mode 100644 Moonlight/App/Helpers/Files/IFileAccess.cs create mode 100644 Moonlight/App/Helpers/Files/WingsFileAccess.cs create mode 100644 Moonlight/App/Models/Files/FileContextAction.cs create mode 100644 Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor create mode 100644 Moonlight/Shared/Components/FileManagerPartials/FileView.razor rename Moonlight/Shared/Components/ServerControl/{ServerPlugins.razor => ServerAddons.razor} (81%) diff --git a/Moonlight/App/Helpers/Files/ContextAction.cs b/Moonlight/App/Helpers/Files/ContextAction.cs new file mode 100644 index 0000000..704c425 --- /dev/null +++ b/Moonlight/App/Helpers/Files/ContextAction.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Helpers.Files; + +public class ContextAction +{ + public string Id { get; set; } = ""; + public string Name { get; set; } = ""; + public Action Action { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/FileData.cs b/Moonlight/App/Helpers/Files/FileData.cs new file mode 100644 index 0000000..f0bb75f --- /dev/null +++ b/Moonlight/App/Helpers/Files/FileData.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Helpers.Files; + +public class FileData +{ + public string Name { get; set; } = ""; + public long Size { get; set; } + public bool IsFile { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/IFileAccess.cs b/Moonlight/App/Helpers/Files/IFileAccess.cs new file mode 100644 index 0000000..62b6ba5 --- /dev/null +++ b/Moonlight/App/Helpers/Files/IFileAccess.cs @@ -0,0 +1,19 @@ +namespace Moonlight.App.Helpers.Files; + +public interface IFileAccess +{ + public Task Ls(); + public Task Cd(string dir); + public Task Up(); + public Task SetDir(string dir); + public Task Read(FileData fileData); + public Task Write(FileData fileData, string content); + public Task Upload(string name, Stream stream, Action? progressUpdated = null); + public Task MkDir(string name); + public Task Pwd(); + public Task DownloadUrl(FileData fileData); + public Task DownloadStream(FileData fileData); + public Task Delete(FileData fileData); + public Task Move(FileData fileData, string newPath); + public Task GetLaunchUrl(); +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/WingsFileAccess.cs b/Moonlight/App/Helpers/Files/WingsFileAccess.cs new file mode 100644 index 0000000..2ddc57c --- /dev/null +++ b/Moonlight/App/Helpers/Files/WingsFileAccess.cs @@ -0,0 +1,118 @@ +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Wings.Resources; + +namespace Moonlight.App.Helpers.Files; + +public class WingsFileAccess : IFileAccess +{ + private readonly WingsApiHelper WingsApiHelper; + private readonly WingsJwtHelper WingsJwtHelper; + private readonly Server Server; + + private string CurrentPath = "/"; + + public WingsFileAccess(WingsApiHelper wingsApiHelper, WingsJwtHelper wingsJwtHelper,Server server) + { + WingsApiHelper = wingsApiHelper; + WingsJwtHelper = wingsJwtHelper; + Server = server; + + if (server.Node == null) + { + throw new ArgumentException("The wings file access server model needs to include the node data"); + } + } + + public async Task Ls() + { + var res = await WingsApiHelper.Get( + Server.Node, + $"api/servers/{Server.Uuid}/files/list-directory?directory={CurrentPath}" + ); + + var x = new List(); + + foreach (var response in res) + { + x.Add(new() + { + Name = response.Name, + Size = response.File ? response.Size : 0, + IsFile = response.File, + }); + } + + return x.ToArray(); + } + + public Task Cd(string dir) + { + var x = Path.Combine(CurrentPath, dir).Replace("\\", "/") + "/"; + x = x.Replace("//", "/"); + CurrentPath = x; + + return Task.CompletedTask; + } + + public Task Up() + { + CurrentPath = Path.GetFullPath(Path.Combine(CurrentPath, "..")).Replace("\\", "/").Replace("C:", ""); + return Task.CompletedTask; + } + + public Task SetDir(string dir) + { + CurrentPath = dir; + return Task.CompletedTask; + } + + public async Task Read(FileData fileData) + { + return await WingsApiHelper.GetRaw(Server.Node,$"api/servers/{Server.Uuid}/files/contents?file={CurrentPath}{fileData.Name}"); + } + + public async Task Write(FileData fileData, string content) + { + await WingsApiHelper.PostRaw(Server.Node,$"api/servers/{Server.Uuid}/files/write?file={CurrentPath}{fileData.Name}", content); + } + + public Task Upload(string name, Stream stream, Action? progressUpdated = null) + { + throw new NotImplementedException(); + } + + public Task MkDir(string name) + { + throw new NotImplementedException(); + } + + public Task Pwd() + { + return Task.FromResult(CurrentPath); + } + + public Task DownloadUrl(FileData fileData) + { + throw new NotImplementedException(); + } + + public Task DownloadStream(FileData fileData) + { + throw new NotImplementedException(); + } + + public Task Delete(FileData fileData) + { + throw new NotImplementedException(); + } + + public Task Move(FileData fileData, string newPath) + { + throw new NotImplementedException(); + } + + public Task GetLaunchUrl() + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Files/FileContextAction.cs b/Moonlight/App/Models/Files/FileContextAction.cs new file mode 100644 index 0000000..7570013 --- /dev/null +++ b/Moonlight/App/Models/Files/FileContextAction.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Models.Files; + +public class FileContextAction +{ + public string Id { get; set; } + public string Name { get; set; } + public Action Action { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor index cf8c13b..64635cd 100644 --- a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor +++ b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor @@ -1,97 +1,20 @@ -@using Moonlight.App.Helpers -@using BlazorContextMenu -@using BlazorDownloadFile +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Helpers @using Logging.Net -@using Moonlight.App.Models.Files -@using Moonlight.App.Services -@using Moonlight.App.Services.Interop -@inject AlertService AlertService -@inject ToastService ToastService -@inject NavigationManager NavigationManager -@inject SmartTranslateService TranslationService -@inject IBlazorDownloadFileService FileService - -
-@if (Editing == null) +@if (Editing) { -
-
-
- - - - - - - -
-
-
- @if (SelectedFiles.Count == 0) - { -
- - - - -
- } - else - { -
-
- - @(SelectedFiles.Count) - - Selected -
- - -
- } -
-
-
+ + +} +else +{ +
@@ -124,406 +47,84 @@
-
- @if (Loading) - { -
- - Loading - -
- } - else - { -
- - - - - - - - - - - - @foreach (var obj in Objects.Where(x => x.Name.Contains(Search))) - { - - - - - - - - } - -
-
- -
- 		- File name - - File size - - Last modified -
-
- -
- 		-
- @if (obj.IsFile) - { - - - - - - - } - else - { - - - - - - - } +
- @if (obj.IsFile) - { - @(obj.Name) - } - else - { - @(obj.Name) - } - - 		- @(Formatter.FormatSize(obj.Size)) - - @(obj.UpdatedAt.ToShortDateString()) @(obj.UpdatedAt.ToShortTimeString()) - -
-
- - - -
-
-
-
- } -
+
+ +
} -else -{ - if (Loading) - { -
- - Loading - -
- } - else - { - - } -} -
- - - Rename - Move - Archive - Unarchive - Download - Delete - @code { [Parameter] - public IFileAccess FileAccess { get; set; } + public IFileAccess Access { get; set; } - // Data + private bool Editing = false; + private string EditorInitialData = ""; + private string EditorLanguage = ""; + private FileData EditingFile; + private FileEditor Editor; - private List SelectedFiles { get; set; } = new(); - private List Objects { get; set; } = new(); - private string CurrentPath = ""; + private FileView View; + private string CurrentPath = "/"; - // Search - private string SearchValue = ""; - - private string Search + private ContextAction[] Actions = { - get { return SearchValue; } - set + new() { - SearchValue = value; - InvokeAsync(StateHasChanged); + Id = "rename", + Name = "Rename", + Action = (x) => { } } - } + }; - // States - private bool Loading = false; - - // States - Editor - private FileManagerObject? Editing = null; - private string InitialEditorData = ""; - private string Language = "plaintext"; - - // States - File Upload - private bool Uploading = false; - private int Percent = 0; - - protected override async Task OnAfterRenderAsync(bool firstRender) + private async Task OnElementClicked(FileData fileData) { - if (firstRender) + if (fileData.IsFile) { - await RefreshActive(); - } - } + EditorInitialData = await Access.Read(fileData); + EditorLanguage = MonacoTypeHelper.GetEditorType(fileData.Name); + EditingFile = fileData; - private async Task RefreshActive() - { - Loading = true; - await InvokeAsync(StateHasChanged); - - await Refresh(false); - - Loading = false; - await InvokeAsync(StateHasChanged); - } - - private async Task Refresh(bool rerender = true) - { - SelectedFiles.Clear(); - Objects.Clear(); - CurrentPath = await FileAccess.GetCurrentPath(); - - var data = await FileAccess.GetDirectoryContent(); - Objects = data.ToList(); - - if (rerender) + Editing = true; await InvokeAsync(StateHasChanged); - } - private async Task CdPath(string path) - { - await FileAccess.ChangeDirectory(path); - await RefreshActive(); - } - - private async Task SetPath(string path) - { - await FileAccess.SetDirectory(path); - await RefreshActive(); - } - - private async Task OnContextMenuClick(ItemClickEventArgs e) - { - var data = e.Data as FileManagerObject; - - if (data == null) - return; - - switch (e.MenuItem.Id) - { - case "delete": - await FileAccess.Delete(data); - break; - case "download": - if (data.IsFile) - { - try - { - var stream = await FileAccess.GetDownloadStream(data); - await ToastService.Info(TranslationService.Translate("Starting download")); - await FileService.AddBuffer(stream); - await FileService.DownloadBinaryBuffers(data.Name); - } - catch (NotImplementedException) - { - try - { - var url = await FileAccess.GetDownloadUrl(data); - NavigationManager.NavigateTo(url, true); - await ToastService.Info(TranslationService.Translate("Starting download")); - } - catch (Exception exception) - { - await ToastService.Error(TranslationService.Translate("Error starting download")); - Logger.Error("Error downloading file"); - Logger.Error(exception.Message); - } - } - catch (Exception exception) - { - await ToastService.Error(TranslationService.Translate("Error starting download")); - Logger.Error("Error downloading file stream"); - Logger.Error(exception.Message); - } - } - break; - case "rename": - var newName = await AlertService.Text(TranslationService.Translate("Rename"), TranslationService.Translate("Enter a new name"), data.Name); - var path = await FileAccess.GetCurrentPath(); - await FileAccess.Move(data, path + "/" + newName); - break; - } - - await Refresh(false); - } - - private async Task OnFileToggle(ChangeEventArgs obj, FileManagerObject o) - { - if ((bool)obj.Value) - { - if (SelectedFiles.Contains(o)) - return; - - SelectedFiles.Add(o); - await InvokeAsync(StateHasChanged); + return true; } else { - if (!SelectedFiles.Contains(o)) - return; - - SelectedFiles.Remove(o); - await InvokeAsync(StateHasChanged); + return false; } } - private async Task OnAllFileToggle(ChangeEventArgs obj) + public async Task SetPath(string path) { - if ((bool)obj.Value) + await Access.SetDir(path); + CurrentPath = await Access.Pwd(); + + await InvokeAsync(StateHasChanged); + } + + private async void Cancel(bool save = false) + { + if (save) { - foreach (var o in Objects) - { - if (SelectedFiles.Contains(o)) - continue; - - SelectedFiles.Add(o); - } - - await InvokeAsync(StateHasChanged); - } - else - { - foreach (var o in Objects) - { - if (!SelectedFiles.Contains(o)) - continue; - - SelectedFiles.Remove(o); - } - - - await InvokeAsync(StateHasChanged); - } - } - - private async Task CreateFolder() - { - var name = await AlertService.Text(TranslationService.Translate("Create a new folder"), TranslationService.Translate("Enter a name"), ""); - - if (string.IsNullOrEmpty(name)) - return; - - await FileAccess.CreateDirectory(name); - await Refresh(); - } - - private async void SaveFile(string data) - { - if (Editing == null) - return; - - await FileAccess.WriteFile(Editing, data); - Editing = null; - await Refresh(); - } - - private async Task OpenFile(FileManagerObject o) - { - Editing = o; - Loading = true; - await InvokeAsync(StateHasChanged); - - InitialEditorData = await FileAccess.ReadFile(Editing); - Language = MonacoTypeHelper.GetEditorType(Editing.Name); - - Loading = false; - await InvokeAsync(StateHasChanged); - } - - private async void CloseFile() - { - Editing = null; - await InvokeAsync(StateHasChanged); - } - - private async Task Launch() - { - NavigationManager.NavigateTo(await FileAccess.GetLaunchUrl()); - } - - private async Task OnFileChanged(InputFileChangeEventArgs arg) - { - Uploading = true; - await InvokeAsync(StateHasChanged); - - foreach (var browserFile in arg.GetMultipleFiles()) - { - if (browserFile.Size < 1024 * 1024 * 100) - { - Percent = 0; - - try - { - await FileAccess.UploadFile( - browserFile.Name, - browserFile.OpenReadStream(1024 * 1024 * 100), - async (i) => - { - Percent = i; - - Task.Run(() => { InvokeAsync(StateHasChanged); }); - }); - - await Refresh(); - } - catch (Exception e) - { - await ToastService.Error(TranslationService.Translate("An unknown error occured while uploading a file")); - Logger.Error("Error uploading file"); - Logger.Error(e); - } - } - else - { - await ToastService.Error(TranslationService.Translate("The uploaded file should not be bigger than 100MB")); - } + var data = await Editor.GetData(); + await Access.Write(EditingFile, data); } - Uploading = false; + Editing = false; await InvokeAsync(StateHasChanged); + } - await ToastService.Success(TranslationService.Translate("File upload complete")); + private async void OnPathChanged(string path) + { + CurrentPath = path; + await InvokeAsync(StateHasChanged); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor b/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor new file mode 100644 index 0000000..cf8c13b --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileManager2.razor @@ -0,0 +1,529 @@ +@using Moonlight.App.Helpers +@using BlazorContextMenu +@using BlazorDownloadFile +@using Logging.Net +@using Moonlight.App.Models.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject AlertService AlertService +@inject ToastService ToastService +@inject NavigationManager NavigationManager +@inject SmartTranslateService TranslationService +@inject IBlazorDownloadFileService FileService + +
+@if (Editing == null) +{ +
+
+
+ + + + + + + +
+
+
+ @if (SelectedFiles.Count == 0) + { +
+ + + + +
+ } + else + { +
+
+ + @(SelectedFiles.Count) + + Selected +
+ + +
+ } +
+
+
+
+
+
+ @{ + var vx = "/"; + } + / + + + + + + @{ + var cp = "/"; + var lp = "/"; + var pathParts = CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathParts) + { + lp = cp; + @(path) + + + + + + + cp += path + "/"; + } + } +
+
+
+
+ @if (Loading) + { +
+ + Loading + +
+ } + else + { +
+ + + + + + + + + + + + @foreach (var obj in Objects.Where(x => x.Name.Contains(Search))) + { + + + + + + + + } + +
+
+ +
+ 		+ File name + + File size + + Last modified +
+
+ +
+ 		+
+ @if (obj.IsFile) + { + + + + + + + } + else + { + + + + + + + } + + @if (obj.IsFile) + { + @(obj.Name) + } + else + { + @(obj.Name) + } +
+ 		+ @(Formatter.FormatSize(obj.Size)) + + @(obj.UpdatedAt.ToShortDateString()) @(obj.UpdatedAt.ToShortTimeString()) + +
+
+ + + +
+
+
+
+ } +
+
+} +else +{ + if (Loading) + { +
+ + Loading + +
+ } + else + { + + } +} +
+ + + Rename + Move + Archive + Unarchive + Download + Delete + + +@code +{ + [Parameter] + public IFileAccess FileAccess { get; set; } + + // Data + + private List SelectedFiles { get; set; } = new(); + private List Objects { get; set; } = new(); + private string CurrentPath = ""; + + // Search + private string SearchValue = ""; + + private string Search + { + get { return SearchValue; } + set + { + SearchValue = value; + InvokeAsync(StateHasChanged); + } + } + + // States + private bool Loading = false; + + // States - Editor + private FileManagerObject? Editing = null; + private string InitialEditorData = ""; + private string Language = "plaintext"; + + // States - File Upload + private bool Uploading = false; + private int Percent = 0; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await RefreshActive(); + } + } + + private async Task RefreshActive() + { + Loading = true; + await InvokeAsync(StateHasChanged); + + await Refresh(false); + + Loading = false; + await InvokeAsync(StateHasChanged); + } + + private async Task Refresh(bool rerender = true) + { + SelectedFiles.Clear(); + Objects.Clear(); + CurrentPath = await FileAccess.GetCurrentPath(); + + var data = await FileAccess.GetDirectoryContent(); + Objects = data.ToList(); + + if (rerender) + await InvokeAsync(StateHasChanged); + } + + private async Task CdPath(string path) + { + await FileAccess.ChangeDirectory(path); + await RefreshActive(); + } + + private async Task SetPath(string path) + { + await FileAccess.SetDirectory(path); + await RefreshActive(); + } + + private async Task OnContextMenuClick(ItemClickEventArgs e) + { + var data = e.Data as FileManagerObject; + + if (data == null) + return; + + switch (e.MenuItem.Id) + { + case "delete": + await FileAccess.Delete(data); + break; + case "download": + if (data.IsFile) + { + try + { + var stream = await FileAccess.GetDownloadStream(data); + await ToastService.Info(TranslationService.Translate("Starting download")); + await FileService.AddBuffer(stream); + await FileService.DownloadBinaryBuffers(data.Name); + } + catch (NotImplementedException) + { + try + { + var url = await FileAccess.GetDownloadUrl(data); + NavigationManager.NavigateTo(url, true); + await ToastService.Info(TranslationService.Translate("Starting download")); + } + catch (Exception exception) + { + await ToastService.Error(TranslationService.Translate("Error starting download")); + Logger.Error("Error downloading file"); + Logger.Error(exception.Message); + } + } + catch (Exception exception) + { + await ToastService.Error(TranslationService.Translate("Error starting download")); + Logger.Error("Error downloading file stream"); + Logger.Error(exception.Message); + } + } + break; + case "rename": + var newName = await AlertService.Text(TranslationService.Translate("Rename"), TranslationService.Translate("Enter a new name"), data.Name); + var path = await FileAccess.GetCurrentPath(); + await FileAccess.Move(data, path + "/" + newName); + break; + } + + await Refresh(false); + } + + private async Task OnFileToggle(ChangeEventArgs obj, FileManagerObject o) + { + if ((bool)obj.Value) + { + if (SelectedFiles.Contains(o)) + return; + + SelectedFiles.Add(o); + await InvokeAsync(StateHasChanged); + } + else + { + if (!SelectedFiles.Contains(o)) + return; + + SelectedFiles.Remove(o); + await InvokeAsync(StateHasChanged); + } + } + + private async Task OnAllFileToggle(ChangeEventArgs obj) + { + if ((bool)obj.Value) + { + foreach (var o in Objects) + { + if (SelectedFiles.Contains(o)) + continue; + + SelectedFiles.Add(o); + } + + await InvokeAsync(StateHasChanged); + } + else + { + foreach (var o in Objects) + { + if (!SelectedFiles.Contains(o)) + continue; + + SelectedFiles.Remove(o); + } + + + await InvokeAsync(StateHasChanged); + } + } + + private async Task CreateFolder() + { + var name = await AlertService.Text(TranslationService.Translate("Create a new folder"), TranslationService.Translate("Enter a name"), ""); + + if (string.IsNullOrEmpty(name)) + return; + + await FileAccess.CreateDirectory(name); + await Refresh(); + } + + private async void SaveFile(string data) + { + if (Editing == null) + return; + + await FileAccess.WriteFile(Editing, data); + Editing = null; + await Refresh(); + } + + private async Task OpenFile(FileManagerObject o) + { + Editing = o; + Loading = true; + await InvokeAsync(StateHasChanged); + + InitialEditorData = await FileAccess.ReadFile(Editing); + Language = MonacoTypeHelper.GetEditorType(Editing.Name); + + Loading = false; + await InvokeAsync(StateHasChanged); + } + + private async void CloseFile() + { + Editing = null; + await InvokeAsync(StateHasChanged); + } + + private async Task Launch() + { + NavigationManager.NavigateTo(await FileAccess.GetLaunchUrl()); + } + + private async Task OnFileChanged(InputFileChangeEventArgs arg) + { + Uploading = true; + await InvokeAsync(StateHasChanged); + + foreach (var browserFile in arg.GetMultipleFiles()) + { + if (browserFile.Size < 1024 * 1024 * 100) + { + Percent = 0; + + try + { + await FileAccess.UploadFile( + browserFile.Name, + browserFile.OpenReadStream(1024 * 1024 * 100), + async (i) => + { + Percent = i; + + Task.Run(() => { InvokeAsync(StateHasChanged); }); + }); + + await Refresh(); + } + catch (Exception e) + { + await ToastService.Error(TranslationService.Translate("An unknown error occured while uploading a file")); + Logger.Error("Error uploading file"); + Logger.Error(e); + } + } + else + { + await ToastService.Error(TranslationService.Translate("The uploaded file should not be bigger than 100MB")); + } + } + + Uploading = false; + await InvokeAsync(StateHasChanged); + + await ToastService.Success(TranslationService.Translate("File upload complete")); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileView.razor b/Moonlight/Shared/Components/FileManagerPartials/FileView.razor new file mode 100644 index 0000000..97cdbf3 --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileView.razor @@ -0,0 +1,223 @@ +@using Moonlight.App.Helpers.Files +@using Logging.Net +@using BlazorContextMenu +@using Moonlight.App.Helpers + +
+
+
+
+ + + + + + + +
+
+ @if (AllToggled) + { + + } + else + { + + } +
+ 		Name
+
+
+
+ + + + + + + + + + @foreach (var file in Data) + { + + + + + + + } + + +
+ +
+ + + + + Go up + +
+ 		+
+
+ +
+
+
+
+ @{ + var toggle = ToggleStatusCache.ContainsKey(file) && ToggleStatusCache[file]; + } + + @if (toggle) + { + + } + else + { + + } +
+ 		+
+ + @if (file.IsFile) + { + + } + else + { + + } + + @(file.Name) +
+ 		@(Formatter.FormatSize(file.Size)) +
+
+ + + +
+
+
+
+
+
+ + + @foreach (var action in ContextActions) + { + + @action.Name + + } + + +@code +{ + [Parameter] + public IFileAccess Access { get; set; } + + [Parameter] + public Func>? OnElementClicked { get; set; } + + [Parameter] + public Action? OnPathChanged { get; set; } + + [Parameter] + public ContextAction[] ContextActions { get; set; } = Array.Empty(); + + private FileData[] Data = Array.Empty(); + + private Dictionary ToggleStatusCache = new(); + private bool AllToggled = false; + + public async Task Refresh() + { + Data = await Access.Ls(); + ToggleStatusCache.Clear(); + + foreach (var fileData in Data) + { + ToggleStatusCache.Add(fileData, false); + } + + await InvokeAsync(StateHasChanged); + } + + private async Task Load(LazyLoader arg) + { + await Refresh(); + } + + private async Task SetToggleState(FileData fileData, bool status) + { + if (ToggleStatusCache.ContainsKey(fileData)) + ToggleStatusCache[fileData] = status; + else + ToggleStatusCache.Add(fileData, status); + + await InvokeAsync(StateHasChanged); + } + + private async Task SetToggleState(bool status) + { + AllToggled = status; + + foreach (var fd in ToggleStatusCache.Keys) + { + ToggleStatusCache[fd] = status; + } + + await InvokeAsync(StateHasChanged); + } + + private async Task OnClicked(FileData fileData) + { + if (OnElementClicked != null) + { + var canceled = await OnElementClicked.Invoke(fileData); + + if (canceled) + return; + } + + if (!fileData.IsFile) + { + await Access.Cd(fileData.Name); + await Refresh(); + OnPathChanged?.Invoke(await Access.Pwd()); + } + } + + private async Task GoUp() + { + await Access.Up(); + await Refresh(); + + OnPathChanged?.Invoke(await Access.Pwd()); + } + + private Task OnContextMenuClick(ItemClickEventArgs eventArgs) + { + var action = ContextActions.FirstOrDefault(x => x.Id == eventArgs.MenuItem.Id); + + if (action != null) + { + action.Action.Invoke((FileData)eventArgs.Data); + } + + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/ServerControl/ServerPlugins.razor b/Moonlight/Shared/Components/ServerControl/ServerAddons.razor similarity index 81% rename from Moonlight/Shared/Components/ServerControl/ServerPlugins.razor rename to Moonlight/Shared/Components/ServerControl/ServerAddons.razor index 3168bf9..cb51e2a 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerPlugins.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerAddons.razor @@ -1,7 +1,7 @@ 
-

Plugins

+

Addons

This feature is currently not available
diff --git a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor index 3fa42fe..ed0e1d1 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor @@ -9,7 +9,7 @@ @inject IdentityService IdentityService - + @code diff --git a/Moonlight/Shared/Components/ServerControl/ServerNavigation.razor b/Moonlight/Shared/Components/ServerControl/ServerNavigation.razor index 927cfee..6d8bcc8 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerNavigation.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerNavigation.razor @@ -134,10 +134,10 @@
  • - + - Plugins + Addons
    • diff --git a/Moonlight/Shared/Views/Server/Index.razor b/Moonlight/Shared/Views/Server/Index.razor index 3c10117..94efbf4 100644 --- a/Moonlight/Shared/Views/Server/Index.razor +++ b/Moonlight/Shared/Views/Server/Index.razor @@ -96,8 +96,8 @@ case "network": break; - case "plugins": - + case "addons": + break; case "settings": @@ -185,7 +185,7 @@ .Include(x => x.Owner) .First(x => x.Uuid == uuid); - if (CurrentServer.Owner.Id != User!.Id) + if (CurrentServer.Owner.Id != User!.Id && User.Admin) CurrentServer = null; } catch (Exception) diff --git a/Moonlight/Shared/Views/Test.razor b/Moonlight/Shared/Views/Test.razor index 948e8c3..ce2ede8 100644 --- a/Moonlight/Shared/Views/Test.razor +++ b/Moonlight/Shared/Views/Test.razor @@ -1,55 +1,33 @@ @page "/test" -@using Moonlight.App.Services.Interop -@using Moonlight.App.Database.Entities -@using Moonlight.App.Repositories.Domains -@inject ToastService ToastService -@inject SharedDomainRepository SharedDomainRepository +@using Moonlight.Shared.Components.FileManagerPartials +@using Moonlight.App.Repositories.Servers +@using Moonlight.App.Helpers.Files +@using Microsoft.EntityFrameworkCore +@using Moonlight.App.Helpers + +@inject ServerRepository ServerRepository +@inject WingsApiHelper WingsApiHelper +@inject WingsJwtHelper WingsJwtHelper - -
    - - -
    -
    - - - -
    -
    - -
    -     + +     @code { - private App.Database.Entities.Domain Domain = new(); - - private SharedDomain[] SharedDomains; - - private async Task Callback(EditContext obj) - { - Console.WriteLine(Domain.Name); - Console.WriteLine(Domain.SharedDomain.Name); - - await ToastService.Success("SUCCESS"); - } + private IFileAccess FileAccess; private Task Load(LazyLoader arg) { - SharedDomains = SharedDomainRepository + var server = ServerRepository .Get() - .ToArray(); - + .Include(x => x.Node) + .First(); + + FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, server); + return Task.CompletedTask; } } \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 1a6ac10..6bb3356 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -409,3 +409,5 @@ Street and house number requered;Street and house number requered Max lenght reached;Max lenght reached Server not found;Server not found A server with that id cannot be found or you have no access for this server;A server with that id cannot be found or you have no access for this server +Addons;Addons +Go up;Go up From dfda44495655cbcd3753c5e486b93f43bde3f83c Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Sun, 2 Apr 2023 22:51:27 +0200 Subject: [PATCH 13/39] cleanup service --- Moonlight/App/Database/DataContext.cs | 2 + ...4329_AddCleanupExceptionsTable.Designer.cs | 1082 +++++++++++++++++ ...0230402204329_AddCleanupExceptionsTable.cs | 170 +++ .../Migrations/DataContextModelSnapshot.cs | 36 +- Moonlight/App/Models/Misc/CleanupException.cs | 8 + .../CleanupExceptionRepository.cs | 44 + Moonlight/App/Services/CleanupService.cs | 370 ++++++ Moonlight/Program.cs | 5 + 8 files changed, 1711 insertions(+), 6 deletions(-) create mode 100644 Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.cs create mode 100644 Moonlight/App/Models/Misc/CleanupException.cs create mode 100644 Moonlight/App/Repositories/CleanupExceptionRepository.cs create mode 100644 Moonlight/App/Services/CleanupService.cs diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index c8575c4..3080229 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -2,6 +2,7 @@ using Moonlight.App.Database.Entities; using Moonlight.App.Database.Entities.LogsEntries; using Moonlight.App.Database.Entities.Notification; +using Moonlight.App.Models.Misc; using Moonlight.App.Services; namespace Moonlight.App.Database; @@ -42,6 +43,7 @@ public class DataContext : DbContext public DbSet AaPanels { get; set; } public DbSet Websites { get; set; } public DbSet DdosAttacks { get; set; } + public DbSet CleanupExceptions { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.Designer.cs b/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.Designer.cs new file mode 100644 index 0000000..7ae6105 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.Designer.cs @@ -0,0 +1,1082 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230402204329_AddCleanupExceptionsTable")] + partial class AddCleanupExceptionsTable + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Country") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Models.Misc.CleanupException", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("CleanupExceptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.cs b/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.cs new file mode 100644 index 0000000..3c0f8e1 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402204329_AddCleanupExceptionsTable.cs @@ -0,0 +1,170 @@ +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class AddCleanupExceptionsTable : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "State", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "LastName", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "FirstName", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Country", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "City", + table: "Users", + type: "varchar(128)", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Address", + table: "Users", + type: "varchar(128)", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "CleanupExceptions", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + ServerId = table.Column(type: "int", nullable: false), + Note = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_CleanupExceptions", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CleanupExceptions"); + + migrationBuilder.AlterColumn( + name: "State", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "LastName", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "FirstName", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Country", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "City", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(128)", + oldMaxLength: 128) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Address", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(128)", + oldMaxLength: 128) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index 566e4e6..ec2d788 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -707,18 +707,21 @@ namespace Moonlight.App.Database.Migrations b.Property("Address") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(128) + .HasColumnType("varchar(128)"); b.Property("Admin") .HasColumnType("tinyint(1)"); b.Property("City") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(128) + .HasColumnType("varchar(128)"); b.Property("Country") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("CreatedAt") .HasColumnType("datetime(6)"); @@ -732,11 +735,13 @@ namespace Moonlight.App.Database.Migrations b.Property("FirstName") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("LastName") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("Password") .IsRequired() @@ -744,7 +749,8 @@ namespace Moonlight.App.Database.Migrations b.Property("State") .IsRequired() - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("Status") .HasColumnType("int"); @@ -821,6 +827,24 @@ namespace Moonlight.App.Database.Migrations b.ToTable("Websites"); }); + modelBuilder.Entity("Moonlight.App.Models.Misc.CleanupException", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Note") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("CleanupExceptions"); + }); + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => { b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") diff --git a/Moonlight/App/Models/Misc/CleanupException.cs b/Moonlight/App/Models/Misc/CleanupException.cs new file mode 100644 index 0000000..83dcba7 --- /dev/null +++ b/Moonlight/App/Models/Misc/CleanupException.cs @@ -0,0 +1,8 @@ +namespace Moonlight.App.Models.Misc; + +public class CleanupException +{ + public int Id { get; set; } + public int ServerId { get; set; } + public string Note { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Repositories/CleanupExceptionRepository.cs b/Moonlight/App/Repositories/CleanupExceptionRepository.cs new file mode 100644 index 0000000..9cfd0b2 --- /dev/null +++ b/Moonlight/App/Repositories/CleanupExceptionRepository.cs @@ -0,0 +1,44 @@ +using Microsoft.EntityFrameworkCore; +using Moonlight.App.Database; +using Moonlight.App.Models.Misc; + +namespace Moonlight.App.Repositories; + +public class CleanupExceptionRepository : IDisposable +{ + private readonly DataContext DataContext; + + public CleanupExceptionRepository(DataContext dataContext) + { + DataContext = dataContext; + } + + public DbSet Get() + { + return DataContext.CleanupExceptions; + } + + public CleanupException Add(CleanupException cleanupException) + { + var x = DataContext.CleanupExceptions.Add(cleanupException).Entity; + DataContext.SaveChanges(); + return x; + } + + public void Update(CleanupException cleanupException) + { + DataContext.CleanupExceptions.Update(cleanupException); + DataContext.SaveChanges(); + } + + public void Delete(CleanupException cleanupException) + { + DataContext.CleanupExceptions.Remove(cleanupException); + DataContext.SaveChanges(); + } + + public void Dispose() + { + DataContext.Dispose(); + } +} \ No newline at end of file diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs new file mode 100644 index 0000000..d4c6ff8 --- /dev/null +++ b/Moonlight/App/Services/CleanupService.cs @@ -0,0 +1,370 @@ +using System.Diagnostics; +using Microsoft.EntityFrameworkCore; +using MineStatLib; +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Daemon.Resources; +using Moonlight.App.Models.Wings; +using Moonlight.App.Repositories; +using Moonlight.App.Repositories.Servers; +using Logging.Net; +using Newtonsoft.Json; + +namespace Moonlight.App.Services; + +public class CleanupService +{ + public DateTime StartedAt { get; private set; } + public DateTime CompletedAt { get; private set; } + public int ServersCleaned { get; private set; } + public int CleanupsPerformed { get; private set; } + public int ServersRunning { get; private set; } + public bool IsRunning { get; private set; } + public bool Activated { get; set; } + public int PercentProgress { get; private set; } = 100; + public string Status { get; private set; } = "N/A"; + + private Task PerformTask; + private readonly ConfigService ConfigService; + private readonly IServiceScopeFactory ServiceScopeFactory; + + private int RequiredCpu; + private long RequiredMemory; + private int WaitTime; + + public EventHandler OnUpdated; + + public CleanupService(ConfigService configService, IServiceScopeFactory serviceScopeFactory) + { + ServiceScopeFactory = serviceScopeFactory; + ConfigService = configService; + + IConfiguration configuration = new ConfigurationBuilder() + .AddJsonFile("appsettings.json") + .Build(); + + var config = configuration.GetSection("Cleanup"); + + RequiredCpu = config.GetValue("Cpu"); + RequiredMemory = config.GetValue("Memory"); + WaitTime = config.GetValue("Wait"); + + if (!ConfigService.DebugMode) + Task.Run(Start); + } + + private void Start() + { + StartedAt = DateTime.Now; + CompletedAt = DateTime.Now; + IsRunning = false; + Activated = true; + + DoWaiting(); + } + + private async void DoWaiting() + { + while (true) + { + if (Activated) + await Perform(); + + try + { + await Task.Delay((int)TimeSpan.FromMinutes(WaitTime).TotalMilliseconds); + } + catch (Exception) + { + } + } + } + + public async Task TriggerPerform() + { + if (IsRunning) + return; + + PerformTask = new Task(async () => await Perform()); + PerformTask.Start(); + } + + private async Task Perform() + { + if (IsRunning) + return; + + IsRunning = true; + StartedAt = DateTime.Now; + ServersRunning = 0; + + OnUpdated?.Invoke(this, null); + + using (var scope = ServiceScopeFactory.CreateScope()) + { + // Setup time measure + var watch = new Stopwatch(); + watch.Start(); + + // Get repos from dependency injection + var serverRepository = scope.ServiceProvider.GetRequiredService(); + var nodeRepository = scope.ServiceProvider.GetRequiredService(); + var cleanupExceptionRepository = scope.ServiceProvider.GetRequiredService(); + var nodeService = scope.ServiceProvider.GetRequiredService(); + var imageRepo = scope.ServiceProvider.GetRequiredService(); + var serverService = scope.ServiceProvider.GetRequiredService(); + + // Fetching data from mysql + var servers = serverRepository.Get() + .Include(x => x.Image) + .ToArray(); + var nodes = nodeRepository.Get().ToArray(); + var exceptions = cleanupExceptionRepository.Get().ToArray(); + var images = imageRepo.Get().ToArray(); + + var nodeCount = nodes.Count(); + + // We use this counter for the foreach loops + int counter = 0; + PercentProgress = 0; + + // Fetching data from nodes so we know what nodes to scan + var nodeContainers = new Dictionary(); + + Status = "Checking Nodes"; + counter = 0; + PercentProgress = 0; + OnUpdated?.Invoke(this, null); + + foreach (var node in nodes) + { + try + { + var cpu = await nodeService.GetCpuStats(node); + var freeMemory = await nodeService.GetMemoryStats(node); + + if (cpu.Usage > RequiredCpu || freeMemory.Free < RequiredMemory) + { + var c = await nodeService.GetContainerStats(node); + var containers = c.Containers; + nodeContainers.Add(node, containers.ToArray()); + } + } + catch (Exception e) + { + Logger.Error($"Error fetching cleanup data from node {node.Id}"); + Logger.Error(e); + } + + counter++; + CalculateAndUpdateProgress(counter, nodeCount); + OnUpdated?.Invoke(this, null); + } + + // Searching for servers we can actually stop because they have the cleanup tag + // and determine which servers we have to check for an illegal mc server + var serversToCheck = new List(); + var serversToCheckForMc = new List(); + + Status = "Checking found servers"; + counter = 0; + PercentProgress = 0; + OnUpdated?.Invoke(this, null); + + // Count every container for progress calculation + var allContainers = 0; + foreach (var array in nodeContainers) + { + allContainers += array.Value.Length; + } + + foreach (var nodeContainer in nodeContainers) + { + try + { + foreach (var container in nodeContainer.Value) + { + var server = servers.First(x => x.Uuid.ToString() == container.Name); + var tagsJson = imageRepo + .Get() + .First(x => x.Id == server.Image.Id).TagsJson; + + var tags = JsonConvert.DeserializeObject(tagsJson) ?? Array.Empty(); + + if (tags.FirstOrDefault(x => x == "cleanup") != null) + { + serversToCheck.Add(server); + } + + if (tags.FirstOrDefault(x => x == "illegalmc") != null) + { + serversToCheckForMc.Add(server); + } + } + } + catch (Exception e) + { + Logger.Error($"Error processing cleanup data from node {nodeContainer.Key.Id}"); + Logger.Error(e); + } + + counter++; + CalculateAndUpdateProgress(counter, allContainers); + OnUpdated?.Invoke(this, null); + } + + // Now we gonna scan every tagged server + Status = "Scanning servers"; + counter = 0; + PercentProgress = 0; + OnUpdated?.Invoke(this, null); + + foreach (var server in serversToCheck) + { + try + { + var serverData = serverRepository + .Get() + .Include(x => x.MainAllocation) + .Include(x => x.Node) + .Include(x => x.Variables) + .First(x => x.Id == server.Id); + + var players = GetPlayers(serverData.Node, serverData.MainAllocation); + var stats = await serverService.GetDetails(server); + + var exception = exceptions.FirstOrDefault(x => x.ServerId == server.Id) != null; + + if (stats != null) + { + if (exception) + { + if (players == 0 && stats.Utilization.Uptime > TimeSpan.FromHours(6).TotalMilliseconds) + { + await serverService.SetPowerState(server, PowerSignal.Restart); + ServersCleaned++; + OnUpdated?.Invoke(this, null); + } + else + { + ServersRunning++; + OnUpdated?.Invoke(this, null); + } + } + else + { + if (players == 0 && stats.Utilization.Uptime > TimeSpan.FromMinutes(10).TotalMilliseconds) + { + var cleanupVar = serverData.Variables.FirstOrDefault(x => x.Key == "J2S"); + + if (cleanupVar == null) + { + await serverService.SetPowerState(server, PowerSignal.Stop); + ServersCleaned++; + OnUpdated?.Invoke(this, null); + } + else + { + if (cleanupVar.Value == "1") + { + await serverService.SetPowerState(server, PowerSignal.Restart); + ServersCleaned++; + OnUpdated?.Invoke(this, null); + } + else + { + await serverService.SetPowerState(server, PowerSignal.Stop); + ServersCleaned++; + OnUpdated?.Invoke(this, null); + } + } + } + else + { + ServersRunning++; + OnUpdated?.Invoke(this, null); + } + } + } + } + catch (Exception e) + { + Logger.Error($"Error scanning {server.Name}"); + Logger.Error(e); + } + + counter++; + CalculateAndUpdateProgress(counter, serversToCheck.Count); + OnUpdated?.Invoke(this, null); + } + + // Finally we have to check all code container allocations + // for illegal hosted mc servers + + Status = "Scanning code containers"; + counter = 0; + PercentProgress = 0; + OnUpdated?.Invoke(this, null); + + foreach (var server in serversToCheckForMc) + { + try + { + var serverData = serverRepository + .Get() + .Include(x => x.Allocations) + .Include(x => x.Node) + .First(x => x.Id == server.Id); + + foreach (var allocation in serverData.Allocations) + { + if (GetPlayers(server.Node, allocation) != -1) + { + // TODO: Suspend server + Logger.Warn("Found CC running mc: https://moonlight.endelon-hosting.de/server/" + + server.Uuid + "/"); + } + } + } + catch (Exception e) + { + Logger.Error($"Error scanning (cc) {server.Name}"); + Logger.Error(e); + } + + counter++; + CalculateAndUpdateProgress(counter, serversToCheckForMc.Count); + OnUpdated?.Invoke(this, null); + } + + watch.Stop(); + + Status = $"Cleanup finifhed. Duration: {Math.Round(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes, 2)} Minuten"; + PercentProgress = 100; + OnUpdated?.Invoke(this, null); + } + + IsRunning = false; + CompletedAt = DateTime.Now; + CleanupsPerformed++; + OnUpdated?.Invoke(this, null); + } + + private int GetPlayers(Node node, NodeAllocation allocation) + { + var ms = new MineStat(node.Fqdn, (ushort)allocation.Port); + + if (ms.ServerUp) + { + return ms.CurrentPlayersInt; + } + else + { + return -1; + } + } + + private void CalculateAndUpdateProgress(int now, int all) + { + PercentProgress = (int)Math.Round((now / (double)all) * 100); + } +} \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 4543609..8dc9429 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -97,6 +97,8 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddSingleton(); + // Loggers builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -153,6 +155,9 @@ namespace Moonlight // Support service var supportServerService = app.Services.GetRequiredService(); + // cleanup service + _ = app.Services.GetRequiredService(); + // Discord bot service //var discordBotService = app.Services.GetRequiredService(); From 708ae080a3c4ef2504b95c580f2ceed342fd69cb Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Sun, 2 Apr 2023 23:17:09 +0200 Subject: [PATCH 14/39] cleanup ui (part 1) + stupidity fix --- Moonlight/App/Models/Misc/AuditLogType.cs | 5 +- Moonlight/App/Services/CleanupService.cs | 12 +- Moonlight/Program.cs | 1 + .../Shared/Views/Admin/Servers/Cleanup.razor | 185 ++++++++++++++++++ Moonlight/resources/lang/de_de.lang | 22 ++- 5 files changed, 215 insertions(+), 10 deletions(-) create mode 100644 Moonlight/Shared/Views/Admin/Servers/Cleanup.razor diff --git a/Moonlight/App/Models/Misc/AuditLogType.cs b/Moonlight/App/Models/Misc/AuditLogType.cs index d505deb..13fafa1 100644 --- a/Moonlight/App/Models/Misc/AuditLogType.cs +++ b/Moonlight/App/Models/Misc/AuditLogType.cs @@ -19,5 +19,8 @@ public enum AuditLogType AddDomainRecord, UpdateDomainRecord, DeleteDomainRecord, - PasswordReset + PasswordReset, + CleanupEnabled, + CleanupDisabled, + CleanupTriggered, } \ No newline at end of file diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs index d4c6ff8..ef50055 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/CleanupService.cs @@ -37,12 +37,8 @@ public class CleanupService { ServiceScopeFactory = serviceScopeFactory; ConfigService = configService; - - IConfiguration configuration = new ConfigurationBuilder() - .AddJsonFile("appsettings.json") - .Build(); - var config = configuration.GetSection("Cleanup"); + var config = configService.GetSection("Moonlight").GetSection("Cleanup"); RequiredCpu = config.GetValue("Cpu"); RequiredMemory = config.GetValue("Memory"); @@ -71,9 +67,9 @@ public class CleanupService try { - await Task.Delay((int)TimeSpan.FromMinutes(WaitTime).TotalMilliseconds); + await Task.Delay((int) TimeSpan.FromMinutes(WaitTime).TotalMilliseconds); } - catch (Exception) + catch (Exception ex) { } } @@ -338,7 +334,7 @@ public class CleanupService watch.Stop(); - Status = $"Cleanup finifhed. Duration: {Math.Round(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes, 2)} Minuten"; + Status = $"Cleanup finished. Duration: {Math.Round(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes, 2)} Minutes"; PercentProgress = 100; OnUpdated?.Invoke(this, null); } diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 8dc9429..f7fa1df 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -65,6 +65,7 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor new file mode 100644 index 0000000..5215224 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor @@ -0,0 +1,185 @@ +@page "/admin/servers/cleanup" + +@using Moonlight.App.Services +@using Logging.Net +@using Moonlight.App.Models.Misc +@using Moonlight.App.Services.LogServices + +@inject CleanupService CleanupService +@inject AuditLogService AuditLogService + +@implements IDisposable + +Cleanup + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.ServersCleaned) +
    + Servers + stopped +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.CleanupsPerformed) +
    + Cleanups + executed +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.ServersRunning) +
    + Used clanup + Servers +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + @if (CleanupService.IsRunning) + { + + } + else + { + + } +
    +
    + @if (CleanupService.Activated) + { + + } + else + { + + } +
    +
    + @if (CleanupService.Activated) + { + + } + else + { + + } +
    +
    +
    +
    +
    +
    +
    +     + + + + +@code +{ + protected async override Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + CleanupService.OnUpdated += OnUpdated; + } + } + + private void OnUpdated(object? sender, EventArgs e) + { + Logger.Debug(CleanupService.PercentProgress); + + InvokeAsync(StateHasChanged); + } + + public void Dispose() + { + CleanupService.OnUpdated -= OnUpdated; + } + + private void Enable() + { + CleanupService.Activated = true; + AuditLogService.Log(AuditLogType.CleanupEnabled, "The automatic cleanup has been activated"); + InvokeAsync(StateHasChanged); + } + + private void Disabled() + { + CleanupService.Activated = false; + AuditLogService.Log(AuditLogType.CleanupDisabled, "The automatic cleanup has been disabled"); + InvokeAsync(StateHasChanged); + } + + private async void Trigger() + { + await CleanupService.TriggerPerform(); + await AuditLogService.Log(AuditLogType.CleanupTriggered, "The automatic cleanup has been manually triggered"); + await InvokeAsync(StateHasChanged); + } +} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 8f280da..7e426f4 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -406,4 +406,24 @@ The City field is required.;The City field is required. The State field is required.;The State field is required. The Country field is required.;The Country field is required. Street and house number requered;Street and house number requered -Max lenght reached;Max lenght reached \ No newline at end of file +Max lenght reached;Max lenght reached +stopped;stopped +Cleanups;Cleanups +executed;executed +Used clanup;Used clanup +Checking Nodes;Checking Nodes +Enable;Enable +Disabble;Disabble +Checking found servers;Checking found servers +Scanning servers;Scanning servers +Scanning code containers;Scanning code containers +Cleanup finifhed. Duration: 0.08 Minuten;Cleanup finifhed. Duration: 0.08 Minuten +Disable;Disable +Cleanup finished. Duration: 0.08 Minuten;Cleanup finished. Duration: 0.08 Minuten +Cleanup finished. Duration: 0.08 Minutes;Cleanup finished. Duration: 0.08 Minutes +Cleanup finished. Duration: 0.13 Minutes;Cleanup finished. Duration: 0.13 Minutes +Cleanup finished. Duration: 0.23 Minutes;Cleanup finished. Duration: 0.23 Minutes +Cleanup finished. Duration: 0.14 Minutes;Cleanup finished. Duration: 0.14 Minutes +Cleanup finished. Duration: 0.09 Minutes;Cleanup finished. Duration: 0.09 Minutes +Cleanup finished. Duration: 0.1 Minutes;Cleanup finished. Duration: 0.1 Minutes +Cleanup finished. Duration: 0.11 Minutes;Cleanup finished. Duration: 0.11 Minutes From 6b8c75d0140b1604165bd010c00ce82df3056592 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 00:09:03 +0200 Subject: [PATCH 15/39] New file manager complete. Server settings for py, js, mc complete. Fixes --- Moonlight/App/Helpers/Files/FileAccess.cs | 24 ++ Moonlight/App/Helpers/Files/IFileAccess.cs | 19 -- .../App/Helpers/Files/WingsFileAccess.cs | 172 ++++++++-- Moonlight/App/Helpers/PaperApiHelper.cs | 4 +- Moonlight/App/Helpers/WingsApiHelper.cs | 85 +++-- .../Models/Files/Accesses/WingsFileAccess.cs | 8 +- .../Models/Wings/Requests/CompressFiles.cs | 12 + ...CreateBackupRequest.cs => CreateBackup.cs} | 2 +- ...DirectoryRequest.cs => CreateDirectory.cs} | 2 +- ...CreateServerRequest.cs => CreateServer.cs} | 2 +- .../Models/Wings/Requests/DecompressFile.cs | 12 + .../{DeleteFilesRequest.cs => DeleteFiles.cs} | 2 +- .../{RenameFilesRequest.cs => RenameFiles.cs} | 2 +- ...storeBackupRequest.cs => RestoreBackup.cs} | 2 +- .../{ServerPowerRequest.cs => ServerPower.cs} | 2 +- ...stDirectoryRequest.cs => ListDirectory.cs} | 2 +- ...verDetailsResponse.cs => ServerDetails.cs} | 10 +- .../App/Services/Interop/ModalService.cs | 23 ++ .../App/Services/Interop/ToastService.cs | 15 + Moonlight/App/Services/ServerService.cs | 12 +- Moonlight/Pages/_Layout.cshtml | 1 + Moonlight/Program.cs | 1 + .../FileManagerPartials/FileManager.razor | 295 +++++++++++++++--- .../FileManagerPartials/FilePath.razor | 47 +++ .../FileManagerPartials/FileSelectModal.razor | 132 ++++++++ .../FileManagerPartials/FileUpload.razor | 90 ++++++ .../FileManagerPartials/FileView.razor | 153 ++++++--- .../ServerControl/ServerFiles.razor | 26 +- .../ServerControl/ServerSettings.razor | 89 +++--- .../Settings/JavascriptFileSetting.razor | 82 +++++ .../Settings/JavascriptVersionSetting.razor | 73 +++-- .../Settings/PaperVersionSetting.razor | 2 - .../Settings/PythonFileSetting.razor | 82 +++++ .../Settings/PythonVersionSetting.razor | 70 ++--- Moonlight/Shared/Views/Server/Index.razor | 40 ++- Moonlight/Shared/Views/Test.razor | 10 +- Moonlight/resources/lang/de_de.lang | 21 ++ Moonlight/wwwroot/assets/js/moonlight.js | 13 + Moonlight/wwwroot/assets/js/toastUtils.js | 49 ++- 39 files changed, 1332 insertions(+), 356 deletions(-) create mode 100644 Moonlight/App/Helpers/Files/FileAccess.cs delete mode 100644 Moonlight/App/Helpers/Files/IFileAccess.cs create mode 100644 Moonlight/App/Models/Wings/Requests/CompressFiles.cs rename Moonlight/App/Models/Wings/Requests/{CreateBackupRequest.cs => CreateBackup.cs} (89%) rename Moonlight/App/Models/Wings/Requests/{CreateDirectoryRequest.cs => CreateDirectory.cs} (85%) rename Moonlight/App/Models/Wings/Requests/{CreateServerRequest.cs => CreateServer.cs} (87%) create mode 100644 Moonlight/App/Models/Wings/Requests/DecompressFile.cs rename Moonlight/App/Models/Wings/Requests/{DeleteFilesRequest.cs => DeleteFiles.cs} (86%) rename Moonlight/App/Models/Wings/Requests/{RenameFilesRequest.cs => RenameFiles.cs} (91%) rename Moonlight/App/Models/Wings/Requests/{RestoreBackupRequest.cs => RestoreBackup.cs} (90%) rename Moonlight/App/Models/Wings/Requests/{ServerPowerRequest.cs => ServerPower.cs} (81%) rename Moonlight/App/Models/Wings/Resources/{ListDirectoryRequest.cs => ListDirectory.cs} (94%) rename Moonlight/App/Models/Wings/Resources/{ServerDetailsResponse.cs => ServerDetails.cs} (78%) create mode 100644 Moonlight/App/Services/Interop/ModalService.cs create mode 100644 Moonlight/Shared/Components/FileManagerPartials/FilePath.razor create mode 100644 Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor create mode 100644 Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor create mode 100644 Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor create mode 100644 Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor create mode 100644 Moonlight/wwwroot/assets/js/moonlight.js diff --git a/Moonlight/App/Helpers/Files/FileAccess.cs b/Moonlight/App/Helpers/Files/FileAccess.cs new file mode 100644 index 0000000..a900c46 --- /dev/null +++ b/Moonlight/App/Helpers/Files/FileAccess.cs @@ -0,0 +1,24 @@ +namespace Moonlight.App.Helpers.Files; + +public abstract class FileAccess : ICloneable +{ + public string CurrentPath { get; set; } = "/"; + + public abstract Task Ls(); + public abstract Task Cd(string dir); + public abstract Task Up(); + public abstract Task SetDir(string dir); + public abstract Task Read(FileData fileData); + public abstract Task Write(FileData fileData, string content); + public abstract Task Upload(string name, Stream stream, Action? progressUpdated = null); + public abstract Task MkDir(string name); + public abstract Task Pwd(); + public abstract Task DownloadUrl(FileData fileData); + public abstract Task DownloadStream(FileData fileData); + public abstract Task Delete(FileData fileData); + public abstract Task Move(FileData fileData, string newPath); + public abstract Task Compress(params FileData[] files); + public abstract Task Decompress(FileData fileData); + public abstract Task GetLaunchUrl(); + public abstract object Clone(); +} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/IFileAccess.cs b/Moonlight/App/Helpers/Files/IFileAccess.cs deleted file mode 100644 index 62b6ba5..0000000 --- a/Moonlight/App/Helpers/Files/IFileAccess.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Moonlight.App.Helpers.Files; - -public interface IFileAccess -{ - public Task Ls(); - public Task Cd(string dir); - public Task Up(); - public Task SetDir(string dir); - public Task Read(FileData fileData); - public Task Write(FileData fileData, string content); - public Task Upload(string name, Stream stream, Action? progressUpdated = null); - public Task MkDir(string name); - public Task Pwd(); - public Task DownloadUrl(FileData fileData); - public Task DownloadStream(FileData fileData); - public Task Delete(FileData fileData); - public Task Move(FileData fileData, string newPath); - public Task GetLaunchUrl(); -} \ No newline at end of file diff --git a/Moonlight/App/Helpers/Files/WingsFileAccess.cs b/Moonlight/App/Helpers/Files/WingsFileAccess.cs index 2ddc57c..b1c2296 100644 --- a/Moonlight/App/Helpers/Files/WingsFileAccess.cs +++ b/Moonlight/App/Helpers/Files/WingsFileAccess.cs @@ -1,21 +1,32 @@ -using Moonlight.App.Database.Entities; +using System.Web; +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Wings.Requests; using Moonlight.App.Models.Wings.Resources; +using Moonlight.App.Services; +using RestSharp; namespace Moonlight.App.Helpers.Files; -public class WingsFileAccess : IFileAccess +public class WingsFileAccess : FileAccess { private readonly WingsApiHelper WingsApiHelper; private readonly WingsJwtHelper WingsJwtHelper; + private readonly ConfigService ConfigService; private readonly Server Server; + private readonly User User; - private string CurrentPath = "/"; - - public WingsFileAccess(WingsApiHelper wingsApiHelper, WingsJwtHelper wingsJwtHelper,Server server) + public WingsFileAccess( + WingsApiHelper wingsApiHelper, + WingsJwtHelper wingsJwtHelper, + Server server, + ConfigService configService, + User user) { WingsApiHelper = wingsApiHelper; WingsJwtHelper = wingsJwtHelper; Server = server; + ConfigService = configService; + User = user; if (server.Node == null) { @@ -23,9 +34,9 @@ public class WingsFileAccess : IFileAccess } } - public async Task Ls() + public override async Task Ls() { - var res = await WingsApiHelper.Get( + var res = await WingsApiHelper.Get( Server.Node, $"api/servers/{Server.Uuid}/files/list-directory?directory={CurrentPath}" ); @@ -45,7 +56,7 @@ public class WingsFileAccess : IFileAccess return x.ToArray(); } - public Task Cd(string dir) + public override Task Cd(string dir) { var x = Path.Combine(CurrentPath, dir).Replace("\\", "/") + "/"; x = x.Replace("//", "/"); @@ -54,65 +65,168 @@ public class WingsFileAccess : IFileAccess return Task.CompletedTask; } - public Task Up() + public override Task Up() { CurrentPath = Path.GetFullPath(Path.Combine(CurrentPath, "..")).Replace("\\", "/").Replace("C:", ""); return Task.CompletedTask; } - - public Task SetDir(string dir) + + public override Task SetDir(string dir) { CurrentPath = dir; return Task.CompletedTask; } - public async Task Read(FileData fileData) + public override async Task Read(FileData fileData) { - return await WingsApiHelper.GetRaw(Server.Node,$"api/servers/{Server.Uuid}/files/contents?file={CurrentPath}{fileData.Name}"); + return await WingsApiHelper.GetRaw(Server.Node, + $"api/servers/{Server.Uuid}/files/contents?file={CurrentPath}{fileData.Name}"); } - public async Task Write(FileData fileData, string content) + public override async Task Write(FileData fileData, string content) { - await WingsApiHelper.PostRaw(Server.Node,$"api/servers/{Server.Uuid}/files/write?file={CurrentPath}{fileData.Name}", content); + await WingsApiHelper.PostRaw(Server.Node, + $"api/servers/{Server.Uuid}/files/write?file={CurrentPath}{fileData.Name}", content); } - public Task Upload(string name, Stream stream, Action? progressUpdated = null) + public override async Task Upload(string name, Stream dataStream, Action? progressUpdated = null) { - throw new NotImplementedException(); + var token = WingsJwtHelper.Generate( + Server.Node.Token, + claims => { claims.Add("server_uuid", Server.Uuid.ToString()); } + ); + + var client = new RestClient(); + var request = new RestRequest(); + + if (Server.Node.Ssl) + request.Resource = + $"https://{Server.Node.Fqdn}:{Server.Node.HttpPort}/upload/file?token={token}&directory={CurrentPath}"; + else + request.Resource = + $"http://{Server.Node.Fqdn}:{Server.Node.HttpPort}/upload/file?token={token}&directory={CurrentPath}"; + + request.AddParameter("name", "files"); + request.AddParameter("filename", name); + request.AddHeader("Content-Type", "multipart/form-data"); + request.AddHeader("Origin", ConfigService.GetSection("Moonlight").GetValue("AppUrl")); + request.AddFile("files", () => + { + return new StreamProgressHelper(dataStream) + { + Progress = i => { progressUpdated?.Invoke(i); } + }; + }, name); + + await client.ExecutePostAsync(request); + + client.Dispose(); + dataStream.Close(); } - public Task MkDir(string name) + public override async Task MkDir(string name) { - throw new NotImplementedException(); + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/create-directory", + new CreateDirectory() + { + Name = name, + Path = CurrentPath + } + ); } - public Task Pwd() + public override Task Pwd() { return Task.FromResult(CurrentPath); } - public Task DownloadUrl(FileData fileData) + public override Task DownloadUrl(FileData fileData) + { + var token = WingsJwtHelper.Generate(Server.Node.Token, claims => + { + claims.Add("server_uuid", Server.Uuid.ToString()); + claims.Add("file_path", CurrentPath + "/" + fileData.Name); + }); + + if (Server.Node.Ssl) + { + return Task.FromResult( + $"https://{Server.Node.Fqdn}:{Server.Node.HttpPort}/download/file?token={token}" + ); + } + else + { + return Task.FromResult( + $"http://{Server.Node.Fqdn}:{Server.Node.HttpPort}/download/file?token={token}" + ); + } + } + + public override Task DownloadStream(FileData fileData) { throw new NotImplementedException(); } - public Task DownloadStream(FileData fileData) + public override async Task Delete(FileData fileData) { - throw new NotImplementedException(); + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFiles() + { + Root = CurrentPath, + Files = new() + { + fileData.Name + } + }); } - public Task Delete(FileData fileData) + public override async Task Move(FileData fileData, string newPath) { - throw new NotImplementedException(); + var req = new RenameFiles() + { + Root = "/", + Files = new[] + { + new RenameFilesData() + { + From = (CurrentPath + fileData.Name), + To = newPath + } + } + }; + + await WingsApiHelper.Put(Server.Node, $"api/servers/{Server.Uuid}/files/rename", req); } - public Task Move(FileData fileData, string newPath) + public override async Task Compress(params FileData[] files) { - throw new NotImplementedException(); + var req = new CompressFiles() + { + Root = CurrentPath, + Files = files.Select(x => x.Name).ToArray() + }; + + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/compress", req); } - public Task GetLaunchUrl() + public override async Task Decompress(FileData fileData) { - throw new NotImplementedException(); + var req = new DecompressFile() + { + Root = CurrentPath, + File = fileData.Name + }; + + await WingsApiHelper.Post(Server.Node, $"api/servers/{Server.Uuid}/files/decompress", req); + } + + public override Task GetLaunchUrl() + { + return Task.FromResult( + $"sftp://{User.Id}.{StringHelper.IntToStringWithLeadingZeros(Server.Id, 8)}@{Server.Node.Fqdn}:{Server.Node.SftpPort}"); + } + + public override object Clone() + { + return new WingsFileAccess(WingsApiHelper, WingsJwtHelper, Server, ConfigService, User); } } \ No newline at end of file diff --git a/Moonlight/App/Helpers/PaperApiHelper.cs b/Moonlight/App/Helpers/PaperApiHelper.cs index 232b4a8..c8e1a3f 100644 --- a/Moonlight/App/Helpers/PaperApiHelper.cs +++ b/Moonlight/App/Helpers/PaperApiHelper.cs @@ -24,11 +24,11 @@ public class PaperApiHelper else requrl = ApiUrl + "/" + url; - RestRequest request = new(requrl); + RestRequest request = new(requrl, Method.Get); request.AddHeader("Content-Type", "application/json"); - var response = await client.GetAsync(request); + var response = await client.ExecuteAsync(request); if (!response.IsSuccessful) { diff --git a/Moonlight/App/Helpers/WingsApiHelper.cs b/Moonlight/App/Helpers/WingsApiHelper.cs index 23900b4..9611d64 100644 --- a/Moonlight/App/Helpers/WingsApiHelper.cs +++ b/Moonlight/App/Helpers/WingsApiHelper.cs @@ -14,24 +14,13 @@ public class WingsApiHelper Client = new(); } - private string GetApiUrl(Node node) - { - if(node.Ssl) - return $"https://{node.Fqdn}:{node.HttpPort}/"; - else - return $"http://{node.Fqdn}:{node.HttpPort}/"; - //return $"https://{node.Fqdn}:{node.HttpPort}/"; - } - public async Task Get(Node node, string resource) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Get; - var response = await Client.GetAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -53,13 +42,11 @@ public class WingsApiHelper public async Task GetRaw(Node node, string resource) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Get; - var response = await Client.GetAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -81,18 +68,16 @@ public class WingsApiHelper public async Task Post(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody ); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -114,16 +99,14 @@ public class WingsApiHelper public async Task Post(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; - if(body != null) + if(body != null) request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -143,15 +126,13 @@ public class WingsApiHelper public async Task PostRaw(Node node, string resource, object body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Post; request.AddParameter("text/plain", body, ParameterType.RequestBody); - var response = await Client.PostAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -171,16 +152,14 @@ public class WingsApiHelper public async Task Delete(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Delete; - if(body != null) + if(body != null) request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.DeleteAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -200,15 +179,13 @@ public class WingsApiHelper public async Task Put(Node node, string resource, object? body) { - RestRequest request = new(GetApiUrl(node) + resource); + var request = CreateRequest(node, resource); - request.AddHeader("Content-Type", "application/json"); - request.AddHeader("Accept", "application/json"); - request.AddHeader("Authorization", "Bearer " + node.Token); + request.Method = Method.Put; request.AddParameter("text/plain", JsonConvert.SerializeObject(body), ParameterType.RequestBody); - var response = await Client.PutAsync(request); + var response = await Client.ExecuteAsync(request); if (!response.IsSuccessful) { @@ -225,4 +202,20 @@ public class WingsApiHelper } } } + + private RestRequest CreateRequest(Node node, string resource) + { + var url = (node.Ssl ? "https" : "http") + $"://{node.Fqdn}:{node.HttpPort}/" + resource; + + var request = new RestRequest(url) + { + Timeout = 60 * 15 + }; + + request.AddHeader("Content-Type", "application/json"); + request.AddHeader("Accept", "application/json"); + request.AddHeader("Authorization", "Bearer " + node.Token); + + return request; + } } \ No newline at end of file diff --git a/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs b/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs index 6d181e2..1d64ab8 100644 --- a/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs +++ b/Moonlight/App/Models/Files/Accesses/WingsFileAccess.cs @@ -39,7 +39,7 @@ public class WingsFileAccess : IFileAccess public async Task GetDirectoryContent() { - var res = await WingsApiHelper.Get(Node, + var res = await WingsApiHelper.Get(Node, $"api/servers/{Server.Uuid}/files/list-directory?directory={Path}"); var x = new List(); @@ -130,7 +130,7 @@ public class WingsFileAccess : IFileAccess public async Task CreateDirectory(string name) { await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/create-directory", - new CreateDirectoryRequest() + new CreateDirectory() { Name = name, Path = Path @@ -171,7 +171,7 @@ public class WingsFileAccess : IFileAccess public async Task Delete(FileManagerObject managerObject) { - await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFilesRequest() + await WingsApiHelper.Post(Node, $"api/servers/{Server.Uuid}/files/delete", new DeleteFiles() { Root = Path, Files = new() @@ -183,7 +183,7 @@ public class WingsFileAccess : IFileAccess public async Task Move(FileManagerObject managerObject, string newPath) { - await WingsApiHelper.Put(Node, $"api/servers/{Server.Uuid}/files/rename", new RenameFilesRequest() + await WingsApiHelper.Put(Node, $"api/servers/{Server.Uuid}/files/rename", new RenameFiles() { Root = "/", Files = new[] diff --git a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs b/Moonlight/App/Models/Wings/Requests/CompressFiles.cs new file mode 100644 index 0000000..2c86667 --- /dev/null +++ b/Moonlight/App/Models/Wings/Requests/CompressFiles.cs @@ -0,0 +1,12 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Wings.Requests; + +public class CompressFiles +{ + [JsonProperty("root")] + public string Root { get; set; } + + [JsonProperty("files")] + public string[] Files { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateBackup.cs similarity index 89% rename from Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateBackup.cs index a0ce5b4..779abf1 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateBackupRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateBackup.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateBackupRequest +public class CreateBackup { [JsonProperty("adapter")] public string Adapter { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs similarity index 85% rename from Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateDirectory.cs index 62c95e3..1dc6617 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateDirectoryRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateDirectoryRequest +public class CreateDirectory { [JsonProperty("name")] public string Name { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs b/Moonlight/App/Models/Wings/Requests/CreateServer.cs similarity index 87% rename from Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs rename to Moonlight/App/Models/Wings/Requests/CreateServer.cs index 3288d88..7e939a4 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateServerRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/CreateServer.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class CreateServerRequest +public class CreateServer { [JsonProperty("uuid")] public Guid Uuid { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs b/Moonlight/App/Models/Wings/Requests/DecompressFile.cs new file mode 100644 index 0000000..5fb7073 --- /dev/null +++ b/Moonlight/App/Models/Wings/Requests/DecompressFile.cs @@ -0,0 +1,12 @@ +using Newtonsoft.Json; + +namespace Moonlight.App.Models.Wings.Requests; + +public class DecompressFile +{ + [JsonProperty("root")] + public string Root { get; set; } + + [JsonProperty("file")] + public string File { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs b/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs similarity index 86% rename from Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs rename to Moonlight/App/Models/Wings/Requests/DeleteFiles.cs index c64487f..9988ff0 100644 --- a/Moonlight/App/Models/Wings/Requests/DeleteFilesRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class DeleteFilesRequest +public class DeleteFiles { [JsonProperty("root")] public string Root { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs b/Moonlight/App/Models/Wings/Requests/RenameFiles.cs similarity index 91% rename from Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs rename to Moonlight/App/Models/Wings/Requests/RenameFiles.cs index 8355cff..f565a32 100644 --- a/Moonlight/App/Models/Wings/Requests/RenameFilesRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/RenameFiles.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class RenameFilesRequest +public class RenameFiles { [JsonProperty("root")] public string Root { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs b/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs similarity index 90% rename from Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs rename to Moonlight/App/Models/Wings/Requests/RestoreBackup.cs index 0dfa9cb..fcd7b8a 100644 --- a/Moonlight/App/Models/Wings/Requests/RestoreBackupRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class RestoreBackupRequest +public class RestoreBackup { [JsonProperty("adapter")] public string Adapter { get; set; } diff --git a/Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs b/Moonlight/App/Models/Wings/Requests/ServerPower.cs similarity index 81% rename from Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs rename to Moonlight/App/Models/Wings/Requests/ServerPower.cs index 597d9e5..e877fb7 100644 --- a/Moonlight/App/Models/Wings/Requests/ServerPowerRequest.cs +++ b/Moonlight/App/Models/Wings/Requests/ServerPower.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Requests; -public class ServerPowerRequest +public class ServerPower { [JsonProperty("action")] public string Action { get; set; } diff --git a/Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs b/Moonlight/App/Models/Wings/Resources/ListDirectory.cs similarity index 94% rename from Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs rename to Moonlight/App/Models/Wings/Resources/ListDirectory.cs index 0a67bfa..d99e15d 100644 --- a/Moonlight/App/Models/Wings/Resources/ListDirectoryRequest.cs +++ b/Moonlight/App/Models/Wings/Resources/ListDirectory.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Resources; -public class ListDirectoryRequest +public class ListDirectory { [JsonProperty("name")] public string Name { get; set; } diff --git a/Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs b/Moonlight/App/Models/Wings/Resources/ServerDetails.cs similarity index 78% rename from Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs rename to Moonlight/App/Models/Wings/Resources/ServerDetails.cs index bc89a29..b14ac56 100644 --- a/Moonlight/App/Models/Wings/Resources/ServerDetailsResponse.cs +++ b/Moonlight/App/Models/Wings/Resources/ServerDetails.cs @@ -2,7 +2,7 @@ namespace Moonlight.App.Models.Wings.Resources; -public class ServerDetailsResponse +public class ServerDetails { [JsonProperty("state")] public string State { get; set; } @@ -11,9 +11,9 @@ public class ServerDetailsResponse public bool IsSuspended { get; set; } [JsonProperty("utilization")] - public ServerDetailsResponseUtilization Utilization { get; set; } + public ServerDetailsUtilization Utilization { get; set; } - public class ServerDetailsResponseUtilization + public class ServerDetailsUtilization { [JsonProperty("memory_bytes")] public long MemoryBytes { get; set; } @@ -25,7 +25,7 @@ public class ServerDetailsResponse public double CpuAbsolute { get; set; } [JsonProperty("network")] - public ServerDetailsResponseNetwork Network { get; set; } + public ServerDetailsNetwork Network { get; set; } [JsonProperty("uptime")] public long Uptime { get; set; } @@ -37,7 +37,7 @@ public class ServerDetailsResponse public long DiskBytes { get; set; } } - public class ServerDetailsResponseNetwork + public class ServerDetailsNetwork { [JsonProperty("rx_bytes")] public long RxBytes { get; set; } diff --git a/Moonlight/App/Services/Interop/ModalService.cs b/Moonlight/App/Services/Interop/ModalService.cs new file mode 100644 index 0000000..881fb2e --- /dev/null +++ b/Moonlight/App/Services/Interop/ModalService.cs @@ -0,0 +1,23 @@ +using Microsoft.JSInterop; + +namespace Moonlight.App.Services.Interop; + +public class ModalService +{ + private readonly IJSRuntime JsRuntime; + + public ModalService(IJSRuntime jsRuntime) + { + JsRuntime = jsRuntime; + } + + public async Task Show(string name) + { + await JsRuntime.InvokeVoidAsync("moonlight.modals.show", name); + } + + public async Task Hide(string name) + { + await JsRuntime.InvokeVoidAsync("moonlight.modals.hide", name); + } +} \ No newline at end of file diff --git a/Moonlight/App/Services/Interop/ToastService.cs b/Moonlight/App/Services/Interop/ToastService.cs index 3eff8a1..5e1839d 100644 --- a/Moonlight/App/Services/Interop/ToastService.cs +++ b/Moonlight/App/Services/Interop/ToastService.cs @@ -30,4 +30,19 @@ public class ToastService { await JsRuntime.InvokeVoidAsync("showSuccessToast", message); } + + public async Task CreateProcessToast(string id, string text) + { + await JsRuntime.InvokeVoidAsync("createToast", id, text); + } + + public async Task UpdateProcessToast(string id, string text) + { + await JsRuntime.InvokeVoidAsync("modifyToast", id, text); + } + + public async Task RemoveProcessToast(string id) + { + await JsRuntime.InvokeVoidAsync("removeToast", id); + } } \ No newline at end of file diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index 0542a09..2f69fd7 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -75,11 +75,11 @@ public class ServerService return s; } - public async Task GetDetails(Server s) + public async Task GetDetails(Server s) { Server server = EnsureNodeData(s); - return await WingsApiHelper.Get( + return await WingsApiHelper.Get( server.Node, $"api/servers/{server.Uuid}" ); @@ -91,7 +91,7 @@ public class ServerService var rawSignal = signal.ToString().ToLower(); - await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/power", new ServerPowerRequest() + await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/power", new ServerPower() { Action = rawSignal }); @@ -118,7 +118,7 @@ public class ServerService serverData.Backups.Add(backup); ServerRepository.Update(serverData); - await WingsApiHelper.Post(serverData.Node, $"api/servers/{serverData.Uuid}/backup", new CreateBackupRequest() + await WingsApiHelper.Post(serverData.Node, $"api/servers/{serverData.Uuid}/backup", new CreateBackup() { Adapter = "wings", Uuid = backup.Uuid, @@ -158,7 +158,7 @@ public class ServerService Server server = EnsureNodeData(s); await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/backup/{serverBackup.Uuid}/restore", - new RestoreBackupRequest() + new RestoreBackup() { Adapter = "wings" }); @@ -299,7 +299,7 @@ public class ServerService try { - await WingsApiHelper.Post(node, $"api/servers", new CreateServerRequest() + await WingsApiHelper.Post(node, $"api/servers", new CreateServer() { Uuid = newServerData.Uuid, StartOnCompletion = false diff --git a/Moonlight/Pages/_Layout.cshtml b/Moonlight/Pages/_Layout.cshtml index 523da77..b82364f 100644 --- a/Moonlight/Pages/_Layout.cshtml +++ b/Moonlight/Pages/_Layout.cshtml @@ -113,5 +113,6 @@ + \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 4543609..5bf8797 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -93,6 +93,7 @@ namespace Moonlight builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor index 64635cd..f1f9eea 100644 --- a/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor +++ b/Moonlight/Shared/Components/FileManagerPartials/FileManager.razor @@ -1,6 +1,15 @@ @using Moonlight.App.Helpers.Files @using Moonlight.App.Helpers @using Logging.Net +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop +@using BlazorDownloadFile + +@inject ToastService ToastService +@inject NavigationManager NavigationManager +@inject AlertService AlertService +@inject SmartTranslateService SmartTranslateService +@inject IBlazorDownloadFileService FileService @if (Editing) { @@ -14,35 +23,63 @@ } else { -
    -
    -
    -
    - @{ - var vx = "/"; +
    +
    +
    +
    + +
    +
    +
    +
    + @if (View != null && View.SelectedFiles.Any()) + { +
    + @(View.SelectedFiles.Length) selected +
    + + + + + + + + + } - / - - - - - - @{ - var cp = "/"; - var lp = "/"; - var pathParts = CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); - foreach (var path in pathParts) - { - lp = cp; - @(path) - + else + { + - cp += path + "/"; - } + + + }
    @@ -53,35 +90,141 @@ else + OnSelectionChanged="OnSelectionChanged" + OnElementClicked="OnElementClicked" + DisableScrolling="true">
    + + + } @code { [Parameter] - public IFileAccess Access { get; set; } + public FileAccess Access { get; set; } + // File Editor private bool Editing = false; private string EditorInitialData = ""; private string EditorLanguage = ""; private FileData EditingFile; private FileEditor Editor; - private FileView View; - private string CurrentPath = "/"; + // File View + private FileView? View; - private ContextAction[] Actions = + // File Move + private FileAccess MoveAccess; + private FileSelectModal FileSelectModal; + private FileData? SingleMoveFile = null; + + // Config + private ContextAction[] Actions = Array.Empty(); + + protected override void OnInitialized() { - new() + MoveAccess = (FileAccess)Access.Clone(); + + List actions = new(); + + actions.Add(new() { Id = "rename", Name = "Rename", - Action = (x) => { } - } - }; + Action = async (x) => + { + var name = await AlertService.Text( + SmartTranslateService.Translate("Rename"), + SmartTranslateService.Translate("Enter a new name"), + x.Name + ); + + if (name != x.Name) + { + await Access.Move(x, Access.CurrentPath + name); + } + + await View!.Refresh(); + } + }); + + actions.Add(new () + { + Id = "download", + Name = "Download", + Action = async (x) => + { + if (x.IsFile) + { + try + { + var stream = await Access.DownloadStream(x); + await ToastService.Info(SmartTranslateService.Translate("Starting download")); + await FileService.AddBuffer(stream); + await FileService.DownloadBinaryBuffers(x.Name); + } + catch (NotImplementedException) + { + var url = await Access.DownloadUrl(x); + NavigationManager.NavigateTo(url, true); + await ToastService.Info(SmartTranslateService.Translate("Starting download")); + } + } + } + }); + + actions.Add(new() + { + Id = "compress", + Name = "Compress", + Action = async (x) => + { + await Access.Compress(x); + await View!.Refresh(); + } + }); + + actions.Add(new () + { + Id = "decompress", + Name = "Decompress", + Action = async (x) => + { + await Access.Decompress(x); + await View!.Refresh(); + } + }); + + actions.Add(new() + { + Id = "move", + Name = "Move", + Action = async (x) => + { + SingleMoveFile = x; + await StartMoveFiles(); + } + }); + + actions.Add(new() + { + Id = "delete", + Name = "Delete", + Action = async (x) => + { + await Access.Delete(x); + await View!.Refresh(); + } + }); + + Actions = actions.ToArray(); + } private async Task OnElementClicked(FileData fileData) { @@ -92,22 +235,13 @@ else EditingFile = fileData; Editing = true; - await InvokeAsync(StateHasChanged); + await InvokeAsync(StateHasChanged); return true; } - else - { - return false; - } - } - - public async Task SetPath(string path) - { - await Access.SetDir(path); - CurrentPath = await Access.Pwd(); - + await InvokeAsync(StateHasChanged); + return false; } private async void Cancel(bool save = false) @@ -122,9 +256,74 @@ else await InvokeAsync(StateHasChanged); } - private async void OnPathChanged(string path) + private async Task Launch() { - CurrentPath = path; + var url = await Access.GetLaunchUrl(); + NavigationManager.NavigateTo(url, true); + } + + private async Task CreateFolder() + { + var name = await AlertService.Text( + SmartTranslateService.Translate("Create a new folder"), + SmartTranslateService.Translate("Enter a name"), + "" + ); + + if (string.IsNullOrEmpty(name)) + return; + + await Access.MkDir(name); + await View!.Refresh(); + } + + private async Task OnSelectionChanged() + { + await InvokeAsync(StateHasChanged); + } + + private async Task StartMoveFiles() + { + await FileSelectModal.Show(); + } + + private async Task DeleteMultiple() + { + foreach (var data in View!.SelectedFiles) + { + await Access.Delete(data); + } + + await View!.Refresh(); + } + + private async Task CompressMultiple() + { + await Access.Compress(View!.SelectedFiles); + + await View!.Refresh(); + } + + private async Task OnFileMoveSubmit(string path) + { + foreach (var sFile in View!.SelectedFiles) + { + await Access.Move(sFile, path + sFile.Name); + } + + if (SingleMoveFile != null) + { + await Access.Move(SingleMoveFile, path + SingleMoveFile.Name); + SingleMoveFile = null; + } + + await View.Refresh(); + } + + // This method can be called by every component to refresh the view + private async Task OnComponentStateChanged() + { + await View!.Refresh(); await InvokeAsync(StateHasChanged); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor b/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor new file mode 100644 index 0000000..93982da --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FilePath.razor @@ -0,0 +1,47 @@ +@using Moonlight.App.Helpers.Files + +
    +
    + @{ + var vx = "/"; + } + / + + + + + + @{ + var cp = "/"; + var lp = "/"; + var pathParts = Access.CurrentPath.Replace("\\", "/").Split('/', StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathParts) + { + lp = cp; + @(path) + + + + + + + cp += path + "/"; + } + } +
    +
    + +@code +{ + [Parameter] + public FileAccess Access { get; set; } + + [Parameter] + public Func? OnPathChanged { get; set; } + + public async Task SetPath(string path) + { + await Access.SetDir(path); + OnPathChanged?.Invoke(); + } +} diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor b/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor new file mode 100644 index 0000000..9a9814f --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileSelectModal.razor @@ -0,0 +1,132 @@ +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject ModalService ModalService +@inject SmartTranslateService SmartTranslateService + + + +@code +{ + [Parameter] + public FileAccess Access { get; set; } + + [Parameter] + public bool OnlyFolder { get; set; } = false; + + [Parameter] + public Func? Filter { get; set; } + + [Parameter] + public string Title { get; set; } = "Select file or folder"; + + [Parameter] + public Func? OnSubmit { get; set; } + + [Parameter] + public Func? OnCancel { get; set; } + + private int Id = 0; + private string Result = "/"; + + private FileView FileView; + + protected override void OnInitialized() + { + Id = this.GetHashCode(); + } + + public async Task Show() + { + // Reset + Result = "/"; + await Access.SetDir("/"); + await FileView.Refresh(); + + await ModalService.Show("fileView" + Id); + } + + public async Task Hide() + { + await Cancel(); + } + + private async Task Cancel() + { + await ModalService.Hide("fileView" + Id); + await OnCancel?.Invoke()!; + } + + private async Task Submit() + { + await ModalService.Hide("fileView" + Id); + await OnSubmit?.Invoke(Result)!; + } + + private bool DoFilter(FileData file) + { + if (OnlyFolder) + { + if (file.IsFile) + return false; + else + { + if (Filter != null) + return Filter.Invoke(file); + else + return true; + } + } + else + { + if (Filter != null) + return Filter.Invoke(file); + else + return true; + } + } + + private async Task OnElementClicked(FileData file) + { + Result = Access.CurrentPath + file.Name + (file.IsFile ? "" : "/"); + + if (!OnlyFolder && file.IsFile) + { + await Submit(); + } + + return false; + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor b/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor new file mode 100644 index 0000000..5efc29f --- /dev/null +++ b/Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor @@ -0,0 +1,90 @@ +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop +@using Logging.Net + +@inject ToastService ToastService +@inject SmartTranslateService SmartTranslateService + +
    -
    +
    @@ -38,7 +41,7 @@ @@ -115,29 +124,46 @@ - - @foreach (var action in ContextActions) - { - - @action.Name - - } - +@if (ContextActions.Any()) +{ + + @foreach (var action in ContextActions) + { + + @action.Name + + } + +} @code { [Parameter] - public IFileAccess Access { get; set; } + public FileAccess Access { get; set; } [Parameter] public Func>? OnElementClicked { get; set; } [Parameter] - public Action? OnPathChanged { get; set; } + public Func? OnSelectionChanged { get; set; } [Parameter] public ContextAction[] ContextActions { get; set; } = Array.Empty(); + [Parameter] + public bool HideSelect { get; set; } = false; + + [Parameter] + public bool DisableScrolling { get; set; } = false; + + [Parameter] + public Func? Filter { get; set; } + + public FileData[] SelectedFiles => ToggleStatusCache + .Where(x => x.Value) + .Select(x => x.Key) + .ToArray(); + private FileData[] Data = Array.Empty(); private Dictionary ToggleStatusCache = new(); @@ -145,8 +171,23 @@ public async Task Refresh() { - Data = await Access.Ls(); + var list = new List(); + + foreach (var fileData in await Access.Ls()) + { + if (Filter != null) + { + if(Filter.Invoke(fileData)) + list.Add(fileData); + } + else + list.Add(fileData); + } + + Data = list.ToArray(); + ToggleStatusCache.Clear(); + AllToggled = false; foreach (var fileData in Data) { @@ -154,6 +195,7 @@ } await InvokeAsync(StateHasChanged); + OnSelectionChanged?.Invoke(); } private async Task Load(LazyLoader arg) @@ -169,6 +211,7 @@ ToggleStatusCache.Add(fileData, status); await InvokeAsync(StateHasChanged); + OnSelectionChanged?.Invoke(); } private async Task SetToggleState(bool status) @@ -181,6 +224,7 @@ } await InvokeAsync(StateHasChanged); + OnSelectionChanged?.Invoke(); } private async Task OnClicked(FileData fileData) @@ -197,16 +241,25 @@ { await Access.Cd(fileData.Name); await Refresh(); - OnPathChanged?.Invoke(await Access.Pwd()); } } private async Task GoUp() { + if (OnElementClicked != null) + { + var canceled = await OnElementClicked.Invoke(new() + { + Name = "..", + IsFile = false + }); + + if (canceled) + return; + } + await Access.Up(); await Refresh(); - - OnPathChanged?.Invoke(await Access.Pwd()); } private Task OnContextMenuClick(ItemClickEventArgs eventArgs) diff --git a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor index ed0e1d1..63a30da 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor @@ -1,27 +1,27 @@ @using Moonlight.Shared.Components.FileManagerPartials -@using Moonlight.App.Services -@using Moonlight.App.Helpers -@using Moonlight.App.Models.Files -@using Moonlight.App.Services.Sessions @using Moonlight.App.Database.Entities +@using Moonlight.App.Helpers +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services -@inject ServerService ServerService -@inject IdentityService IdentityService +@inject WingsApiHelper WingsApiHelper +@inject WingsJwtHelper WingsJwtHelper +@inject ConfigService ConfigService - - - + @code { [CascadingParameter] public Server CurrentServer { get; set; } + + [CascadingParameter] + public User User { get; set; } - private IFileAccess FileAccess; + private FileAccess FileAccess; - private async Task Load(LazyLoader arg) + protected override void OnInitialized() { - var user = await IdentityService.Get(); // User for launch url - FileAccess = await ServerService.CreateFileAccess(CurrentServer, user); + FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, CurrentServer, ConfigService, User); } } diff --git a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor index 77457bc..f207dfd 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor @@ -1,51 +1,64 @@ @using PteroConsole.NET @using Moonlight.App.Database.Entities @using Moonlight.Shared.Components.ServerControl.Settings +@using Microsoft.AspNetCore.Components.Rendering -
    - @if (Tags.Contains("paperversion")) - { - - } - - @if (Tags.Contains("pythonversion")) - { - - } - -@{ - /* - * @if (Tags.Contains("pythonfile")) - { - - } - - @if (Tags.Contains("javascriptfile")) - { - - } - */ -} - - @if (Tags.Contains("javascriptversion")) - { - - } - - @if (Tags.Contains("join2start")) - { - - } -
    + +
    + @foreach (var setting in Settings) + { +
    +

    + +

    +
    +
    + @(GetComponent(setting.Value)) +
    +
    +
    + } +
    +     @code { - [CascadingParameter] - public PteroConsole Console { get; set; } - [CascadingParameter] public Server CurrentServer { get; set; } [CascadingParameter] public string[] Tags { get; set; } + + private Dictionary Settings = new(); + + private Task Load(LazyLoader lazyLoader) + { + if(Tags.Contains("paperversion")) + Settings.Add("Paper version", typeof(PaperVersionSetting)); + + if(Tags.Contains("join2start")) + Settings.Add("Join2Start", typeof(Join2StartSetting)); + + if(Tags.Contains("javascriptversion")) + Settings.Add("Javascript version", typeof(JavascriptVersionSetting)); + + if(Tags.Contains("javascriptfile")) + Settings.Add("Javascript file", typeof(JavascriptFileSetting)); + + if(Tags.Contains("pythonversion")) + Settings.Add("Python version", typeof(PythonVersionSetting)); + + if(Tags.Contains("pythonfile")) + Settings.Add("Python file", typeof(PythonFileSetting)); + + return Task.CompletedTask; + } + + private RenderFragment GetComponent(Type type) => builder => + { + builder.OpenComponent(0, type); + builder.CloseComponent(); + }; } \ No newline at end of file diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor new file mode 100644 index 0000000..1d97402 --- /dev/null +++ b/Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor @@ -0,0 +1,82 @@ +@using Task = System.Threading.Tasks.Task +@using Moonlight.App.Repositories.Servers +@using Moonlight.Shared.Components.FileManagerPartials +@using Moonlight.App.Database.Entities +@using Moonlight.App.Helpers +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services + +@inject ServerRepository ServerRepository +@inject WingsApiHelper WingsApiHelper +@inject SmartTranslateService SmartTranslateService + +
    +
    + + + + + +
    +
    + + + + +@code +{ + [CascadingParameter] + public Server CurrentServer { get; set; } + + private string PathAndFile; + private FileAccess Access; + + private FileSelectModal FileSelectModal; + private LazyLoader LazyLoader; + + protected override void OnInitialized() + { + Access = new WingsFileAccess(WingsApiHelper, + null!, + CurrentServer, + null!, + null! + ); + } + + private async Task Load(LazyLoader lazyLoader) + { + var v = CurrentServer.Variables.FirstOrDefault(x => x.Key == "BOT_JS_FILE"); + + PathAndFile = v != null ? v.Value : ""; + + await InvokeAsync(StateHasChanged); + } + + private async Task Show() + { + await FileSelectModal.Show(); + } + + private async Task OnSubmit(string path) + { + var v = CurrentServer.Variables.FirstOrDefault(x => x.Key == "BOT_JS_FILE"); + + if (v != null) + { + v.Value = path.TrimStart("/"[0]); + + ServerRepository.Update(CurrentServer); + } + + await LazyLoader.Reload(); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor index d456de2..74936d3 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor @@ -8,29 +8,34 @@ @inject ServerRepository ServerRepository @inject ImageRepository ImageRepository @inject SmartTranslateService TranslationService - +
    - - + @foreach (var image in DockerImages) { - if (image == Image) + if (image.Id == SelectedImage.Id) { - + } else { - + } } - + +
    @@ -40,44 +45,36 @@ [CascadingParameter] public Server CurrentServer { get; set; } - private string[] Images; - private string Image; - private LazyLoader LazyLoader; + private List DockerImages; + private DockerImage SelectedImage; - private async Task Load(LazyLoader lazyLoader) + private int ImageIndex { - //TODO: Check if this is a redundant call - var serverImage = ImageRepository + get => SelectedImage.Id; + set { SelectedImage = DockerImages.First(x => x.Id == value); } + } + + private Task Load(LazyLoader lazyLoader) + { + var image = ImageRepository .Get() .Include(x => x.DockerImages) .First(x => x.Id == CurrentServer.Image.Id); - - Image = ParseHelper.FirstPartStartingWithNumber(serverImage.DockerImages.First(x => x.Id == CurrentServer.DockerImageIndex).Name); - - var res = new List(); - foreach (var image in serverImage.DockerImages) - { - res.Add(ParseHelper.FirstPartStartingWithNumber(image.Name)); - } - Images = res.ToArray(); - await InvokeAsync(StateHasChanged); + DockerImages = image.DockerImages; + + SelectedImage = DockerImages[CurrentServer.DockerImageIndex]; + + return Task.CompletedTask; } private async Task Save() { - var serverImage = ImageRepository - .Get() - .Include(x => x.DockerImages) - .First(x => x.Id == CurrentServer.Image.Id); - - var allImages = serverImage.DockerImages; - var imageToUse = allImages.First(x => x.Name.EndsWith(Image)); - CurrentServer.DockerImageIndex = allImages.IndexOf(imageToUse); - - ServerRepository.Update(CurrentServer); + CurrentServer.DockerImageIndex = DockerImages.IndexOf(SelectedImage); + ServerRepository.Update(CurrentServer); + await LazyLoader.Reload(); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor index a5a2a86..1500f8f 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor @@ -1,7 +1,5 @@ @using Moonlight.App.Services -@using Moonlight.Shared.Components.Partials @using Task = System.Threading.Tasks.Task -@using Logging.Net @using Microsoft.EntityFrameworkCore @using Moonlight.App.Database.Entities @using Moonlight.App.Repositories diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor new file mode 100644 index 0000000..80e8ea9 --- /dev/null +++ b/Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor @@ -0,0 +1,82 @@ +@using Task = System.Threading.Tasks.Task +@using Moonlight.App.Repositories.Servers +@using Moonlight.Shared.Components.FileManagerPartials +@using Moonlight.App.Database.Entities +@using Moonlight.App.Helpers +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services + +@inject ServerRepository ServerRepository +@inject WingsApiHelper WingsApiHelper +@inject SmartTranslateService SmartTranslateService + +
    +
    + + + + + +
    +
    + + + + +@code +{ + [CascadingParameter] + public Server CurrentServer { get; set; } + + private string PathAndFile; + private FileAccess Access; + + private FileSelectModal FileSelectModal; + private LazyLoader LazyLoader; + + protected override void OnInitialized() + { + Access = new WingsFileAccess(WingsApiHelper, + null!, + CurrentServer, + null!, + null! + ); + } + + private async Task Load(LazyLoader lazyLoader) + { + var v = CurrentServer.Variables.FirstOrDefault(x => x.Key == "BOT_PY_FILE"); + + PathAndFile = v != null ? v.Value : ""; + + await InvokeAsync(StateHasChanged); + } + + private async Task Show() + { + await FileSelectModal.Show(); + } + + private async Task OnSubmit(string path) + { + var v = CurrentServer.Variables.FirstOrDefault(x => x.Key == "BOT_PY_FILE"); + + if (v != null) + { + v.Value = path.TrimStart("/"[0]); + + ServerRepository.Update(CurrentServer); + } + + await LazyLoader.Reload(); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor index 2cf8374..5969711 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor @@ -1,6 +1,4 @@ @using Moonlight.App.Services -@using Task = System.Threading.Tasks.Task -@using Moonlight.Shared.Components.Partials @using Moonlight.App.Helpers @using Moonlight.App.Repositories @using Moonlight.App.Repositories.Servers @@ -15,24 +13,29 @@
    - + @foreach (var image in DockerImages) { - if (image == Image) + if (image.Id == SelectedImage.Id) { - + } else { - + } } - + +
    @@ -42,43 +45,36 @@ [CascadingParameter] public Server CurrentServer { get; set; } - private string[] Images; - private string Image; - private LazyLoader LazyLoader; + private List DockerImages; + private DockerImage SelectedImage; - private async Task Load(LazyLoader lazyLoader) + private int ImageIndex { - var serverImage = ImageRepository + get => SelectedImage.Id; + set { SelectedImage = DockerImages.First(x => x.Id == value); } + } + + private Task Load(LazyLoader lazyLoader) + { + var image = ImageRepository .Get() .Include(x => x.DockerImages) .First(x => x.Id == CurrentServer.Image.Id); - - Image = ParseHelper.FirstPartStartingWithNumber(serverImage.DockerImages.First(x => x.Id == CurrentServer.DockerImageIndex).Name); - - var res = new List(); - foreach (var image in serverImage.DockerImages) - { - res.Add(ParseHelper.FirstPartStartingWithNumber(image.Name)); - } - Images = res.ToArray(); - await InvokeAsync(StateHasChanged); + DockerImages = image.DockerImages; + + SelectedImage = DockerImages[CurrentServer.DockerImageIndex]; + + return Task.CompletedTask; } private async Task Save() { - var serverImage = ImageRepository - .Get() - .Include(x => x.DockerImages) - .First(x => x.Id == CurrentServer.Image.Id); - - var allImages = serverImage.DockerImages; - var imageToUse = allImages.First(x => x.Name.EndsWith(Image)); - CurrentServer.DockerImageIndex = allImages.IndexOf(imageToUse); - - ServerRepository.Update(CurrentServer); + CurrentServer.DockerImageIndex = DockerImages.IndexOf(SelectedImage); + ServerRepository.Update(CurrentServer); + await LazyLoader.Reload(); } } \ No newline at end of file diff --git a/Moonlight/Shared/Views/Server/Index.razor b/Moonlight/Shared/Views/Server/Index.razor index 94efbf4..a6a6567 100644 --- a/Moonlight/Shared/Views/Server/Index.razor +++ b/Moonlight/Shared/Views/Server/Index.razor @@ -8,6 +8,7 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Helpers @using Moonlight.App.Repositories +@using Moonlight.App.Services @using Moonlight.Shared.Components.Xterm @using Moonlight.Shared.Components.ServerControl @using Newtonsoft.Json @@ -15,6 +16,10 @@ @inject ImageRepository ImageRepository @inject ServerRepository ServerRepository @inject WingsConsoleHelper WingsConsoleHelper +@inject MessageService MessageService +@inject NavigationManager NavigationManager + +@implements IDisposable @if (CurrentServer == null) @@ -36,6 +41,21 @@ if (Console.ConnectionState == ConnectionState.Connected) { if (Console.ServerState == ServerState.Installing) + { +
    +
    +
    +
    + + Server installation is currently running + +
    +
    + +
    +
    + } + else if (CurrentServer.Installing) {
    @@ -72,7 +92,7 @@ case "network": index = 3; break; - case "plugins": + case "addons": index = 4; break; case "settings": @@ -207,10 +227,28 @@ await lazyLoader.SetText("Connecting to console"); await WingsConsoleHelper.ConnectWings(Console!, CurrentServer); + + MessageService.Subscribe($"server.{CurrentServer.Uuid}.installcomplete", this, server => + { + Task.Run(() => + { + NavigationManager.NavigateTo(NavigationManager.Uri); + }); + + return Task.CompletedTask; + }); } else { Logger.Debug("Server is null"); } } + + public void Dispose() + { + if (CurrentServer != null) + { + MessageService.Unsubscribe($"server.{CurrentServer.Uuid}.installcomplete", this); + } + } } \ No newline at end of file diff --git a/Moonlight/Shared/Views/Test.razor b/Moonlight/Shared/Views/Test.razor index ce2ede8..eafabd5 100644 --- a/Moonlight/Shared/Views/Test.razor +++ b/Moonlight/Shared/Views/Test.razor @@ -5,10 +5,13 @@ @using Moonlight.App.Helpers.Files @using Microsoft.EntityFrameworkCore @using Moonlight.App.Helpers +@using Moonlight.App.Services +@using User = Moonlight.App.Database.Entities.User @inject ServerRepository ServerRepository @inject WingsApiHelper WingsApiHelper @inject WingsJwtHelper WingsJwtHelper +@inject ConfigService ConfigService @@ -17,7 +20,10 @@ @code { - private IFileAccess FileAccess; + [CascadingParameter] + public User User { get; set; } + + private FileAccess FileAccess; private Task Load(LazyLoader arg) { @@ -26,7 +32,7 @@ .Include(x => x.Node) .First(); - FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, server); + FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, server, ConfigService, User); return Task.CompletedTask; } diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 6bb3356..25a1ae6 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -411,3 +411,24 @@ Server not found;Server not found A server with that id cannot be found or you have no access for this server;A server with that id cannot be found or you have no access for this server Addons;Addons Go up;Go up +Uploading files;Uploading files +complete;complete +Upload complete;Upload complete +Moving;Moving +selected;selected +Select folder to move the file(s) to;Select folder to move the file(s) to +Submit;Submit +Processing;Processing +Error from daemon;Error from daemon +Enter a new name;Enter a new name +The uploaded file should not be bigger than 100MB;The uploaded file should not be bigger than 100MB +Compress;Compress +Compressing;Compressing +Decompress;Decompress +Paper version;Paper version +Error creating server on wings;Error creating server on wings +Javascript version;Javascript version +Javascript file;Javascript file +Select javascript file to execute on start;Select javascript file to execute on start +Javascript Version;Javascript Version +Join2Start;Join2Start diff --git a/Moonlight/wwwroot/assets/js/moonlight.js b/Moonlight/wwwroot/assets/js/moonlight.js new file mode 100644 index 0000000..55e11d6 --- /dev/null +++ b/Moonlight/wwwroot/assets/js/moonlight.js @@ -0,0 +1,13 @@ +window.moonlight = +{ + modals: { + show: function (name) + { + $('#' + name).modal('show'); + }, + hide: function (name) + { + $('#' + name).modal('hide'); + } + } +}; \ No newline at end of file diff --git a/Moonlight/wwwroot/assets/js/toastUtils.js b/Moonlight/wwwroot/assets/js/toastUtils.js index cffa317..cbccb04 100644 --- a/Moonlight/wwwroot/assets/js/toastUtils.js +++ b/Moonlight/wwwroot/assets/js/toastUtils.js @@ -1,19 +1,52 @@ -window.showInfoToast = function (msg) -{ +window.showInfoToast = function (msg) { toastr['info'](msg); } -window.showErrorToast = function (msg) -{ +window.showErrorToast = function (msg) { toastr['error'](msg); } -window.showSuccessToast = function (msg) -{ +window.showSuccessToast = function (msg) { toastr['success'](msg); } -window.showWarningToast = function (msg) -{ +window.showWarningToast = function (msg) { toastr['warning'](msg); +} + +window.createToast = function (id, text) { + var toast = toastr.success(text, '', + { + closeButton: true, + progressBar: false, + tapToDismiss: false, + timeOut: 0, + extendedTimeOut: 0, + positionClass: "toastr-bottom-right", + preventDuplicates: false, + onclick: function () { + toastr.clear(toast); + } + }); + var toastElement = toast[0]; + toastElement.setAttribute('data-toast-id', id); + toastElement.classList.add("bg-secondary"); +} + +window.modifyToast = function (id, newText) { + var toast = document.querySelector('[data-toast-id="' + id + '"]'); + + if (toast) { + var toastMessage = toast.lastChild; + if (toastMessage) { + toastMessage.innerHTML = newText; + } + } +} + +window.removeToast = function (id) { + var toast = document.querySelector('[data-toast-id="' + id + '"]'); + if (toast) { + toast.childNodes.item(1).click(); + } } \ No newline at end of file From 7b6528b03f4db90a6f935f32cf786965f4e49607 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:15:12 +0200 Subject: [PATCH 16/39] cleanup exceptions (hopefully) --- Moonlight/App/Database/DataContext.cs | 1 - Moonlight/App/Database/Entities/Server.cs | 1 + ...5_ChengedCleanupExceptionModel.Designer.cs | 1098 +++++++++++++++++ ...0402215155_ChengedCleanupExceptionModel.cs | 51 + ...nupExceptionChangedServerModel.Designer.cs | 1067 ++++++++++++++++ ...movedCleanupExceptionChangedServerModel.cs | 62 + .../Migrations/DataContextModelSnapshot.cs | 21 +- Moonlight/App/Models/Misc/CleanupException.cs | 8 - .../CleanupExceptionRepository.cs | 44 - Moonlight/App/Services/CleanupService.cs | 5 +- Moonlight/Moonlight.csproj | 2 + Moonlight/Program.cs | 1 - .../{Cleanup.razor => Cleanup/Index.razor} | 29 +- .../Shared/Views/Admin/Servers/Edit.razor | 4 + Moonlight/resources/lang/de_de.lang | 2 + 15 files changed, 2314 insertions(+), 82 deletions(-) create mode 100644 Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.cs create mode 100644 Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.cs delete mode 100644 Moonlight/App/Models/Misc/CleanupException.cs delete mode 100644 Moonlight/App/Repositories/CleanupExceptionRepository.cs rename Moonlight/Shared/Views/Admin/Servers/{Cleanup.razor => Cleanup/Index.razor} (90%) diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index 3080229..23b9373 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -43,7 +43,6 @@ public class DataContext : DbContext public DbSet AaPanels { get; set; } public DbSet Websites { get; set; } public DbSet DdosAttacks { get; set; } - public DbSet CleanupExceptions { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Moonlight/App/Database/Entities/Server.cs b/Moonlight/App/Database/Entities/Server.cs index 11388d9..cad9ced 100644 --- a/Moonlight/App/Database/Entities/Server.cs +++ b/Moonlight/App/Database/Entities/Server.cs @@ -20,4 +20,5 @@ public class Server public NodeAllocation MainAllocation { get; set; } = null!; public Node Node { get; set; } = null!; public User Owner { get; set; } = null!; + public bool IsCleanupException { get; set; } = false; } \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.Designer.cs b/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.Designer.cs new file mode 100644 index 0000000..6dd7b20 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.Designer.cs @@ -0,0 +1,1098 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230402215155_ChengedCleanupExceptionModel")] + partial class ChengedCleanupExceptionModel + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Country") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Models.Misc.CleanupException", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Note") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("CleanupExceptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Models.Misc.CleanupException", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", "Server") + .WithMany() + .HasForeignKey("ServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Server"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.cs b/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.cs new file mode 100644 index 0000000..15e5bcb --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402215155_ChengedCleanupExceptionModel.cs @@ -0,0 +1,51 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class ChengedCleanupExceptionModel : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CreatedAt", + table: "CleanupExceptions", + type: "datetime(6)", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.CreateIndex( + name: "IX_CleanupExceptions_ServerId", + table: "CleanupExceptions", + column: "ServerId"); + + migrationBuilder.AddForeignKey( + name: "FK_CleanupExceptions_Servers_ServerId", + table: "CleanupExceptions", + column: "ServerId", + principalTable: "Servers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_CleanupExceptions_Servers_ServerId", + table: "CleanupExceptions"); + + migrationBuilder.DropIndex( + name: "IX_CleanupExceptions_ServerId", + table: "CleanupExceptions"); + + migrationBuilder.DropColumn( + name: "CreatedAt", + table: "CleanupExceptions"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.Designer.cs b/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.Designer.cs new file mode 100644 index 0000000..59b5c12 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.Designer.cs @@ -0,0 +1,1067 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230402220651_RemovedCleanupExceptionChangedServerModel")] + partial class RemovedCleanupExceptionChangedServerModel + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("IsCleanupException") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Duration") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SellPassId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Amount") + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("SubscriptionLimits"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("varchar(128)"); + + b.Property("Country") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionId") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("SubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Subscription", null) + .WithMany("Limits") + .HasForeignKey("SubscriptionId"); + + b.Navigation("Image"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") + .WithMany() + .HasForeignKey("SubscriptionId"); + + b.Navigation("Subscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Navigation("Limits"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.cs b/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.cs new file mode 100644 index 0000000..4f1a3c1 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230402220651_RemovedCleanupExceptionChangedServerModel.cs @@ -0,0 +1,62 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class RemovedCleanupExceptionChangedServerModel : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CleanupExceptions"); + + migrationBuilder.AddColumn( + name: "IsCleanupException", + table: "Servers", + type: "tinyint(1)", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsCleanupException", + table: "Servers"); + + migrationBuilder.CreateTable( + name: "CleanupExceptions", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + ServerId = table.Column(type: "int", nullable: false), + CreatedAt = table.Column(type: "datetime(6)", nullable: false), + Note = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_CleanupExceptions", x => x.Id); + table.ForeignKey( + name: "FK_CleanupExceptions_Servers_ServerId", + column: x => x.ServerId, + principalTable: "Servers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_CleanupExceptions_ServerId", + table: "CleanupExceptions", + column: "ServerId"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index ec2d788..dba0d96 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -482,6 +482,9 @@ namespace Moonlight.App.Database.Migrations b.Property("Installing") .HasColumnType("tinyint(1)"); + b.Property("IsCleanupException") + .HasColumnType("tinyint(1)"); + b.Property("MainAllocationId") .HasColumnType("int"); @@ -827,24 +830,6 @@ namespace Moonlight.App.Database.Migrations b.ToTable("Websites"); }); - modelBuilder.Entity("Moonlight.App.Models.Misc.CleanupException", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Note") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("ServerId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("CleanupExceptions"); - }); - modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => { b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") diff --git a/Moonlight/App/Models/Misc/CleanupException.cs b/Moonlight/App/Models/Misc/CleanupException.cs deleted file mode 100644 index 83dcba7..0000000 --- a/Moonlight/App/Models/Misc/CleanupException.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Moonlight.App.Models.Misc; - -public class CleanupException -{ - public int Id { get; set; } - public int ServerId { get; set; } - public string Note { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Repositories/CleanupExceptionRepository.cs b/Moonlight/App/Repositories/CleanupExceptionRepository.cs deleted file mode 100644 index 9cfd0b2..0000000 --- a/Moonlight/App/Repositories/CleanupExceptionRepository.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Moonlight.App.Database; -using Moonlight.App.Models.Misc; - -namespace Moonlight.App.Repositories; - -public class CleanupExceptionRepository : IDisposable -{ - private readonly DataContext DataContext; - - public CleanupExceptionRepository(DataContext dataContext) - { - DataContext = dataContext; - } - - public DbSet Get() - { - return DataContext.CleanupExceptions; - } - - public CleanupException Add(CleanupException cleanupException) - { - var x = DataContext.CleanupExceptions.Add(cleanupException).Entity; - DataContext.SaveChanges(); - return x; - } - - public void Update(CleanupException cleanupException) - { - DataContext.CleanupExceptions.Update(cleanupException); - DataContext.SaveChanges(); - } - - public void Delete(CleanupException cleanupException) - { - DataContext.CleanupExceptions.Remove(cleanupException); - DataContext.SaveChanges(); - } - - public void Dispose() - { - DataContext.Dispose(); - } -} \ No newline at end of file diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs index ef50055..692ddf7 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/CleanupService.cs @@ -104,7 +104,6 @@ public class CleanupService // Get repos from dependency injection var serverRepository = scope.ServiceProvider.GetRequiredService(); var nodeRepository = scope.ServiceProvider.GetRequiredService(); - var cleanupExceptionRepository = scope.ServiceProvider.GetRequiredService(); var nodeService = scope.ServiceProvider.GetRequiredService(); var imageRepo = scope.ServiceProvider.GetRequiredService(); var serverService = scope.ServiceProvider.GetRequiredService(); @@ -114,7 +113,7 @@ public class CleanupService .Include(x => x.Image) .ToArray(); var nodes = nodeRepository.Get().ToArray(); - var exceptions = cleanupExceptionRepository.Get().ToArray(); + var exceptions = servers.Where(x => x.IsCleanupException); var images = imageRepo.Get().ToArray(); var nodeCount = nodes.Count(); @@ -228,7 +227,7 @@ public class CleanupService var players = GetPlayers(serverData.Node, serverData.MainAllocation); var stats = await serverService.GetDetails(server); - var exception = exceptions.FirstOrDefault(x => x.ServerId == server.Id) != null; + var exception = exceptions.FirstOrDefault(x => x.Id == server.Id) != null; if (stats != null) { diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index fa894e5..07c3a9f 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -58,6 +58,8 @@ <_ContentIncludedByDefault Remove="wwwroot\css\site.css" /> <_ContentIncludedByDefault Remove="Shared\Components\Tables\Column.razor" /> <_ContentIncludedByDefault Remove="Shared\Components\Tables\Table.razor" /> + <_ContentIncludedByDefault Remove="Shared\Views\Admin\Servers\Cleanup\Exceptions\Add.razor" /> + <_ContentIncludedByDefault Remove="Shared\Views\Admin\Servers\Cleanup\Exceptions\Edit.razor" /> diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index f7fa1df..8dc9429 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -65,7 +65,6 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor similarity index 90% rename from Moonlight/Shared/Views/Admin/Servers/Cleanup.razor rename to Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor index 5215224..9946891 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor @@ -10,7 +10,9 @@ @implements IDisposable -Cleanup + + Cleanup +
    @@ -25,8 +27,12 @@
    @(CleanupService.ServersCleaned)
    - Servers - stopped + + Servers + + + stopped +
    @@ -43,8 +49,12 @@
    @(CleanupService.CleanupsPerformed)
    - Cleanups - executed + + Cleanups + + + executed +
    @@ -61,8 +71,12 @@
    @(CleanupService.ServersRunning)
    - Used clanup - Servers + + Used clanup + + + Servers +
    @@ -142,6 +156,7 @@ @code { + protected async override Task OnAfterRenderAsync(bool firstRender) { if (firstRender) diff --git a/Moonlight/Shared/Views/Admin/Servers/Edit.razor b/Moonlight/Shared/Views/Admin/Servers/Edit.razor index 9309b41..b3fc0b9 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Edit.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Edit.razor @@ -111,6 +111,10 @@ } + +
    diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 7e426f4..5844d44 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -427,3 +427,5 @@ Cleanup finished. Duration: 0.14 Minutes;Cleanup finished. Duration: 0.14 Minute Cleanup finished. Duration: 0.09 Minutes;Cleanup finished. Duration: 0.09 Minutes Cleanup finished. Duration: 0.1 Minutes;Cleanup finished. Duration: 0.1 Minutes Cleanup finished. Duration: 0.11 Minutes;Cleanup finished. Duration: 0.11 Minutes +Cleanup Exceptions;Cleanup Exceptions +Server not found;Server not found From 1989f832ccc9fdb4eee5fa6d5167694b64e247b4 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:16:30 +0200 Subject: [PATCH 17/39] Update Index.razor --- Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor index 9946891..501917b 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor @@ -87,7 +87,7 @@
    - +
    From df15d9064ef30f7b03535b41c2fb57e78eda7c85 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 00:18:33 +0200 Subject: [PATCH 18/39] Update WingsServerConverter.cs --- Moonlight/App/Helpers/WingsServerConverter.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Moonlight/App/Helpers/WingsServerConverter.cs b/Moonlight/App/Helpers/WingsServerConverter.cs index 2ef6ef6..acc7ed1 100644 --- a/Moonlight/App/Helpers/WingsServerConverter.cs +++ b/Moonlight/App/Helpers/WingsServerConverter.cs @@ -80,6 +80,13 @@ public class WingsServerConverter wingsServer.Settings.Environment.Add(v.Key, v.Value); } } + + int i = 0; + foreach (var allocation in server.Allocations) + { + wingsServer.Settings.Environment.Add("ML_PORT_" + i, allocation.Port.ToString()); + i++; + } // Stop if (image.StopCommand.StartsWith("!")) From 09665373009284467ef04468610e99f8046dd542 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 00:25:41 +0200 Subject: [PATCH 19/39] Update Index.razor --- Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor index 501917b..b87c04a 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor @@ -133,7 +133,7 @@ @if (CleanupService.Activated) { } else From 27c1e7ae1c1e1162798908900914f5dcdfea36a2 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 00:49:34 +0200 Subject: [PATCH 20/39] Added quick create dropdown --- .../Shared/Components/Partials/Navbar.razor | 42 ++++++++++++++++--- Moonlight/resources/lang/de_de.lang | 17 +++++++- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/Moonlight/Shared/Components/Partials/Navbar.razor b/Moonlight/Shared/Components/Partials/Navbar.razor index 9952884..f0f01e5 100644 --- a/Moonlight/Shared/Components/Partials/Navbar.razor +++ b/Moonlight/Shared/Components/Partials/Navbar.razor @@ -9,6 +9,34 @@ @inject NavigationManager NavigationManager @inject CookieService CookieService +
    +
    +
    + + +
    +
    +
    +
    - +
    Avatar @@ -39,7 +67,7 @@
    @(User.FirstName) @(User.LastName) - + @if (User.Admin) { Admin @@ -51,10 +79,14 @@
    - Profile + + Profile +
    - Logout + + Logout +
    @@ -80,4 +112,4 @@ await CookieService.SetValue("token", "", 1); NavigationManager.NavigateTo(NavigationManager.Uri, true); } -} +} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 8f280da..aed88df 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -406,4 +406,19 @@ The City field is required.;The City field is required. The State field is required.;The State field is required. The Country field is required.;The Country field is required. Street and house number requered;Street and house number requered -Max lenght reached;Max lenght reached \ No newline at end of file +Max lenght reached;Max lenght reached +Server;Server +stopped;stopped +Cleanups;Cleanups +executed;executed +Used clanup;Used clanup +Enable;Enable +Disabble;Disabble +Disable;Disable +Addons;Addons +Javascript version;Javascript version +Javascript file;Javascript file +Select javascript file to execute on start;Select javascript file to execute on start +Submit;Submit +Processing;Processing +Go up;Go up From 17a5634c42079d2f370855fd6aa8ec677fccd595 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 01:44:58 +0200 Subject: [PATCH 21/39] untested totp / password change --- Moonlight/App/Models/Misc/AuditLogType.cs | 1 + Moonlight/App/Services/TotpService.cs | 11 +- .../Navigations/ProfileNavigation.razor | 11 +- Moonlight/Shared/Views/Profile/Security.razor | 288 ++++++++++++++++++ .../Shared/Views/Profile/Subscriptions.razor | 2 +- Moonlight/resources/lang/de_de.lang | 16 +- 6 files changed, 322 insertions(+), 7 deletions(-) create mode 100644 Moonlight/Shared/Views/Profile/Security.razor diff --git a/Moonlight/App/Models/Misc/AuditLogType.cs b/Moonlight/App/Models/Misc/AuditLogType.cs index 13fafa1..a2ccf6d 100644 --- a/Moonlight/App/Models/Misc/AuditLogType.cs +++ b/Moonlight/App/Models/Misc/AuditLogType.cs @@ -23,4 +23,5 @@ public enum AuditLogType CleanupEnabled, CleanupDisabled, CleanupTriggered, + PasswordChange, } \ No newline at end of file diff --git a/Moonlight/App/Services/TotpService.cs b/Moonlight/App/Services/TotpService.cs index be76546..0e359fe 100644 --- a/Moonlight/App/Services/TotpService.cs +++ b/Moonlight/App/Services/TotpService.cs @@ -46,8 +46,7 @@ public class TotpService public async Task Enable() { var user = (await IdentityService.Get())!; - - user.TotpEnabled = true; + user.TotpSecret = GenerateSecret(); UserRepository.Update(user); @@ -55,6 +54,14 @@ public class TotpService await AuditLogService.Log(AuditLogType.EnableTotp, user.Email); } + public async Task EnforceTotpLogin() + { + var user = (await IdentityService.Get())!; + + user.TotpEnabled = true; + UserRepository.Update(user); + } + public async Task Disable() { var user = (await IdentityService.Get())!; diff --git a/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor b/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor index 67b3816..ab04ef6 100644 --- a/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor +++ b/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor @@ -27,12 +27,17 @@ diff --git a/Moonlight/Shared/Views/Profile/Security.razor b/Moonlight/Shared/Views/Profile/Security.razor new file mode 100644 index 0000000..8b29c58 --- /dev/null +++ b/Moonlight/Shared/Views/Profile/Security.razor @@ -0,0 +1,288 @@ +@page "/profile/security" + +@using Moonlight.Shared.Components.Navigations +@using QRCoder +@using Moonlight.App.Services.LogServices +@using Moonlight.App.Services.Sessions +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop +@using System.Text.RegularExpressions +@using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Misc + +@inject SmartTranslateService SmartTranslateService +@inject AuditLogService AuditLogService +@inject TotpService TotpService +@inject NavigationManager NavigationManager +@inject IdentityService IdentityService +@inject UserService UserService +@inject AlertService AlertService +@inject ToastService ToastService + + + +
    +
    +
    +

    + Security +

    +
    +
    + + +
    +
    + @if (TotpEnabled) + { +
    + + + + + + +
    +
    +

    + Your account is secured with 2fa +

    +
    + anyone write a fancy text here? +
    +
    + + +
    +
    + } + else + { +
    + + + + + + +
    +
    +

    + Secure your account +

    +
    + 2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login. +
    +
    + + + Enable + +
    +
    + } + + + + +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +     +
    + +@code +{ + private bool TotpEnabled = false; + private bool EnablingTotp = false; + private string TotpSecret = ""; + private User User; + private string Issuer = "Moonlight"; + private string currentTotp = ""; + + private string Password = ""; + + private async void Enable() + { + await AuditLogService.Log(AuditLogType.EnableTotp, "Totp enabled"); + await TotpService.Enable(); + TotpEnabled = await TotpService.GetEnabled(); + TotpSecret = await TotpService.GetSecret(); + EnablingTotp = true; + StateHasChanged(); + } + + public async Task CheckAndSaveTotp() + { + if (await TotpService.Verify(TotpSecret, currentTotp)) + { + await TotpService.EnforceTotpLogin(); + TotpEnabled = await TotpService.GetEnabled(); + TotpSecret = await TotpService.GetSecret(); + await ToastService.Success("Successfully enabled 2fa!"); + } + else + { + await AlertService.Error("2fa code incorrect", "The given 2fa code is incorrect. Maybe check if the code in your 2fa app has changed."); + } + } + + private async void Disable() + { + await AuditLogService.Log(AuditLogType.DisableTotp, "Totp disabled"); + await TotpService.Disable(); + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } + + private async Task Load(LazyLoader lazyLoader) + { + await lazyLoader.SetText("Requesting secrets"); + + TotpEnabled = await TotpService.GetEnabled(); + TotpSecret = await TotpService.GetSecret(); + + await lazyLoader.SetText("Requesting identity"); + User = await IdentityService.Get(); + + await InvokeAsync(StateHasChanged); + } + + private async Task ChangePassword() + { + if (Regex.IsMatch(Password, @"^(?=.*[A-Za-z])(?=.*\d)[A-Za-z@$!%*#.,?&\d]{8,}$")) + { + await UserService.ChangePassword(User, Password); + + await AuditLogService.Log(AuditLogType.PasswordChange, "The password has been set to a new one"); + + // Reload to make the user login again + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } + else + { + await AlertService.Error("Error", "Your password must be at least 8 characters and must contain a number"); + } + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Profile/Subscriptions.razor b/Moonlight/Shared/Views/Profile/Subscriptions.razor index 2a371a6..30b8d19 100644 --- a/Moonlight/Shared/Views/Profile/Subscriptions.razor +++ b/Moonlight/Shared/Views/Profile/Subscriptions.razor @@ -8,7 +8,7 @@ @inject SmartTranslateService SmartTranslateService @inject NavigationManager NavigationManager - +
    diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 8f280da..c520cf7 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -406,4 +406,18 @@ The City field is required.;The City field is required. The State field is required.;The State field is required. The Country field is required.;The Country field is required. Street and house number requered;Street and house number requered -Max lenght reached;Max lenght reached \ No newline at end of file +Max lenght reached;Max lenght reached +Security;Security +Subscriptions;Subscriptions +Secure your account;Secure your account +2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.;2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login. +enable;enable +Activate 2fa;Activate 2fa +2fa apps;2fa apps +Use an app like ;Use an app like +or;or +and scan the following QR Code;and scan the following QR Code +If you have trouble using the QR Code, select manual input in the app and enter your email and the following code:;If you have trouble using the QR Code, select manual input in the app and enter your email and the following code: +Finish activation;Finish activation +New password;New password +Enable;Enable From 61136aee93ef3472c3b6aebea7387523051f3726 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 01:55:50 +0200 Subject: [PATCH 22/39] fixed login form --- Moonlight/App/Models/Misc/LoginDataModel.cs | 14 ++++++++++++++ Moonlight/Shared/Components/Auth/Login.razor | 3 ++- Moonlight/resources/lang/de_de.lang | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Moonlight/App/Models/Misc/LoginDataModel.cs diff --git a/Moonlight/App/Models/Misc/LoginDataModel.cs b/Moonlight/App/Models/Misc/LoginDataModel.cs new file mode 100644 index 0000000..d6c0020 --- /dev/null +++ b/Moonlight/App/Models/Misc/LoginDataModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Models.Misc; + +public class LoginDataModel +{ + [Required(ErrorMessage = "You need to enter an email address")] + [EmailAddress(ErrorMessage = "You need to enter a valid email address")] + public string Email { get; set; } + + [Required(ErrorMessage = "You need to enter a password")] + [MinLength(8, ErrorMessage = "You need to enter a password with minimum 8 characters in lenght")] + public string Password { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Auth/Login.razor b/Moonlight/Shared/Components/Auth/Login.razor index f9b27e7..28ca0ce 100644 --- a/Moonlight/Shared/Components/Auth/Login.razor +++ b/Moonlight/Shared/Components/Auth/Login.razor @@ -10,6 +10,7 @@ @using Moonlight.App.Exceptions @using Logging.Net @using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Misc @using Moonlight.App.Services.OAuth2 @using Moonlight.App.Services.Sessions @@ -113,7 +114,7 @@ @code { - private User User = new(); + private LoginDataModel User = new(); private bool TotpRequired = false; private string TotpCode = ""; diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index c520cf7..bc1ff82 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -421,3 +421,6 @@ If you have trouble using the QR Code, select manual input in the app and enter Finish activation;Finish activation New password;New password Enable;Enable +Your account is secured with 2fa;Your account is secured with 2fa +anyone write a fancy text here?;anyone write a fancy text here? +Disable;Disable From f2b5d336054100784146c33dd9bc73cb57b6c842 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 02:26:10 +0200 Subject: [PATCH 23/39] Fixed cleanup --- Moonlight/App/Services/CleanupService.cs | 405 ++++++------------ Moonlight/App/Services/ConfigService.cs | 4 + .../Shared/Views/Admin/Servers/Cleanup.razor | 103 +++++ .../Views/Admin/Servers/Cleanup/Index.razor | 200 --------- Moonlight/resources/lang/de_de.lang | 2 + 5 files changed, 237 insertions(+), 477 deletions(-) create mode 100644 Moonlight/Shared/Views/Admin/Servers/Cleanup.razor delete mode 100644 Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs index 692ddf7..42e046c 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/CleanupService.cs @@ -13,353 +13,204 @@ namespace Moonlight.App.Services; public class CleanupService { + #region Stats public DateTime StartedAt { get; private set; } public DateTime CompletedAt { get; private set; } public int ServersCleaned { get; private set; } public int CleanupsPerformed { get; private set; } public int ServersRunning { get; private set; } public bool IsRunning { get; private set; } - public bool Activated { get; set; } - public int PercentProgress { get; private set; } = 100; - public string Status { get; private set; } = "N/A"; - - private Task PerformTask; - private readonly ConfigService ConfigService; - private readonly IServiceScopeFactory ServiceScopeFactory; - - private int RequiredCpu; - private long RequiredMemory; - private int WaitTime; - - public EventHandler OnUpdated; + #endregion - public CleanupService(ConfigService configService, IServiceScopeFactory serviceScopeFactory) + private readonly ConfigService ConfigService; + private readonly MessageService MessageService; + private readonly IServiceScopeFactory ServiceScopeFactory; + private readonly PeriodicTimer Timer; + + public CleanupService( + ConfigService configService, + IServiceScopeFactory serviceScopeFactory, + MessageService messageService) { ServiceScopeFactory = serviceScopeFactory; + MessageService = messageService; ConfigService = configService; - - var config = configService.GetSection("Moonlight").GetSection("Cleanup"); - - RequiredCpu = config.GetValue("Cpu"); - RequiredMemory = config.GetValue("Memory"); - WaitTime = config.GetValue("Wait"); - - if (!ConfigService.DebugMode) - Task.Run(Start); - } - - private void Start() - { + StartedAt = DateTime.Now; CompletedAt = DateTime.Now; IsRunning = false; - Activated = true; + + var config = ConfigService.GetSection("Moonlight").GetSection("Cleanup"); - DoWaiting(); - } - - private async void DoWaiting() - { - while (true) + if (!config.GetValue("Enable") || ConfigService.DebugMode) { - if (Activated) - await Perform(); - - try - { - await Task.Delay((int) TimeSpan.FromMinutes(WaitTime).TotalMilliseconds); - } - catch (Exception ex) - { - } + Logger.Info("Disabling cleanup service"); + return; } - } - - public async Task TriggerPerform() - { - if (IsRunning) - return; + + Timer = new(TimeSpan.FromMinutes(config.GetValue("Wait"))); - PerformTask = new Task(async () => await Perform()); - PerformTask.Start(); + Task.Run(Run); } - private async Task Perform() + private async Task Run() { - if (IsRunning) - return; - - IsRunning = true; - StartedAt = DateTime.Now; - ServersRunning = 0; - - OnUpdated?.Invoke(this, null); - - using (var scope = ServiceScopeFactory.CreateScope()) + while (await Timer.WaitForNextTickAsync()) { - // Setup time measure - var watch = new Stopwatch(); - watch.Start(); + IsRunning = true; - // Get repos from dependency injection - var serverRepository = scope.ServiceProvider.GetRequiredService(); + using var scope = ServiceScopeFactory.CreateScope(); + var config = ConfigService.GetSection("Moonlight").GetSection("Cleanup"); + + var maxCpu = config.GetValue("Cpu"); + var minMemory = config.GetValue("Memory"); + var maxUptime = config.GetValue("Uptime"); + var minUptime = config.GetValue("MinUptime"); + var nodeRepository = scope.ServiceProvider.GetRequiredService(); var nodeService = scope.ServiceProvider.GetRequiredService(); - var imageRepo = scope.ServiceProvider.GetRequiredService(); - var serverService = scope.ServiceProvider.GetRequiredService(); - // Fetching data from mysql - var servers = serverRepository.Get() - .Include(x => x.Image) + var nodes = nodeRepository + .Get() .ToArray(); - var nodes = nodeRepository.Get().ToArray(); - var exceptions = servers.Where(x => x.IsCleanupException); - var images = imageRepo.Get().ToArray(); - var nodeCount = nodes.Count(); - - // We use this counter for the foreach loops - int counter = 0; - PercentProgress = 0; - - // Fetching data from nodes so we know what nodes to scan - var nodeContainers = new Dictionary(); - - Status = "Checking Nodes"; - counter = 0; - PercentProgress = 0; - OnUpdated?.Invoke(this, null); - foreach (var node in nodes) { try { - var cpu = await nodeService.GetCpuStats(node); - var freeMemory = await nodeService.GetMemoryStats(node); + var cpuStats = await nodeService.GetCpuStats(node); + var memoryStats = await nodeService.GetMemoryStats(node); - if (cpu.Usage > RequiredCpu || freeMemory.Free < RequiredMemory) + if (cpuStats.Usage > maxCpu || memoryStats.Free < minMemory) { - var c = await nodeService.GetContainerStats(node); - var containers = c.Containers; - nodeContainers.Add(node, containers.ToArray()); - } - } - catch (Exception e) - { - Logger.Error($"Error fetching cleanup data from node {node.Id}"); - Logger.Error(e); - } + var containerStats = await nodeService.GetContainerStats(node); - counter++; - CalculateAndUpdateProgress(counter, nodeCount); - OnUpdated?.Invoke(this, null); - } + var serverRepository = scope.ServiceProvider.GetRequiredService(); + var imageRepository = scope.ServiceProvider.GetRequiredService(); - // Searching for servers we can actually stop because they have the cleanup tag - // and determine which servers we have to check for an illegal mc server - var serversToCheck = new List(); - var serversToCheckForMc = new List(); - - Status = "Checking found servers"; - counter = 0; - PercentProgress = 0; - OnUpdated?.Invoke(this, null); - - // Count every container for progress calculation - var allContainers = 0; - foreach (var array in nodeContainers) - { - allContainers += array.Value.Length; - } - - foreach (var nodeContainer in nodeContainers) - { - try - { - foreach (var container in nodeContainer.Value) - { - var server = servers.First(x => x.Uuid.ToString() == container.Name); - var tagsJson = imageRepo + var images = imageRepository .Get() - .First(x => x.Id == server.Image.Id).TagsJson; + .ToArray(); - var tags = JsonConvert.DeserializeObject(tagsJson) ?? Array.Empty(); + var imagesWithFlag = images + .Where(x => + (JsonConvert.DeserializeObject(x.TagsJson) ?? Array.Empty()).Contains("cleanup") + ) + .ToArray(); + + var containerMappedToServers = new Dictionary(); - if (tags.FirstOrDefault(x => x == "cleanup") != null) + foreach (var container in containerStats.Containers) { - serversToCheck.Add(server); - } - - if (tags.FirstOrDefault(x => x == "illegalmc") != null) - { - serversToCheckForMc.Add(server); - } - } - } - catch (Exception e) - { - Logger.Error($"Error processing cleanup data from node {nodeContainer.Key.Id}"); - Logger.Error(e); - } - - counter++; - CalculateAndUpdateProgress(counter, allContainers); - OnUpdated?.Invoke(this, null); - } - - // Now we gonna scan every tagged server - Status = "Scanning servers"; - counter = 0; - PercentProgress = 0; - OnUpdated?.Invoke(this, null); - - foreach (var server in serversToCheck) - { - try - { - var serverData = serverRepository - .Get() - .Include(x => x.MainAllocation) - .Include(x => x.Node) - .Include(x => x.Variables) - .First(x => x.Id == server.Id); - - var players = GetPlayers(serverData.Node, serverData.MainAllocation); - var stats = await serverService.GetDetails(server); - - var exception = exceptions.FirstOrDefault(x => x.Id == server.Id) != null; - - if (stats != null) - { - if (exception) - { - if (players == 0 && stats.Utilization.Uptime > TimeSpan.FromHours(6).TotalMilliseconds) + if (Guid.TryParse(container.Name, out Guid uuid)) { - await serverService.SetPowerState(server, PowerSignal.Restart); - ServersCleaned++; - OnUpdated?.Invoke(this, null); - } - else - { - ServersRunning++; - OnUpdated?.Invoke(this, null); - } - } - else - { - if (players == 0 && stats.Utilization.Uptime > TimeSpan.FromMinutes(10).TotalMilliseconds) - { - var cleanupVar = serverData.Variables.FirstOrDefault(x => x.Key == "J2S"); + var server = serverRepository + .Get() + .Include(x => x.Image) + .Include(x => x.MainAllocation) + .Include(x => x.Variables) + .FirstOrDefault(x => x.Uuid == uuid); - if (cleanupVar == null) + if (server != null && imagesWithFlag.Any(y => y.Id == server.Image.Id)) { - await serverService.SetPowerState(server, PowerSignal.Stop); - ServersCleaned++; - OnUpdated?.Invoke(this, null); + containerMappedToServers.Add(container, server); + } + } + } + + var serverService = scope.ServiceProvider.GetRequiredService(); + + foreach (var containerMapped in containerMappedToServers) + { + var server = containerMapped.Value; + + try + { + var stats = await serverService.GetDetails(server); + + if (server.IsCleanupException) + { + if (stats.Utilization.Uptime > TimeSpan.FromHours(maxUptime).TotalMilliseconds) + { + var players = GetPlayers(node, server.MainAllocation); + + if (players == 0) + { + await serverService.SetPowerState(server, PowerSignal.Restart); + + ServersCleaned++; + } + else + { + ServersRunning++; + } + + await MessageService.Emit("cleanup.updated", null); + } } else { - if (cleanupVar.Value == "1") + if (stats.Utilization.Uptime > TimeSpan.FromMinutes(minUptime).TotalMilliseconds) { - await serverService.SetPowerState(server, PowerSignal.Restart); - ServersCleaned++; - OnUpdated?.Invoke(this, null); - } - else - { - await serverService.SetPowerState(server, PowerSignal.Stop); - ServersCleaned++; - OnUpdated?.Invoke(this, null); + var players = GetPlayers(node, server.MainAllocation); + + if (players < 1) + { + var j2SVar = server.Variables.FirstOrDefault(x => x.Key == "J2S"); + var handleJ2S = j2SVar != null && j2SVar.Value == "1"; + + if (handleJ2S) + { + await serverService.SetPowerState(server, PowerSignal.Restart); + } + else + { + await serverService.SetPowerState(server, PowerSignal.Stop); + } + + ServersCleaned++; + } + else + { + ServersRunning++; + } + + await MessageService.Emit("cleanup.updated", null); } } } - else + catch (Exception e) { - ServersRunning++; - OnUpdated?.Invoke(this, null); + Logger.Warn($"Error checking server {server.Name} ({server.Id})"); + Logger.Warn(e); } } } } catch (Exception e) { - Logger.Error($"Error scanning {server.Name}"); + Logger.Error($"Error performing cleanup on node {node.Name} ({node.Id})"); Logger.Error(e); } - - counter++; - CalculateAndUpdateProgress(counter, serversToCheck.Count); - OnUpdated?.Invoke(this, null); } - - // Finally we have to check all code container allocations - // for illegal hosted mc servers - - Status = "Scanning code containers"; - counter = 0; - PercentProgress = 0; - OnUpdated?.Invoke(this, null); - foreach (var server in serversToCheckForMc) - { - try - { - var serverData = serverRepository - .Get() - .Include(x => x.Allocations) - .Include(x => x.Node) - .First(x => x.Id == server.Id); - - foreach (var allocation in serverData.Allocations) - { - if (GetPlayers(server.Node, allocation) != -1) - { - // TODO: Suspend server - Logger.Warn("Found CC running mc: https://moonlight.endelon-hosting.de/server/" + - server.Uuid + "/"); - } - } - } - catch (Exception e) - { - Logger.Error($"Error scanning (cc) {server.Name}"); - Logger.Error(e); - } - - counter++; - CalculateAndUpdateProgress(counter, serversToCheckForMc.Count); - OnUpdated?.Invoke(this, null); - } - - watch.Stop(); - - Status = $"Cleanup finished. Duration: {Math.Round(TimeSpan.FromMilliseconds(watch.ElapsedMilliseconds).TotalMinutes, 2)} Minutes"; - PercentProgress = 100; - OnUpdated?.Invoke(this, null); + IsRunning = false; + CleanupsPerformed++; + await MessageService.Emit("cleanup.updated", null); } - - IsRunning = false; - CompletedAt = DateTime.Now; - CleanupsPerformed++; - OnUpdated?.Invoke(this, null); } private int GetPlayers(Node node, NodeAllocation allocation) { var ms = new MineStat(node.Fqdn, (ushort)allocation.Port); + + //TODO: Add fake player check if (ms.ServerUp) { return ms.CurrentPlayersInt; } - else - { - return -1; - } - } - - private void CalculateAndUpdateProgress(int now, int all) - { - PercentProgress = (int)Math.Round((now / (double)all) * 100); + + return -1; } } \ No newline at end of file diff --git a/Moonlight/App/Services/ConfigService.cs b/Moonlight/App/Services/ConfigService.cs index 7a315cb..ed124f6 100644 --- a/Moonlight/App/Services/ConfigService.cs +++ b/Moonlight/App/Services/ConfigService.cs @@ -1,4 +1,5 @@ using System.Text; +using Logging.Net; using Microsoft.Extensions.Primitives; using Moonlight.App.Helpers; @@ -21,6 +22,9 @@ public class ConfigService : IConfiguration if (debugVar != null) DebugMode = bool.Parse(debugVar); + + if(DebugMode) + Logger.Debug("Debug mode enabled"); } public IEnumerable GetChildren() diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor new file mode 100644 index 0000000..4176618 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor @@ -0,0 +1,103 @@ +@page "/admin/servers/cleanup" + +@using Moonlight.App.Services +@using Moonlight.App.Models.Misc +@using Moonlight.App.Services.LogServices + +@inject CleanupService CleanupService +@inject AuditLogService AuditLogService +@inject MessageService MessageService + +@implements IDisposable + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.ServersCleaned) +
    + + Servers + + + stopped + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.CleanupsPerformed) +
    + + Cleanups + + + executed + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @(CleanupService.ServersRunning) +
    + + Running cleanup + + + servers + +
    +
    +
    +
    +
    +
    +     + +@code +{ + protected override void OnInitialized() + { + MessageService.Subscribe("cleanup.updated", this, _ => + { + Task.Run(async () => + { + await InvokeAsync(StateHasChanged); + }); + + return Task.CompletedTask; + }); + } + + public void Dispose() + { + MessageService.Unsubscribe("cleanup.updated", this); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor deleted file mode 100644 index b87c04a..0000000 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup/Index.razor +++ /dev/null @@ -1,200 +0,0 @@ -@page "/admin/servers/cleanup" - -@using Moonlight.App.Services -@using Logging.Net -@using Moonlight.App.Models.Misc -@using Moonlight.App.Services.LogServices - -@inject CleanupService CleanupService -@inject AuditLogService AuditLogService - -@implements IDisposable - - - Cleanup - - - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - @(CleanupService.ServersCleaned) -
    - - Servers - - - stopped - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - @(CleanupService.CleanupsPerformed) -
    - - Cleanups - - - executed - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - @(CleanupService.ServersRunning) -
    - - Used clanup - - - Servers - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - @if (CleanupService.IsRunning) - { - - } - else - { - - } -
    -
    - @if (CleanupService.Activated) - { - - } - else - { - - } -
    -
    - @if (CleanupService.Activated) - { - - } - else - { - - } -
    -
    -
    -
    -
    -
    -
    -     - - - - -@code -{ - - protected async override Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - CleanupService.OnUpdated += OnUpdated; - } - } - - private void OnUpdated(object? sender, EventArgs e) - { - Logger.Debug(CleanupService.PercentProgress); - - InvokeAsync(StateHasChanged); - } - - public void Dispose() - { - CleanupService.OnUpdated -= OnUpdated; - } - - private void Enable() - { - CleanupService.Activated = true; - AuditLogService.Log(AuditLogType.CleanupEnabled, "The automatic cleanup has been activated"); - InvokeAsync(StateHasChanged); - } - - private void Disabled() - { - CleanupService.Activated = false; - AuditLogService.Log(AuditLogType.CleanupDisabled, "The automatic cleanup has been disabled"); - InvokeAsync(StateHasChanged); - } - - private async void Trigger() - { - await CleanupService.TriggerPerform(); - await AuditLogService.Log(AuditLogType.CleanupTriggered, "The automatic cleanup has been manually triggered"); - await InvokeAsync(StateHasChanged); - } -} \ No newline at end of file diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index aed88df..c14f200 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -422,3 +422,5 @@ Select javascript file to execute on start;Select javascript file to execute on Submit;Submit Processing;Processing Go up;Go up +Running cleanup;Running cleanup +servers;servers From ddaba17c43be7b79ca3522f087c15927ba7f37a2 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 03:10:08 +0200 Subject: [PATCH 24/39] Fixed my stupid totp login mistakes --- .../Models/{Misc => Forms}/LoginDataModel.cs | 2 +- .../App/Models/Forms/LoginTotpDataModel.cs | 9 ++ Moonlight/Shared/Components/Auth/Login.razor | 95 ++++++++++++------- Moonlight/resources/lang/de_de.lang | 2 + 4 files changed, 72 insertions(+), 36 deletions(-) rename Moonlight/App/Models/{Misc => Forms}/LoginDataModel.cs (92%) create mode 100644 Moonlight/App/Models/Forms/LoginTotpDataModel.cs diff --git a/Moonlight/App/Models/Misc/LoginDataModel.cs b/Moonlight/App/Models/Forms/LoginDataModel.cs similarity index 92% rename from Moonlight/App/Models/Misc/LoginDataModel.cs rename to Moonlight/App/Models/Forms/LoginDataModel.cs index d6c0020..63a5ac2 100644 --- a/Moonlight/App/Models/Misc/LoginDataModel.cs +++ b/Moonlight/App/Models/Forms/LoginDataModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.App.Models.Misc; +namespace Moonlight.App.Models.Forms; public class LoginDataModel { diff --git a/Moonlight/App/Models/Forms/LoginTotpDataModel.cs b/Moonlight/App/Models/Forms/LoginTotpDataModel.cs new file mode 100644 index 0000000..b1dcca0 --- /dev/null +++ b/Moonlight/App/Models/Forms/LoginTotpDataModel.cs @@ -0,0 +1,9 @@ +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Models.Forms; + +public class LoginTotpDataModel +{ + [Required(ErrorMessage = "You need to enter a 2fa code")] + public string Code { get; set; } = ""; +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Auth/Login.razor b/Moonlight/Shared/Components/Auth/Login.razor index 28ca0ce..dd642e3 100644 --- a/Moonlight/Shared/Components/Auth/Login.razor +++ b/Moonlight/Shared/Components/Auth/Login.razor @@ -13,6 +13,8 @@ @using Moonlight.App.Models.Misc @using Moonlight.App.Services.OAuth2 @using Moonlight.App.Services.Sessions +@using System.ComponentModel.DataAnnotations +@using Moonlight.App.Models.Forms @inject AlertService AlertService @inject UserService UserService @@ -26,9 +28,9 @@
    - - @if (!TotpRequired) - { + @if (!TotpRequired) + { +

    Sign In @@ -64,11 +66,11 @@

    - +
    - +
    @@ -84,29 +86,29 @@ Sign-in
    - } - else - { + +
    + Not registered yet? + + + Sign up + +
    +     + } + else + { +
    - +
    - - +
    - } - -
    - Not registered yet? - - - Sign up - -
    -     +     + }
    @@ -114,22 +116,39 @@ @code { - private LoginDataModel User = new(); + private LoginDataModel LoginData = new(); + private LoginTotpDataModel TotpData = new(); private bool TotpRequired = false; - private string TotpCode = ""; private async Task DoLogin() { try { - User.Email = User.Email.ToLower().Trim(); + LoginData.Email = LoginData.Email.ToLower().Trim(); - TotpRequired = await UserService.CheckTotp(User.Email, User.Password); - - if (!TotpRequired) + if (string.IsNullOrEmpty(TotpData.Code)) { - var token = await UserService.Login(User.Email, User.Password); + TotpRequired = await UserService.CheckTotp(LoginData.Email, LoginData.Password); + + if (!TotpRequired) + { + var token = await UserService.Login(LoginData.Email, LoginData.Password); + await CookieService.SetValue("token", token, 10); + + if (NavigationManager.Uri.EndsWith("login")) + NavigationManager.NavigateTo("/", true); + else + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } + else + { + await InvokeAsync(StateHasChanged); + } + } + else + { + var token = await UserService.Login(LoginData.Email, LoginData.Password, TotpData.Code); await CookieService.SetValue("token", token, 10); if (NavigationManager.Uri.EndsWith("login")) @@ -137,13 +156,14 @@ else NavigationManager.NavigateTo(NavigationManager.Uri, true); } - else - { - await InvokeAsync(StateHasChanged); - } } catch (DisplayException e) { + // Reset state + LoginData = new(); + TotpData = new(); + TotpRequired = false; + await AlertService.Error( SmartTranslateService.Translate("Error"), SmartTranslateService.Translate(e.Message) @@ -151,6 +171,11 @@ } catch (Exception e) { + // Reset state + LoginData = new(); + TotpData = new(); + TotpRequired = false; + await AlertService.Error( SmartTranslateService.Translate("Error"), SmartTranslateService.Translate("An error occured while logging you in") diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index bc1ff82..8e77baa 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -424,3 +424,5 @@ Enable;Enable Your account is secured with 2fa;Your account is secured with 2fa anyone write a fancy text here?;anyone write a fancy text here? Disable;Disable +You need to enter a 2fa code;You need to enter a 2fa code +2FA code invalid;2FA code invalid From ffc2c9cc2c003461bcc6b51aa48fafad05ecdfe5 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 03:31:56 +0200 Subject: [PATCH 25/39] Added server reset setting --- .../ServerControl/ServerSettings.razor | 2 + .../Settings/ServerResetSetting.razor | 62 +++++++++++++++++++ Moonlight/resources/lang/de_de.lang | 14 +++++ 3 files changed, 78 insertions(+) create mode 100644 Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor diff --git a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor index f207dfd..280936c 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor @@ -52,6 +52,8 @@ if(Tags.Contains("pythonfile")) Settings.Add("Python file", typeof(PythonFileSetting)); + + Settings.Add("Server reset", typeof(ServerResetSetting)); return Task.CompletedTask; } diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor new file mode 100644 index 0000000..0af9551 --- /dev/null +++ b/Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor @@ -0,0 +1,62 @@ +@using Moonlight.App.Services +@using Moonlight.App.Database.Entities +@using Moonlight.App.Helpers +@using Moonlight.App.Helpers.Files +@using Moonlight.App.Services.Interop + +@inject SmartTranslateService SmartTranslateService +@inject AlertService AlertService +@inject ToastService ToastService +@inject WingsApiHelper WingsApiHelper +@inject ConfigService ConfigService +@inject ServerService ServerService + + + + +@code +{ + [CascadingParameter] + public Server CurrentServer { get; set; } + + private async Task OnClick() + { + var b = await AlertService.YesNo( + SmartTranslateService.Translate("Are you sure you want to reset this server?"), + SmartTranslateService.Translate("Are you sure? This cannot be undone"), + SmartTranslateService.Translate("Yes"), + SmartTranslateService.Translate("No") + ); + + if (b) + { + await ToastService.CreateProcessToast("serverReset", SmartTranslateService.Translate("Resetting server")); + + var access = new WingsFileAccess( + WingsApiHelper, + null!, + CurrentServer, + ConfigService, + null! + ); + + var files = await access.Ls(); + + int i = 1; + foreach (var file in files) + { + await access.Delete(file); + await ToastService.UpdateProcessToast("serverReset", $"{SmartTranslateService.Translate("Deleted file")} {i}/{files.Length}"); + i++; + } + + await ToastService.UpdateProcessToast("serverReset", SmartTranslateService.Translate("Reinstalling server")); + + await ServerService.Reinstall(CurrentServer); + await ToastService.RemoveProcessToast("serverReset"); + } + } +} diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index c14f200..cb3d333 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -424,3 +424,17 @@ Processing;Processing Go up;Go up Running cleanup;Running cleanup servers;servers +Select folder to move the file(s) to;Select folder to move the file(s) to +Paper version;Paper version +Join2Start;Join2Start +Server reset;Server reset +Reset;Reset +Resetting;Resetting +Are you sure you want to reset this server?;Are you sure you want to reset this server? +Are you sure? This cannot be undone;Are you sure? This cannot be undone +Resetting server;Resetting server +Deleted file;Deleted file +Reinstalling server;Reinstalling server +Uploading files;Uploading files +complete;complete +Upload complete;Upload complete From 5f6631dd1ddeed35c1bfd31a871318924dd27d66 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 04:07:57 +0200 Subject: [PATCH 26/39] design --- Moonlight/Shared/Views/Profile/Security.razor | 25 +++++++++++++------ Moonlight/resources/lang/de_de.lang | 2 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Moonlight/Shared/Views/Profile/Security.razor b/Moonlight/Shared/Views/Profile/Security.razor index 8b29c58..e648de9 100644 --- a/Moonlight/Shared/Views/Profile/Security.razor +++ b/Moonlight/Shared/Views/Profile/Security.razor @@ -148,7 +148,7 @@
    - + Next @@ -176,12 +176,22 @@
    - To finish activating, enter the current TOTP code
    - - +
    + + + +
    +

    + 2fa Code requiered +

    + In order to finish the activation of 2fa, you need to enter the code your 2fa app shows you. +
    +
    + +
    - - + +
    @@ -239,9 +249,10 @@ if (await TotpService.Verify(TotpSecret, currentTotp)) { await TotpService.EnforceTotpLogin(); - TotpEnabled = await TotpService.GetEnabled(); + TotpEnabled = true; TotpSecret = await TotpService.GetSecret(); await ToastService.Success("Successfully enabled 2fa!"); + StateHasChanged(); } else { diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 8e77baa..d9fd243 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -426,3 +426,5 @@ anyone write a fancy text here?;anyone write a fancy text here? Disable;Disable You need to enter a 2fa code;You need to enter a 2fa code 2FA code invalid;2FA code invalid +2fa Code;2fa Code +2fa Code requiered;2fa Code requiered From 8ff69fedb17a89a39d413d85d7b4b5e0be2556d6 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 14:51:40 +0200 Subject: [PATCH 27/39] Update de_de.lang --- Moonlight/resources/lang/de_de.lang | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index f4f01c6..41f79bc 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -437,4 +437,20 @@ Deleted file;Deleted file Reinstalling server;Reinstalling server Uploading files;Uploading files complete;complete -Upload complete;Upload complete \ No newline at end of file +Upload complete;Upload complete +Security;Security +Subscriptions;Subscriptions +2fa Code;2fa Code +Your account is secured with 2fa;Your account is secured with 2fa +anyone write a fancy text here?;anyone write a fancy text here? +Activate 2fa;Activate 2fa +2fa apps;2fa apps +Use an app like ;Use an app like +or;or +and scan the following QR Code;and scan the following QR Code +If you have trouble using the QR Code, select manual input in the app and enter your email and the following code:;If you have trouble using the QR Code, select manual input in the app and enter your email and the following code: +Finish activation;Finish activation +2fa Code requiered;2fa Code requiered +New password;New password +Secure your account;Secure your account +2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.;2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login. From 6db877d8fcad9840a763bbe173ad3430d52a94aa Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 15:09:22 +0200 Subject: [PATCH 28/39] Removed old subscription data --- Moonlight/App/Database/DataContext.cs | 2 - .../App/Database/Entities/Subscription.cs | 1 - .../Database/Entities/SubscriptionLimit.cs | 11 - Moonlight/App/Database/Entities/User.cs | 30 +- ...734_RemovedOldSubscriptionData.Designer.cs | 962 ++++++++++++++++++ ...230403130734_RemovedOldSubscriptionData.cs | 269 +++++ .../Migrations/DataContextModelSnapshot.cs | 117 +-- .../Api/Moonlight/PaymentsController.cs | 50 - .../SubscriptionLimitRepository.cs | 44 - .../Subscriptions/SubscriptionRepository.cs | 44 - Moonlight/App/Services/SubscriptionService.cs | 128 --- Moonlight/Program.cs | 4 - Moonlight/Shared/Views/Admin/Users/View.razor | 11 +- .../Shared/Views/Profile/Subscriptions.razor | 126 --- 14 files changed, 1239 insertions(+), 560 deletions(-) delete mode 100644 Moonlight/App/Database/Entities/SubscriptionLimit.cs create mode 100644 Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.cs delete mode 100644 Moonlight/App/Http/Controllers/Api/Moonlight/PaymentsController.cs delete mode 100644 Moonlight/App/Repositories/Subscriptions/SubscriptionLimitRepository.cs delete mode 100644 Moonlight/App/Repositories/Subscriptions/SubscriptionRepository.cs delete mode 100644 Moonlight/App/Services/SubscriptionService.cs delete mode 100644 Moonlight/Shared/Views/Profile/Subscriptions.razor diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index 23b9373..0f97040 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -35,8 +35,6 @@ public class DataContext : DbContext public DbSet SharedDomains { get; set; } public DbSet Domains { get; set; } - public DbSet Subscriptions { get; set; } - public DbSet SubscriptionLimits { get; set; } public DbSet Revokes { get; set; } public DbSet NotificationClients { get; set; } public DbSet NotificationActions { get; set; } diff --git a/Moonlight/App/Database/Entities/Subscription.cs b/Moonlight/App/Database/Entities/Subscription.cs index 7f2fa6e..bd893d7 100644 --- a/Moonlight/App/Database/Entities/Subscription.cs +++ b/Moonlight/App/Database/Entities/Subscription.cs @@ -7,5 +7,4 @@ public class Subscription public string Description { get; set; } = ""; public string SellPassId { get; set; } = ""; public int Duration { get; set; } - public List Limits { get; set; } = new(); } \ No newline at end of file diff --git a/Moonlight/App/Database/Entities/SubscriptionLimit.cs b/Moonlight/App/Database/Entities/SubscriptionLimit.cs deleted file mode 100644 index 96c0691..0000000 --- a/Moonlight/App/Database/Entities/SubscriptionLimit.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Moonlight.App.Database.Entities; - -public class SubscriptionLimit -{ - public int Id { get; set; } - public Image Image { get; set; } = null!; - public int Amount { get; set; } - public int Cpu { get; set; } - public int Memory { get; set; } - public int Disk { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs index f99b8c6..397e379 100644 --- a/Moonlight/App/Database/Entities/User.cs +++ b/Moonlight/App/Database/Entities/User.cs @@ -8,44 +8,21 @@ public class User public int Id { get; set; } // Personal data - - [Required] - [MinLength(3, ErrorMessage = "Invalid first name")] - [MaxLength(64, ErrorMessage = "Max lenght reached")] + public string FirstName { get; set; } = ""; - [Required] - [MinLength(3, ErrorMessage = "Invalid last name")] - [MaxLength(64, ErrorMessage = "Max lenght reached")] public string LastName { get; set; } = ""; - [Required(ErrorMessage = "You need to enter an email address")] - [EmailAddress(ErrorMessage = "You need to enter a valid email address")] public string Email { get; set; } = ""; - [Required(ErrorMessage = "You need to enter a password")] - [MinLength(8, ErrorMessage = "You need to enter a password with minimum 8 characters in lenght")] public string Password { get; set; } = ""; - [Required] - [RegularExpression(@"^(?:[A-Z] \d|[^\W\d_]{2,}\.?)(?:[- '’][^\W\d_]+\.?)*\s+[1-9]\d{0,3} ?[a-zA-Z]?(?: ?[/-] ?[1-9]\d{0,3} ?[a-zA-Z]?)?$", - ErrorMessage = "Street and house number required")] - [MaxLength(128, ErrorMessage = "Max lenght reached")] public string Address { get; set; } = ""; - [Required] - [MinLength(3, ErrorMessage = "Invalid city")] - [MaxLength(128, ErrorMessage = "Max lenght reached")] public string City { get; set; } = ""; - [Required] - [MinLength(3, ErrorMessage = "Invalid state")] - [MaxLength(64, ErrorMessage = "Max lenght reached")] public string State { get; set; } = ""; - [Required] - [MinLength(3, ErrorMessage = "Invalid country")] - [MaxLength(64, ErrorMessage = "Max lenght reached")] public string Country { get; set; } = ""; // States @@ -65,9 +42,4 @@ public class User // Date stuff public DateTime CreatedAt { get; set; } = DateTime.UtcNow; public DateTime UpdatedAt { get; set; } = DateTime.UtcNow; - - // Subscriptions - public Subscription? Subscription { get; set; } = null; - public DateTime? SubscriptionSince { get; set; } - public int SubscriptionDuration { get; set; } } \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.Designer.cs b/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.Designer.cs new file mode 100644 index 0000000..d5429e9 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.Designer.cs @@ -0,0 +1,962 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230403130734_RemovedOldSubscriptionData")] + partial class RemovedOldSubscriptionData + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("IsCleanupException") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.cs b/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.cs new file mode 100644 index 0000000..23c0f92 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230403130734_RemovedOldSubscriptionData.cs @@ -0,0 +1,269 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class RemovedOldSubscriptionData : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Users_Subscriptions_SubscriptionId", + table: "Users"); + + migrationBuilder.DropTable( + name: "SubscriptionLimits"); + + migrationBuilder.DropTable( + name: "Subscriptions"); + + migrationBuilder.DropIndex( + name: "IX_Users_SubscriptionId", + table: "Users"); + + migrationBuilder.DropColumn( + name: "SubscriptionDuration", + table: "Users"); + + migrationBuilder.DropColumn( + name: "SubscriptionId", + table: "Users"); + + migrationBuilder.DropColumn( + name: "SubscriptionSince", + table: "Users"); + + migrationBuilder.AlterColumn( + name: "State", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "LastName", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "FirstName", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Country", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(64)", + oldMaxLength: 64) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "City", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(128)", + oldMaxLength: 128) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Address", + table: "Users", + type: "longtext", + nullable: false, + oldClrType: typeof(string), + oldType: "varchar(128)", + oldMaxLength: 128) + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "State", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "LastName", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "FirstName", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Country", + table: "Users", + type: "varchar(64)", + maxLength: 64, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "City", + table: "Users", + type: "varchar(128)", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AlterColumn( + name: "Address", + table: "Users", + type: "varchar(128)", + maxLength: 128, + nullable: false, + oldClrType: typeof(string), + oldType: "longtext") + .Annotation("MySql:CharSet", "utf8mb4") + .OldAnnotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.AddColumn( + name: "SubscriptionDuration", + table: "Users", + type: "int", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "SubscriptionId", + table: "Users", + type: "int", + nullable: true); + + migrationBuilder.AddColumn( + name: "SubscriptionSince", + table: "Users", + type: "datetime(6)", + nullable: true); + + migrationBuilder.CreateTable( + name: "Subscriptions", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + Description = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Duration = table.Column(type: "int", nullable: false), + Name = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + SellPassId = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_Subscriptions", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateTable( + name: "SubscriptionLimits", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + ImageId = table.Column(type: "int", nullable: false), + Amount = table.Column(type: "int", nullable: false), + Cpu = table.Column(type: "int", nullable: false), + Disk = table.Column(type: "int", nullable: false), + Memory = table.Column(type: "int", nullable: false), + SubscriptionId = table.Column(type: "int", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_SubscriptionLimits", x => x.Id); + table.ForeignKey( + name: "FK_SubscriptionLimits_Images_ImageId", + column: x => x.ImageId, + principalTable: "Images", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_SubscriptionLimits_Subscriptions_SubscriptionId", + column: x => x.SubscriptionId, + principalTable: "Subscriptions", + principalColumn: "Id"); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_Users_SubscriptionId", + table: "Users", + column: "SubscriptionId"); + + migrationBuilder.CreateIndex( + name: "IX_SubscriptionLimits_ImageId", + table: "SubscriptionLimits", + column: "ImageId"); + + migrationBuilder.CreateIndex( + name: "IX_SubscriptionLimits_SubscriptionId", + table: "SubscriptionLimits", + column: "SubscriptionId"); + + migrationBuilder.AddForeignKey( + name: "FK_Users_Subscriptions_SubscriptionId", + table: "Users", + column: "SubscriptionId", + principalTable: "Subscriptions", + principalColumn: "Id"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index dba0d96..6aa632a 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -599,65 +599,6 @@ namespace Moonlight.App.Database.Migrations b.ToTable("SharedDomains"); }); - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("Duration") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("SellPassId") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Subscriptions"); - }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property("Amount") - .HasColumnType("int"); - - b.Property("Cpu") - .HasColumnType("int"); - - b.Property("Disk") - .HasColumnType("int"); - - b.Property("ImageId") - .HasColumnType("int"); - - b.Property("Memory") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ImageId"); - - b.HasIndex("SubscriptionId"); - - b.ToTable("SubscriptionLimits"); - }); - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => { b.Property("Id") @@ -710,21 +651,18 @@ namespace Moonlight.App.Database.Migrations b.Property("Address") .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); + .HasColumnType("longtext"); b.Property("Admin") .HasColumnType("tinyint(1)"); b.Property("City") .IsRequired() - .HasMaxLength(128) - .HasColumnType("varchar(128)"); + .HasColumnType("longtext"); b.Property("Country") .IsRequired() - .HasMaxLength(64) - .HasColumnType("varchar(64)"); + .HasColumnType("longtext"); b.Property("CreatedAt") .HasColumnType("datetime(6)"); @@ -738,13 +676,11 @@ namespace Moonlight.App.Database.Migrations b.Property("FirstName") .IsRequired() - .HasMaxLength(64) - .HasColumnType("varchar(64)"); + .HasColumnType("longtext"); b.Property("LastName") .IsRequired() - .HasMaxLength(64) - .HasColumnType("varchar(64)"); + .HasColumnType("longtext"); b.Property("Password") .IsRequired() @@ -752,21 +688,11 @@ namespace Moonlight.App.Database.Migrations b.Property("State") .IsRequired() - .HasMaxLength(64) - .HasColumnType("varchar(64)"); + .HasColumnType("longtext"); b.Property("Status") .HasColumnType("int"); - b.Property("SubscriptionDuration") - .HasColumnType("int"); - - b.Property("SubscriptionId") - .HasColumnType("int"); - - b.Property("SubscriptionSince") - .HasColumnType("datetime(6)"); - b.Property("SupportPending") .HasColumnType("tinyint(1)"); @@ -785,8 +711,6 @@ namespace Moonlight.App.Database.Migrations b.HasKey("Id"); - b.HasIndex("SubscriptionId"); - b.ToTable("Users"); }); @@ -975,21 +899,6 @@ namespace Moonlight.App.Database.Migrations .HasForeignKey("ServerId"); }); - modelBuilder.Entity("Moonlight.App.Database.Entities.SubscriptionLimit", b => - { - b.HasOne("Moonlight.App.Database.Entities.Image", "Image") - .WithMany() - .HasForeignKey("ImageId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("Moonlight.App.Database.Entities.Subscription", null) - .WithMany("Limits") - .HasForeignKey("SubscriptionId"); - - b.Navigation("Image"); - }); - modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => { b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") @@ -1005,15 +914,6 @@ namespace Moonlight.App.Database.Migrations b.Navigation("Sender"); }); - modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => - { - b.HasOne("Moonlight.App.Database.Entities.Subscription", "Subscription") - .WithMany() - .HasForeignKey("SubscriptionId"); - - b.Navigation("Subscription"); - }); - modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => { b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") @@ -1053,11 +953,6 @@ namespace Moonlight.App.Database.Migrations b.Navigation("Variables"); }); - - modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => - { - b.Navigation("Limits"); - }); #pragma warning restore 612, 618 } } diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/PaymentsController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/PaymentsController.cs deleted file mode 100644 index 9298d46..0000000 --- a/Moonlight/App/Http/Controllers/Api/Moonlight/PaymentsController.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Moonlight.App.Services; - -namespace Moonlight.App.Http.Controllers.Api.Moonlight; - -[ApiController] -[Route("api/moonlight/payments")] -public class PaymentsController : Controller -{ - private readonly ConfigService ConfigService; - private readonly SubscriptionService SubscriptionService; - - public PaymentsController(ConfigService configService, SubscriptionService subscriptionService) - { - ConfigService = configService; - SubscriptionService = subscriptionService; - } - - [HttpGet("generate")] - public async Task GenerateGet([FromQuery] string key, [FromQuery] int subscriptionId) - { - var validKey = ConfigService - .GetSection("Moonlight") - .GetSection("Payments") - .GetValue("Key"); - - if (key != validKey) - return StatusCode(403); - - var token = await SubscriptionService.ProcessGenerate(subscriptionId); - - return Ok(token); - } - - [HttpPost("generate")] - public async Task GeneratePost([FromQuery] string key, [FromQuery] int subscriptionId) - { - var validKey = ConfigService - .GetSection("Moonlight") - .GetSection("Payments") - .GetValue("Key"); - - if (key != validKey) - return StatusCode(403); - - var token = await SubscriptionService.ProcessGenerate(subscriptionId); - - return Ok(token); - } -} \ No newline at end of file diff --git a/Moonlight/App/Repositories/Subscriptions/SubscriptionLimitRepository.cs b/Moonlight/App/Repositories/Subscriptions/SubscriptionLimitRepository.cs deleted file mode 100644 index f11daeb..0000000 --- a/Moonlight/App/Repositories/Subscriptions/SubscriptionLimitRepository.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Moonlight.App.Database; -using Moonlight.App.Database.Entities; - -namespace Moonlight.App.Repositories.Subscriptions; - -public class SubscriptionLimitRepository : IDisposable -{ - private readonly DataContext DataContext; - - public SubscriptionLimitRepository(DataContext dataContext) - { - DataContext = dataContext; - } - - public DbSet Get() - { - return DataContext.SubscriptionLimits; - } - - public SubscriptionLimit Add(SubscriptionLimit subscription) - { - var x = DataContext.SubscriptionLimits.Add(subscription); - DataContext.SaveChanges(); - return x.Entity; - } - - public void Update(SubscriptionLimit subscription) - { - DataContext.SubscriptionLimits.Update(subscription); - DataContext.SaveChanges(); - } - - public void Delete(SubscriptionLimit subscription) - { - DataContext.SubscriptionLimits.Remove(subscription); - DataContext.SaveChanges(); - } - - public void Dispose() - { - DataContext.Dispose(); - } -} \ No newline at end of file diff --git a/Moonlight/App/Repositories/Subscriptions/SubscriptionRepository.cs b/Moonlight/App/Repositories/Subscriptions/SubscriptionRepository.cs deleted file mode 100644 index d7f212b..0000000 --- a/Moonlight/App/Repositories/Subscriptions/SubscriptionRepository.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Moonlight.App.Database; -using Moonlight.App.Database.Entities; - -namespace Moonlight.App.Repositories.Subscriptions; - -public class SubscriptionRepository : IDisposable -{ - private readonly DataContext DataContext; - - public SubscriptionRepository(DataContext dataContext) - { - DataContext = dataContext; - } - - public DbSet Get() - { - return DataContext.Subscriptions; - } - - public Subscription Add(Subscription subscription) - { - var x = DataContext.Subscriptions.Add(subscription); - DataContext.SaveChanges(); - return x.Entity; - } - - public void Update(Subscription subscription) - { - DataContext.Subscriptions.Update(subscription); - DataContext.SaveChanges(); - } - - public void Delete(Subscription subscription) - { - DataContext.Subscriptions.Remove(subscription); - DataContext.SaveChanges(); - } - - public void Dispose() - { - DataContext.Dispose(); - } -} \ No newline at end of file diff --git a/Moonlight/App/Services/SubscriptionService.cs b/Moonlight/App/Services/SubscriptionService.cs deleted file mode 100644 index 1627eca..0000000 --- a/Moonlight/App/Services/SubscriptionService.cs +++ /dev/null @@ -1,128 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Moonlight.App.Database.Entities; -using Moonlight.App.Exceptions; -using Moonlight.App.Models.Misc; -using Moonlight.App.Repositories; -using Moonlight.App.Repositories.Subscriptions; -using Moonlight.App.Services.LogServices; -using Moonlight.App.Services.Sessions; - -namespace Moonlight.App.Services; - -public class SubscriptionService -{ - private readonly SubscriptionRepository SubscriptionRepository; - private readonly UserRepository UserRepository; - private readonly IdentityService IdentityService; - private readonly ConfigService ConfigService; - private readonly OneTimeJwtService OneTimeJwtService; - private readonly AuditLogService AuditLogService; - - public SubscriptionService(SubscriptionRepository subscriptionRepository, - UserRepository userRepository, - IdentityService identityService, - ConfigService configService, - OneTimeJwtService oneTimeJwtService, - AuditLogService auditLogService) - { - SubscriptionRepository = subscriptionRepository; - UserRepository = userRepository; - IdentityService = identityService; - ConfigService = configService; - OneTimeJwtService = oneTimeJwtService; - AuditLogService = auditLogService; - } - - public async Task Get() - { - var user = await IdentityService.Get(); - var advancedUser = UserRepository - .Get() - .Include(x => x.Subscription) - .First(x => x.Id == user!.Id); - - if (advancedUser.Subscription == null) - return null; - - return SubscriptionRepository - .Get() - .Include(x => x.Limits) - .Include("Limits.Image") - .First(x => x.Id == advancedUser.Subscription.Id); - } - public async Task Cancel() - { - var user = await IdentityService.Get(); - user!.Subscription = null; - UserRepository.Update(user!); - - await AuditLogService.Log(AuditLogType.CancelSubscription, new[] { user.Email }); - } - public Task GetAvailable() - { - return Task.FromResult( - SubscriptionRepository - .Get() - .Include(x => x.Limits) - .ToArray() - ); - } - public Task GenerateBuyUrl(Subscription subscription) - { - var url = ConfigService - .GetSection("Moonlight") - .GetSection("Payments") - .GetValue("BaseUrl"); - - return Task.FromResult($"{url}/products/{subscription.SellPassId}"); - } - public Task ProcessGenerate(int subscriptionId) - { - var subscription = SubscriptionRepository - .Get() - .FirstOrDefault(x => x.Id == subscriptionId); - - if (subscription == null) - throw new DisplayException("Unknown subscription id"); - - var token = OneTimeJwtService.Generate( - options => - { - options.Add("id", subscription.Id.ToString()); - } - ); - - return Task.FromResult(token); - } - - public async Task ApplyCode(string code) - { - var user = (await IdentityService.Get())!; - var values = await OneTimeJwtService.Validate(code); - - if (values == null) - throw new DisplayException("Invalid subscription code"); - - if (!values.ContainsKey("id")) - throw new DisplayException("Subscription code is missing the id"); - - var id = int.Parse(values["id"]); - - var subscription = SubscriptionRepository - .Get() - .FirstOrDefault(x => x.Id == id); - - if (subscription == null) - throw new DisplayException("The subscription the code is referring does not exist"); - - user.Subscription = subscription; - user.SubscriptionDuration = subscription.Duration; - user.SubscriptionSince = DateTime.Now; - - UserRepository.Update(user); - - await OneTimeJwtService.Revoke(code); - - await AuditLogService.Log(AuditLogType.ApplySubscriptionCode, new[] { user.Email, subscription.Id.ToString() }); - } -} \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index c1519c1..e0584a8 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -9,7 +9,6 @@ using Moonlight.App.Repositories; using Moonlight.App.Repositories.Domains; using Moonlight.App.Repositories.LogEntries; using Moonlight.App.Repositories.Servers; -using Moonlight.App.Repositories.Subscriptions; using Moonlight.App.Services; using Moonlight.App.Services.DiscordBot; using Moonlight.App.Services.Interop; @@ -58,8 +57,6 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -89,7 +86,6 @@ namespace Moonlight builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Moonlight/Shared/Views/Admin/Users/View.razor b/Moonlight/Shared/Views/Admin/Users/View.razor index dc3d160..b4851f2 100644 --- a/Moonlight/Shared/Views/Admin/Users/View.razor +++ b/Moonlight/Shared/Views/Admin/Users/View.razor @@ -196,16 +196,7 @@ else
    - @if (User.Subscription == null) - { - - None - - } - else - { - @(User.Subscription.Name) - } +
    diff --git a/Moonlight/Shared/Views/Profile/Subscriptions.razor b/Moonlight/Shared/Views/Profile/Subscriptions.razor deleted file mode 100644 index 30b8d19..0000000 --- a/Moonlight/Shared/Views/Profile/Subscriptions.razor +++ /dev/null @@ -1,126 +0,0 @@ -@page "/profile/subscriptions" -@using Moonlight.App.Services -@using Moonlight.Shared.Components.Navigations -@using Moonlight.App.Database.Entities -@using Moonlight.App.Helpers - -@inject SubscriptionService SubscriptionService -@inject SmartTranslateService SmartTranslateService -@inject NavigationManager NavigationManager - - - - -
    -
    - @if (User.Subscription != null) - { -
    -
    -

    - Active until @(Formatter.FormatDate(User.SubscriptionSince!.Value.AddDays(User.SubscriptionDuration))) -

    -

    - We will send you a notification upon subscription expiration -

    -
    -
    -
    - - -
    -
    -
    - } - else - { -
    -
    - -
    -
    - - -
    -
    - -
    - @if (Available.Any()) - { - @foreach (var sub in Available) - { -
    -
    -
    -
    - @(sub.Name) -
    -
    -
    @(sub.Description)
    -
    -
    -
    - - -
    -
    -
    - } - } - else - { -
    - No subscription available -
    - } -
    - } -
    -
    -     - -@code -{ - [CascadingParameter] - public User User { get; set; } - - private Subscription? Subscription; - private Subscription[] Available; - - private string Code = ""; - - private LazyLoader LazyLoader; - - private async Task Load(LazyLoader lazyLoader) - { - Subscription = await SubscriptionService.Get(); - Available = await SubscriptionService.GetAvailable(); - } - - private async Task Cancel() - { - await SubscriptionService.Cancel(); - } - - private async Task Buy(Subscription subscription) - { - var url = await SubscriptionService.GenerateBuyUrl(subscription); - - NavigationManager.NavigateTo(url); - } - - private async Task ApplyCode() - { - await SubscriptionService.ApplyCode(Code); - await LazyLoader.Reload(); - } -} \ No newline at end of file From 010436cdb6e01c6e4fa99a8117ad00a2e49bf8db Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 3 Apr 2023 19:29:07 +0200 Subject: [PATCH 29/39] Added services. Added admin ui. Added delete button --- Moonlight/App/Database/DataContext.cs | 1 + .../App/Database/Entities/Subscription.cs | 3 +- Moonlight/App/Database/Entities/User.cs | 6 + ...31343_AddedNewSubscriptionData.Designer.cs | 1005 +++++++++++++++++ ...20230403131343_AddedNewSubscriptionData.cs | 94 ++ .../Migrations/DataContextModelSnapshot.cs | 43 + .../App/Models/Forms/SubscriptionDataModel.cs | 13 + .../App/Models/Misc/SubscriptionLimit.cs | 14 + .../Repositories/SubscriptionRepository.cs | 44 + .../App/Services/SubscriptionAdminService.cs | 45 + Moonlight/App/Services/SubscriptionService.cs | 140 +++ Moonlight/Program.cs | 4 + .../Components/Forms/DeleteButton.razor | 57 + .../Shared/Components/Forms/SmartForm.razor | 23 +- .../Components/Partials/SidebarMenu.razor | 8 + .../Views/Admin/Subscriptions/Index.razor | 72 ++ .../Views/Admin/Subscriptions/New.razor | 137 +++ Moonlight/Shared/Views/Profile/Index.razor | 4 +- Moonlight/resources/lang/de_de.lang | 8 + 19 files changed, 1711 insertions(+), 10 deletions(-) create mode 100644 Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.Designer.cs create mode 100644 Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.cs create mode 100644 Moonlight/App/Models/Forms/SubscriptionDataModel.cs create mode 100644 Moonlight/App/Models/Misc/SubscriptionLimit.cs create mode 100644 Moonlight/App/Repositories/SubscriptionRepository.cs create mode 100644 Moonlight/App/Services/SubscriptionAdminService.cs create mode 100644 Moonlight/App/Services/SubscriptionService.cs create mode 100644 Moonlight/Shared/Components/Forms/DeleteButton.razor create mode 100644 Moonlight/Shared/Views/Admin/Subscriptions/Index.razor create mode 100644 Moonlight/Shared/Views/Admin/Subscriptions/New.razor diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs index 0f97040..3e2875f 100644 --- a/Moonlight/App/Database/DataContext.cs +++ b/Moonlight/App/Database/DataContext.cs @@ -41,6 +41,7 @@ public class DataContext : DbContext public DbSet AaPanels { get; set; } public DbSet Websites { get; set; } public DbSet DdosAttacks { get; set; } + public DbSet Subscriptions { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { diff --git a/Moonlight/App/Database/Entities/Subscription.cs b/Moonlight/App/Database/Entities/Subscription.cs index bd893d7..ab0b8c7 100644 --- a/Moonlight/App/Database/Entities/Subscription.cs +++ b/Moonlight/App/Database/Entities/Subscription.cs @@ -5,6 +5,5 @@ public class Subscription public int Id { get; set; } public string Name { get; set; } = ""; public string Description { get; set; } = ""; - public string SellPassId { get; set; } = ""; - public int Duration { get; set; } + public string LimitsJson { get; set; } = ""; } \ No newline at end of file diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs index 397e379..a0654a3 100644 --- a/Moonlight/App/Database/Entities/User.cs +++ b/Moonlight/App/Database/Entities/User.cs @@ -42,4 +42,10 @@ public class User // Date stuff public DateTime CreatedAt { get; set; } = DateTime.UtcNow; public DateTime UpdatedAt { get; set; } = DateTime.UtcNow; + + // Subscriptions + + public Subscription? CurrentSubscription { get; set; } = null; + public DateTime SubscriptionSince { get; set; } = DateTime.Now; + public int SubscriptionDuration { get; set; } } \ No newline at end of file diff --git a/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.Designer.cs b/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.Designer.cs new file mode 100644 index 0000000..e0d6429 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.Designer.cs @@ -0,0 +1,1005 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Moonlight.App.Database; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230403131343_AddedNewSubscriptionData")] + partial class AddedNewSubscriptionData + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BaseDomain") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Url") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("AaPanels"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Databases"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Data") + .HasColumnType("bigint"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Ongoing") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.ToTable("DdosAttacks"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Default") + .HasColumnType("tinyint(1)"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("DockerImages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("SharedDomainId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("SharedDomainId"); + + b.ToTable("Domains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Allocations") + .HasColumnType("int"); + + b.Property("ConfigFiles") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallDockerImage") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallEntrypoint") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InstallScript") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Startup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StartupDetection") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("StopCommand") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TagsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.ToTable("Images"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("ImageTags"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("DefaultValue") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.ToTable("ImageVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("LoadingMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AuditLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Class") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Stacktrace") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ErrorLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Ip") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("JsonData") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("System") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("SecurityLog"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Fqdn") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("HttpPort") + .HasColumnType("int"); + + b.Property("MoonlightDaemonPort") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("SftpPort") + .HasColumnType("int"); + + b.Property("Ssl") + .HasColumnType("tinyint(1)"); + + b.Property("Token") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("TokenId") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("Port") + .HasColumnType("int"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NodeId"); + + b.HasIndex("ServerId"); + + b.ToTable("NodeAllocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Action") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NotificationClientId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("NotificationClientId"); + + b.ToTable("NotificationActions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("UserId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("NotificationClients"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Revokes"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cpu") + .HasColumnType("int"); + + b.Property("Disk") + .HasColumnType("bigint"); + + b.Property("DockerImageIndex") + .HasColumnType("int"); + + b.Property("ImageId") + .HasColumnType("int"); + + b.Property("Installing") + .HasColumnType("tinyint(1)"); + + b.Property("IsCleanupException") + .HasColumnType("tinyint(1)"); + + b.Property("MainAllocationId") + .HasColumnType("int"); + + b.Property("Memory") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("NodeId") + .HasColumnType("int"); + + b.Property("OverrideStartup") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Suspended") + .HasColumnType("tinyint(1)"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ImageId"); + + b.HasIndex("MainAllocationId"); + + b.HasIndex("NodeId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Servers"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bytes") + .HasColumnType("bigint"); + + b.Property("Created") + .HasColumnType("tinyint(1)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Uuid") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerBackups"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Key") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("ServerId") + .HasColumnType("int"); + + b.Property("Value") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("ServerId"); + + b.ToTable("ServerVariables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CloudflareId") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SharedDomains"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LimitsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Answer") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("IsQuestion") + .HasColumnType("tinyint(1)"); + + b.Property("IsSupport") + .HasColumnType("tinyint(1)"); + + b.Property("IsSystem") + .HasColumnType("tinyint(1)"); + + b.Property("Message") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("RecipientId") + .HasColumnType("int"); + + b.Property("SenderId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RecipientId"); + + b.HasIndex("SenderId"); + + b.ToTable("SupportMessages"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Address") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Admin") + .HasColumnType("tinyint(1)"); + + b.Property("City") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Country") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("CurrentSubscriptionId") + .HasColumnType("int"); + + b.Property("DiscordId") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Password") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("State") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + + b.Property("SupportPending") + .HasColumnType("tinyint(1)"); + + b.Property("TokenValidTime") + .HasColumnType("datetime(6)"); + + b.Property("TotpEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("TotpSecret") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("UpdatedAt") + .HasColumnType("datetime(6)"); + + b.HasKey("Id"); + + b.HasIndex("CurrentSubscriptionId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AaPanelId") + .HasColumnType("int"); + + b.Property("DomainName") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpPassword") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("FtpUsername") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("InternalAaPanelId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhpVersion") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.HasIndex("AaPanelId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Websites"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("DockerImages") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain") + .WithMany() + .HasForeignKey("SharedDomainId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("SharedDomain"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", null) + .WithMany("Variables") + .HasForeignKey("ImageId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b => + { + b.HasOne("Moonlight.App.Database.Entities.Node", null) + .WithMany("Allocations") + .HasForeignKey("NodeId"); + + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Allocations") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b => + { + b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient") + .WithMany() + .HasForeignKey("NotificationClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NotificationClient"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.HasOne("Moonlight.App.Database.Entities.Image", "Image") + .WithMany() + .HasForeignKey("ImageId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation") + .WithMany() + .HasForeignKey("MainAllocationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.Node", "Node") + .WithMany() + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Image"); + + b.Navigation("MainAllocation"); + + b.Navigation("Node"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Backups") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b => + { + b.HasOne("Moonlight.App.Database.Entities.Server", null) + .WithMany("Variables") + .HasForeignKey("ServerId"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => + { + b.HasOne("Moonlight.App.Database.Entities.User", "Recipient") + .WithMany() + .HasForeignKey("RecipientId"); + + b.HasOne("Moonlight.App.Database.Entities.User", "Sender") + .WithMany() + .HasForeignKey("SenderId"); + + b.Navigation("Recipient"); + + b.Navigation("Sender"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription") + .WithMany() + .HasForeignKey("CurrentSubscriptionId"); + + b.Navigation("CurrentSubscription"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => + { + b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") + .WithMany() + .HasForeignKey("AaPanelId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Moonlight.App.Database.Entities.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AaPanel"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b => + { + b.Navigation("DockerImages"); + + b.Navigation("Variables"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b => + { + b.Navigation("Allocations"); + }); + + modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b => + { + b.Navigation("Allocations"); + + b.Navigation("Backups"); + + b.Navigation("Variables"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.cs b/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.cs new file mode 100644 index 0000000..5299884 --- /dev/null +++ b/Moonlight/App/Database/Migrations/20230403131343_AddedNewSubscriptionData.cs @@ -0,0 +1,94 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Moonlight.App.Database.Migrations +{ + /// + public partial class AddedNewSubscriptionData : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CurrentSubscriptionId", + table: "Users", + type: "int", + nullable: true); + + migrationBuilder.AddColumn( + name: "SubscriptionDuration", + table: "Users", + type: "int", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "SubscriptionSince", + table: "Users", + type: "datetime(6)", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.CreateTable( + name: "Subscriptions", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), + Name = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + Description = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4"), + LimitsJson = table.Column(type: "longtext", nullable: false) + .Annotation("MySql:CharSet", "utf8mb4") + }, + constraints: table => + { + table.PrimaryKey("PK_Subscriptions", x => x.Id); + }) + .Annotation("MySql:CharSet", "utf8mb4"); + + migrationBuilder.CreateIndex( + name: "IX_Users_CurrentSubscriptionId", + table: "Users", + column: "CurrentSubscriptionId"); + + migrationBuilder.AddForeignKey( + name: "FK_Users_Subscriptions_CurrentSubscriptionId", + table: "Users", + column: "CurrentSubscriptionId", + principalTable: "Subscriptions", + principalColumn: "Id"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_Users_Subscriptions_CurrentSubscriptionId", + table: "Users"); + + migrationBuilder.DropTable( + name: "Subscriptions"); + + migrationBuilder.DropIndex( + name: "IX_Users_CurrentSubscriptionId", + table: "Users"); + + migrationBuilder.DropColumn( + name: "CurrentSubscriptionId", + table: "Users"); + + migrationBuilder.DropColumn( + name: "SubscriptionDuration", + table: "Users"); + + migrationBuilder.DropColumn( + name: "SubscriptionSince", + table: "Users"); + } + } +} diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs index 6aa632a..d670d74 100644 --- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs +++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs @@ -599,6 +599,29 @@ namespace Moonlight.App.Database.Migrations b.ToTable("SharedDomains"); }); + modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("LimitsJson") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("Name") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("Subscriptions"); + }); + modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b => { b.Property("Id") @@ -667,6 +690,9 @@ namespace Moonlight.App.Database.Migrations b.Property("CreatedAt") .HasColumnType("datetime(6)"); + b.Property("CurrentSubscriptionId") + .HasColumnType("int"); + b.Property("DiscordId") .HasColumnType("bigint"); @@ -693,6 +719,12 @@ namespace Moonlight.App.Database.Migrations b.Property("Status") .HasColumnType("int"); + b.Property("SubscriptionDuration") + .HasColumnType("int"); + + b.Property("SubscriptionSince") + .HasColumnType("datetime(6)"); + b.Property("SupportPending") .HasColumnType("tinyint(1)"); @@ -711,6 +743,8 @@ namespace Moonlight.App.Database.Migrations b.HasKey("Id"); + b.HasIndex("CurrentSubscriptionId"); + b.ToTable("Users"); }); @@ -914,6 +948,15 @@ namespace Moonlight.App.Database.Migrations b.Navigation("Sender"); }); + modelBuilder.Entity("Moonlight.App.Database.Entities.User", b => + { + b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription") + .WithMany() + .HasForeignKey("CurrentSubscriptionId"); + + b.Navigation("CurrentSubscription"); + }); + modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b => { b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel") diff --git a/Moonlight/App/Models/Forms/SubscriptionDataModel.cs b/Moonlight/App/Models/Forms/SubscriptionDataModel.cs new file mode 100644 index 0000000..92bf8eb --- /dev/null +++ b/Moonlight/App/Models/Forms/SubscriptionDataModel.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Models.Forms; + +public class SubscriptionDataModel +{ + [Required(ErrorMessage = "You need to enter a name")] + [MaxLength(32, ErrorMessage = "Max lenght for name is 32")] + public string Name { get; set; } = ""; + + [Required(ErrorMessage = "You need to enter a description")] + public string Description { get; set; } = ""; +} \ No newline at end of file diff --git a/Moonlight/App/Models/Misc/SubscriptionLimit.cs b/Moonlight/App/Models/Misc/SubscriptionLimit.cs new file mode 100644 index 0000000..6e77aba --- /dev/null +++ b/Moonlight/App/Models/Misc/SubscriptionLimit.cs @@ -0,0 +1,14 @@ +namespace Moonlight.App.Models.Misc; + +public class SubscriptionLimit +{ + public string Identifier { get; set; } = ""; + public int Amount { get; set; } + public List Options { get; set; } = new(); + + public class LimitOption + { + public string Key { get; set; } = ""; + public string Value { get; set; } = ""; + } +} \ No newline at end of file diff --git a/Moonlight/App/Repositories/SubscriptionRepository.cs b/Moonlight/App/Repositories/SubscriptionRepository.cs new file mode 100644 index 0000000..3ffb678 --- /dev/null +++ b/Moonlight/App/Repositories/SubscriptionRepository.cs @@ -0,0 +1,44 @@ +using Microsoft.EntityFrameworkCore; +using Moonlight.App.Database; +using Moonlight.App.Database.Entities; + +namespace Moonlight.App.Repositories; + +public class SubscriptionRepository : IDisposable +{ + private readonly DataContext DataContext; + + public SubscriptionRepository(DataContext dataContext) + { + DataContext = dataContext; + } + + public DbSet Get() + { + return DataContext.Subscriptions; + } + + public Subscription Add(Subscription subscription) + { + var x = DataContext.Subscriptions.Add(subscription); + DataContext.SaveChanges(); + return x.Entity; + } + + public void Update(Subscription subscription) + { + DataContext.Subscriptions.Update(subscription); + DataContext.SaveChanges(); + } + + public void Delete(Subscription subscription) + { + DataContext.Subscriptions.Remove(subscription); + DataContext.SaveChanges(); + } + + public void Dispose() + { + DataContext.Dispose(); + } +} \ No newline at end of file diff --git a/Moonlight/App/Services/SubscriptionAdminService.cs b/Moonlight/App/Services/SubscriptionAdminService.cs new file mode 100644 index 0000000..fbbe84b --- /dev/null +++ b/Moonlight/App/Services/SubscriptionAdminService.cs @@ -0,0 +1,45 @@ +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Misc; +using Moonlight.App.Repositories; +using Newtonsoft.Json; + +namespace Moonlight.App.Services; + +public class SubscriptionAdminService +{ + private readonly SubscriptionRepository SubscriptionRepository; + private readonly OneTimeJwtService OneTimeJwtService; + + public SubscriptionAdminService(OneTimeJwtService oneTimeJwtService, SubscriptionRepository subscriptionRepository) + { + OneTimeJwtService = oneTimeJwtService; + SubscriptionRepository = subscriptionRepository; + } + + public Task GetLimits(Subscription subscription) + { + return Task.FromResult( + JsonConvert.DeserializeObject(subscription.LimitsJson) + ?? Array.Empty() + ); + } + + public Task SaveLimits(Subscription subscription, SubscriptionLimit[] limits) + { + subscription.LimitsJson = JsonConvert.SerializeObject(limits); + SubscriptionRepository.Update(subscription); + + return Task.CompletedTask; + } + + public Task GenerateCode(Subscription subscription, int duration) + { + return Task.FromResult( + OneTimeJwtService.Generate(data => + { + data.Add("subscription", subscription.Id.ToString()); + data.Add("duration", duration.ToString()); + }, TimeSpan.FromDays(10324)) + ); + } +} \ No newline at end of file diff --git a/Moonlight/App/Services/SubscriptionService.cs b/Moonlight/App/Services/SubscriptionService.cs new file mode 100644 index 0000000..f5e77c9 --- /dev/null +++ b/Moonlight/App/Services/SubscriptionService.cs @@ -0,0 +1,140 @@ +using Microsoft.EntityFrameworkCore; +using Moonlight.App.Database.Entities; +using Moonlight.App.Exceptions; +using Moonlight.App.Models.Misc; +using Moonlight.App.Repositories; +using Moonlight.App.Services.Sessions; +using Newtonsoft.Json; + +namespace Moonlight.App.Services; + +public class SubscriptionService +{ + private readonly SubscriptionRepository SubscriptionRepository; + private readonly OneTimeJwtService OneTimeJwtService; + private readonly IdentityService IdentityService; + private readonly UserRepository UserRepository; + private readonly ConfigService ConfigService; + + public SubscriptionService( + SubscriptionRepository subscriptionRepository, + OneTimeJwtService oneTimeJwtService, + IdentityService identityService, + UserRepository userRepository, + ConfigService configService) + { + SubscriptionRepository = subscriptionRepository; + OneTimeJwtService = oneTimeJwtService; + IdentityService = identityService; + UserRepository = userRepository; + ConfigService = configService; + } + + public async Task GetCurrent() + { + var user = await GetCurrentUser(); + + if (user == null || user.CurrentSubscription == null) + return null; + + var subscriptionEnd = user.SubscriptionSince.ToUniversalTime().AddDays(user.SubscriptionDuration); + + if (subscriptionEnd > DateTime.UtcNow) + { + return user.CurrentSubscription; + } + + return null; + } + + public async Task ApplyCode(string code) + { + var data = await OneTimeJwtService.Validate(code); + + if (data == null) + throw new DisplayException("Invalid or expired subscription code"); + + var id = int.Parse(data["subscription"]); + var duration = int.Parse(data["duration"]); + + var subscription = SubscriptionRepository + .Get() + .FirstOrDefault(x => x.Id == id); + + if (subscription == null) + throw new DisplayException("The subscription the code is associated with does not exist"); + + var user = await GetCurrentUser(); + + if (user == null) + throw new DisplayException("Unable to determine current user"); + + user.CurrentSubscription = subscription; + user.SubscriptionDuration = duration; + user.SubscriptionSince = DateTime.UtcNow; + + UserRepository.Update(user); + + await OneTimeJwtService.Revoke(code); + } + + public async Task GetLimit(string identifier) + { + var configSection = ConfigService.GetSection("Moonlight").GetSection("Subscriptions"); + + var defaultLimits = configSection.GetValue("defaultLimits"); + + var subscription = await GetCurrent(); + + if (subscription == null) + { + var foundDefault = defaultLimits.FirstOrDefault(x => x.Identifier == identifier); + + if (foundDefault != null) + return foundDefault; + + return new() + { + Identifier = identifier, + Amount = 0 + }; + } + else + { + var subscriptionLimits = + JsonConvert.DeserializeObject(subscription.LimitsJson) + ?? Array.Empty(); + + var foundLimit = subscriptionLimits.FirstOrDefault(x => x.Identifier == identifier); + + if (foundLimit != null) + return foundLimit; + + var foundDefault = defaultLimits.FirstOrDefault(x => x.Identifier == identifier); + + if (foundDefault != null) + return foundDefault; + + return new() + { + Identifier = identifier, + Amount = 0 + }; + } + } + + private async Task GetCurrentUser() + { + var user = await IdentityService.Get(); + + if (user == null) + return null; + + var userWithData = UserRepository + .Get() + .Include(x => x.CurrentSubscription) + .First(x => x.Id == user.Id); + + return userWithData; + } +} \ No newline at end of file diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index e0584a8..d762971 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -62,6 +62,7 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -94,6 +95,9 @@ namespace Moonlight builder.Services.AddScoped(); builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddScoped(); + builder.Services.AddSingleton(); // Loggers diff --git a/Moonlight/Shared/Components/Forms/DeleteButton.razor b/Moonlight/Shared/Components/Forms/DeleteButton.razor new file mode 100644 index 0000000..4c37ec9 --- /dev/null +++ b/Moonlight/Shared/Components/Forms/DeleteButton.razor @@ -0,0 +1,57 @@ +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject SmartTranslateService SmartTranslateService +@inject AlertService AlertService + +@if (!Working) +{ + +} +else +{ + +} + +@code +{ + private bool Working { get; set; } = false; + + [Parameter] + public Func? OnClick { get; set; } + + [Parameter] + public bool Confirm { get; set; } = false; + + private async Task Do() + { + Working = true; + StateHasChanged(); + await Task.Run(async () => + { + if (Confirm) + { + var b = await AlertService.YesNo( + SmartTranslateService.Translate("Are you sure?"), + SmartTranslateService.Translate("Do you really want to delete it?"), + SmartTranslateService.Translate("Yes"), + SmartTranslateService.Translate("No") + ); + + if (b) + { + if(OnClick != null) + await OnClick.Invoke(); + } + + } + + Working = false; + await InvokeAsync(StateHasChanged); + }); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Forms/SmartForm.razor b/Moonlight/Shared/Components/Forms/SmartForm.razor index 0eb2300..9b3acd6 100644 --- a/Moonlight/Shared/Components/Forms/SmartForm.razor +++ b/Moonlight/Shared/Components/Forms/SmartForm.razor @@ -33,13 +33,13 @@ public object Model { get; set; } [Parameter] - public EventCallback OnValidSubmit { get; set; } + public Func? OnValidSubmit { get; set; } [Parameter] - public EventCallback OnInvalidSubmit { get; set; } + public Func? OnInvalidSubmit { get; set; } [Parameter] - public EventCallback OnSubmit { get; set; } + public Func? OnSubmit { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } @@ -67,8 +67,14 @@ await Task.Run(async () => { - await InvokeAsync(() => OnValidSubmit.InvokeAsync(context)); - await InvokeAsync(() => OnSubmit.InvokeAsync(context)); + await InvokeAsync(async () => + { + if (OnValidSubmit != null) + await OnValidSubmit.Invoke(); + + if (OnSubmit != null) + await OnSubmit.Invoke(); + }); Working = false; await InvokeAsync(StateHasChanged); @@ -87,7 +93,10 @@ await InvokeAsync(StateHasChanged); - await OnInvalidSubmit.InvokeAsync(context); - await OnSubmit.InvokeAsync(context); + if (OnInvalidSubmit != null) + await OnInvalidSubmit.Invoke(); + + if (OnSubmit != null) + await OnSubmit.Invoke(); } } \ No newline at end of file diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor index 5ce76e1..37dd7d6 100644 --- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor +++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor @@ -225,6 +225,14 @@ else Support
    +
    + + + + + Subscriptions + +
    diff --git a/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor b/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor new file mode 100644 index 0000000..83c2065 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor @@ -0,0 +1,72 @@ +@page "/admin/subscriptions/" +@using Moonlight.App.Services +@using Moonlight.App.Database.Entities +@using Moonlight.App.Repositories +@using BlazorTable + +@inject SmartTranslateService SmartTranslateService +@inject SubscriptionRepository SubscriptionRepository + + +
    + +
    +

    + + Subscriptions + +

    +
    + + + New subscription + +
    +
    +
    +
    +
    - + Go up @@ -58,20 +61,23 @@ {
    -
    - @{ - var toggle = ToggleStatusCache.ContainsKey(file) && ToggleStatusCache[file]; - } + @if (!HideSelect) + { +
    + @{ + var toggle = ToggleStatusCache.ContainsKey(file) && ToggleStatusCache[file]; + } - @if (toggle) - { - - } - else - { - - } -
    + @if (toggle) + { + + } + else + { + + } +
    + }
    @@ -92,17 +98,20 @@
    - - - + @if (ContextActions.Any()) + { + + + + }
    + + + + + + + + + + +
    +
    +
    + +
    + + +@code +{ + private Subscription[] Subscriptions; + private LazyLoader LazyLoader; + + private Task Load(LazyLoader arg) + { + Subscriptions = SubscriptionRepository + .Get() + .ToArray(); + + return Task.CompletedTask; + } + + private async Task Delete(Subscription subscription) + { + SubscriptionRepository.Delete(subscription); + + await LazyLoader.Reload(); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Subscriptions/New.razor b/Moonlight/Shared/Views/Admin/Subscriptions/New.razor new file mode 100644 index 0000000..dcc81a9 --- /dev/null +++ b/Moonlight/Shared/Views/Admin/Subscriptions/New.razor @@ -0,0 +1,137 @@ +@page "/admin/subscriptions/new" +@using Moonlight.App.Models.Forms +@using Moonlight.App.Models.Misc +@using Moonlight.App.Repositories +@using Moonlight.App.Services + +@inject NavigationManager NavigationManager +@inject SubscriptionRepository SubscriptionRepository +@inject SubscriptionAdminService SubscriptionAdminService + + +
    + + +
    + +
    + +
    + +
    + +
    + @foreach (var limitPart in Limits.Chunk(3)) + { +
    + @foreach (var limit in limitPart) + { +
    +
    + +
    + +
    + +
    + +
    +
    +
    + Options +
    +
    +
    +
    + + + + + + + + + + @foreach (var option in limit.Options) + { + + + + + + } + +
    + Key + + Value + + Remove +
    + + + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + } +
    + } +
    + +
    + + +
    +     +
    +     + +@code +{ + private SubscriptionDataModel Model = new(); + private List Limits = new(); + + private async Task OnSubmit() + { + var sub = SubscriptionRepository.Add(new() + { + Name = Model.Name, + Description = Model.Description + }); + + await SubscriptionAdminService.SaveLimits(sub, Limits.ToArray()); + + NavigationManager.NavigateTo("/admin/subscriptions"); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor index 81fd74d..030e4a3 100644 --- a/Moonlight/Shared/Views/Profile/Index.razor +++ b/Moonlight/Shared/Views/Profile/Index.razor @@ -87,8 +87,10 @@ User = await IdentityService.Get(); } - private void Save() + private Task Save() { UserRepository.Update(User); + + return Task.CompletedTask; } } diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 41f79bc..0cfc0d2 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -454,3 +454,11 @@ Finish activation;Finish activation New password;New password Secure your account;Secure your account 2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.;2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login. +New subscription;New subscription +You need to enter a name;You need to enter a name +You need to enter a description;You need to enter a description +Add new limit;Add new limit +Create subscription;Create subscription +Options;Options +Amount;Amount +Do you really want to delete it?;Do you really want to delete it? From b6ef64a766692bb026517ec464a70a0938445484 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 19:40:42 +0200 Subject: [PATCH 30/39] new audit log --- Moonlight/App/Models/Log/LogData.cs | 7 ++++ Moonlight/App/Services/DomainService.cs | 18 +++++++-- .../Services/LogServices/AuditLogService.cs | 26 +++++++++++- Moonlight/App/Services/ServerService.cs | 40 +++++++++++++++---- Moonlight/App/Services/TotpService.cs | 13 ++++-- Moonlight/App/Services/UserService.cs | 22 +++++++--- .../AuditLogEntryChangePassword.razor | 9 +++-- .../AuditLogEntryChangePowerState.razor | 11 ++--- .../AuditLogEntrys/AuditLogEntryLogin.razor | 9 +++-- .../AuditLogEntryRegister.razor | 9 +++-- Moonlight/Shared/Views/Profile/Security.razor | 6 +-- 11 files changed, 130 insertions(+), 40 deletions(-) create mode 100644 Moonlight/App/Models/Log/LogData.cs diff --git a/Moonlight/App/Models/Log/LogData.cs b/Moonlight/App/Models/Log/LogData.cs new file mode 100644 index 0000000..645a666 --- /dev/null +++ b/Moonlight/App/Models/Log/LogData.cs @@ -0,0 +1,7 @@ +namespace Moonlight.App.Models.Log; + +public class LogData +{ + public Type Type { get; set; } + public string Value { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Services/DomainService.cs b/Moonlight/App/Services/DomainService.cs index b2b2b1f..4bdbf9b 100644 --- a/Moonlight/App/Services/DomainService.cs +++ b/Moonlight/App/Services/DomainService.cs @@ -169,7 +169,11 @@ public class DomainService })); } - await AuditLogService.Log(AuditLogType.AddDomainRecord, new[] { d.Id.ToString(), dnsRecord.Name }); + await AuditLogService.Log(AuditLogType.AddDomainRecord, x => + { + x.Add(d.Id); + x.Add(dnsRecord.Name); + }); } public async Task UpdateDnsRecord(Domain d, DnsRecord dnsRecord) @@ -199,7 +203,11 @@ public class DomainService })); } - await AuditLogService.Log(AuditLogType.UpdateDomainRecord, new[] { d.Id.ToString(), dnsRecord.Name }); + await AuditLogService.Log(AuditLogType.UpdateDomainRecord, x => + { + x.Add(d.Id); + x.Add(dnsRecord.Name); + }); } public async Task DeleteDnsRecord(Domain d, DnsRecord dnsRecord) @@ -210,7 +218,11 @@ public class DomainService await Client.Zones.DnsRecords.DeleteAsync(domain.SharedDomain.CloudflareId, dnsRecord.Id) ); - await AuditLogService.Log(AuditLogType.DeleteDomainRecord, new[] { d.Id.ToString(), dnsRecord.Name }); + await AuditLogService.Log(AuditLogType.DeleteDomainRecord, x => + { + x.Add(d.Id); + x.Add(dnsRecord.Name); + }); } private Domain EnsureData(Domain domain) diff --git a/Moonlight/App/Services/LogServices/AuditLogService.cs b/Moonlight/App/Services/LogServices/AuditLogService.cs index 7e32f58..ac9c884 100644 --- a/Moonlight/App/Services/LogServices/AuditLogService.cs +++ b/Moonlight/App/Services/LogServices/AuditLogService.cs @@ -1,4 +1,5 @@ using Moonlight.App.Database.Entities.LogsEntries; +using Moonlight.App.Models.Log; using Moonlight.App.Models.Misc; using Moonlight.App.Repositories.LogEntries; using Moonlight.App.Services.Sessions; @@ -19,16 +20,18 @@ public class AuditLogService HttpContextAccessor = httpContextAccessor; } - public Task Log(AuditLogType type, params object[] data) + public Task Log(AuditLogType type, Action data) { var ip = GetIp(); + var al = new AuditLogParameters(); + data(al); var entry = new AuditLogEntry() { Ip = ip, Type = type, System = false, - JsonData = data.Length == 0 ? "" : JsonConvert.SerializeObject(data) + JsonData = al.Build() }; Repository.Add(entry); @@ -62,4 +65,23 @@ public class AuditLogService return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString(); } + + public class AuditLogParameters + { + private List Data = new List(); + + public void Add(object data) + { + Data.Add(new LogData() + { + Type = typeof(T), + Value = data.ToString() + }); + } + + internal string Build() + { + return JsonConvert.SerializeObject(Data); + } + } } \ No newline at end of file diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index 2f69fd7..84522e8 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -96,7 +96,11 @@ public class ServerService Action = rawSignal }); - await AuditLogService.Log(AuditLogType.ChangePowerState, new[] { server.Uuid.ToString(), rawSignal }); + await AuditLogService.Log(AuditLogType.ChangePowerState, x => + { + x.Add(server.Uuid); + x.Add(rawSignal); + }); } public async Task CreateBackup(Server server) @@ -126,7 +130,11 @@ public class ServerService }); await AuditLogService.Log(AuditLogType.CreateBackup, - new[] { serverData.Uuid.ToString(), backup.Uuid.ToString() }); + x => + { + x.Add(server.Uuid); + x.Add(backup.Uuid); + }); return backup; } @@ -164,7 +172,11 @@ public class ServerService }); await AuditLogService.Log(AuditLogType.RestoreBackup, - new[] { s.Uuid.ToString(), serverBackup.Uuid.ToString() }); + x => + { + x.Add(server.Uuid); + x.Add(serverBackup.Uuid); + }); } public async Task DeleteBackup(Server server, ServerBackup serverBackup) @@ -186,7 +198,11 @@ public class ServerService await MessageService.Emit("wings.backups.delete", backup); await AuditLogService.Log(AuditLogType.DeleteBackup, - new[] { serverBackup.Uuid.ToString(), serverBackup.Uuid.ToString() }); + x => + { + x.Add(server.Uuid); + x.Add(backup.Uuid); + }); } public async Task DownloadBackup(Server s, ServerBackup serverBackup) @@ -200,7 +216,11 @@ public class ServerService }); await AuditLogService.Log(AuditLogType.DownloadBackup, - new[] { serverBackup.Uuid.ToString(), serverBackup.Uuid.ToString() }); + x => + { + x.Add(server.Uuid); + x.Add(serverBackup.Uuid); + }); return $"https://{server.Node.Fqdn}:{server.Node.HttpPort}/download/backup?token={token}"; } @@ -305,7 +325,10 @@ public class ServerService StartOnCompletion = false }); - await AuditLogService.Log(AuditLogType.CreateServer, newServerData.Uuid.ToString()); + await AuditLogService.Log(AuditLogType.CreateServer, x => + { + x.Add(newServerData.Uuid); + }); return newServerData; } @@ -325,7 +348,10 @@ public class ServerService await WingsApiHelper.Post(server.Node, $"api/servers/{server.Uuid}/reinstall", null); - await AuditLogService.Log(AuditLogType.ReinstallServer, server.Uuid.ToString()); + await AuditLogService.Log(AuditLogType.ReinstallServer, x => + { + x.Add(server.Uuid); + }); } public async Task SftpServerLogin(int serverId, int id, string password) diff --git a/Moonlight/App/Services/TotpService.cs b/Moonlight/App/Services/TotpService.cs index 0e359fe..caffc7a 100644 --- a/Moonlight/App/Services/TotpService.cs +++ b/Moonlight/App/Services/TotpService.cs @@ -1,4 +1,5 @@ -using Moonlight.App.Models.Misc; +using Moonlight.App.Database.Entities; +using Moonlight.App.Models.Misc; using Moonlight.App.Repositories; using Moonlight.App.Services.LogServices; using Moonlight.App.Services.Sessions; @@ -51,7 +52,10 @@ public class TotpService UserRepository.Update(user); - await AuditLogService.Log(AuditLogType.EnableTotp, user.Email); + await AuditLogService.Log(AuditLogType.EnableTotp, x => + { + x.Add(user.Email); + }); } public async Task EnforceTotpLogin() @@ -70,7 +74,10 @@ public class TotpService UserRepository.Update(user); - await AuditLogService.Log(AuditLogType.DisableTotp, user.Email); + await AuditLogService.Log(AuditLogType.DisableTotp,x => + { + x.Add(user.Email); + }); } private string GenerateSecret() diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs index 2cf233e..c70ae8e 100644 --- a/Moonlight/App/Services/UserService.cs +++ b/Moonlight/App/Services/UserService.cs @@ -77,7 +77,10 @@ public class UserService }); await MailService.SendMail(user!, "register", values => {}); - await AuditLogService.Log(AuditLogType.Register, user.Email); + await AuditLogService.Log(AuditLogType.Register, x => + { + x.Add(user.Email); + }); return await GenerateToken(user); } @@ -125,7 +128,10 @@ public class UserService if (totpCodeValid) { - await AuditLogService.Log(AuditLogType.Login, email); + await AuditLogService.Log(AuditLogType.Login, x => + { + x.Add(email); + }); return await GenerateToken(user, true); } else @@ -136,7 +142,10 @@ public class UserService } else { - await AuditLogService.Log(AuditLogType.Login, email); + await AuditLogService.Log(AuditLogType.Login, x => + { + x.Add(email); + }); return await GenerateToken(user!, true); } } @@ -160,7 +169,10 @@ public class UserService values.Add("Location", "In your walls"); }); - await AuditLogService.Log(AuditLogType.ChangePassword, user.Email); + await AuditLogService.Log(AuditLogType.ChangePassword, x => + { + x.Add(user.Email); + }); } } @@ -218,7 +230,7 @@ public class UserService var newPassword = StringHelper.GenerateString(16); await ChangePassword(user, newPassword, true); - await AuditLogService.Log(AuditLogType.PasswordReset); + await AuditLogService.Log(AuditLogType.PasswordReset, x => {}); await MailService.SendMail(user, "passwordReset", values => { diff --git a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePassword.razor b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePassword.razor index b3ffcd8..f9ee3ac 100644 --- a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePassword.razor +++ b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePassword.razor @@ -3,6 +3,7 @@ @using Moonlight.App.Repositories @using Newtonsoft.Json @using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Log @inject UserRepository UserRepository @@ -18,7 +19,7 @@
    @if (User == null) { - Password change for @(Data[0]) + Password change for @(Data[0].Value) } else { @@ -38,18 +39,18 @@ public AuditLogEntry Entry { get; set; } private User? User; - private string[] Data; + private LogData[] Data; protected override void OnInitialized() { - Data = JsonConvert.DeserializeObject(Entry.JsonData)!; + Data = JsonConvert.DeserializeObject(Entry.JsonData)!; } protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { - User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0]); + User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0].Value); await InvokeAsync(StateHasChanged); } diff --git a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePowerState.razor b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePowerState.razor index 9540015..9dcafe0 100644 --- a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePowerState.razor +++ b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryChangePowerState.razor @@ -2,6 +2,7 @@ @using Moonlight.App.Helpers @using Newtonsoft.Json @using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Log @using Moonlight.App.Repositories.Servers @inject ServerRepository ServerRepository @@ -18,11 +19,11 @@
    @if (Server == null) { - Change power state for @(Data[0]) to @(Data[1]) + Change power state for @(Data[0].Value) to @(Data[1].Value) } else { - Change power state for @(Server.Name) to @(Data[1]) + Change power state for @(Server.Name) to @(Data[1].Value) }
    @@ -38,18 +39,18 @@ public AuditLogEntry Entry { get; set; } private Server? Server; - private string[] Data; + private LogData[] Data; protected override void OnInitialized() { - Data = JsonConvert.DeserializeObject(Entry.JsonData)!; + Data = JsonConvert.DeserializeObject(Entry.JsonData)!; } protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { - Server = ServerRepository.Get().FirstOrDefault(x => x.Uuid == Guid.Parse(Data[0])); + Server = ServerRepository.Get().FirstOrDefault(x => x.Uuid == Guid.Parse(Data[0].Value)); await InvokeAsync(StateHasChanged); } diff --git a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryLogin.razor b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryLogin.razor index c215f4d..810a356 100644 --- a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryLogin.razor +++ b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryLogin.razor @@ -3,6 +3,7 @@ @using Moonlight.App.Repositories @using Newtonsoft.Json @using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Log @inject UserRepository UserRepository @@ -18,7 +19,7 @@
    @if (User == null) { - New login for @(Data[0]) + New login for @(Data[0].Value) } else { @@ -38,18 +39,18 @@ public AuditLogEntry Entry { get; set; } private User? User; - private string[] Data; + private LogData[] Data; protected override void OnInitialized() { - Data = JsonConvert.DeserializeObject(Entry.JsonData)!; + Data = JsonConvert.DeserializeObject(Entry.JsonData)!; } protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { - User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0]); + User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0].Value); await InvokeAsync(StateHasChanged); } diff --git a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryRegister.razor b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryRegister.razor index 43cc89a..846f0d8 100644 --- a/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryRegister.razor +++ b/Moonlight/Shared/Components/AuditLogEntrys/AuditLogEntryRegister.razor @@ -3,6 +3,7 @@ @using Moonlight.App.Repositories @using Newtonsoft.Json @using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Log @inject UserRepository UserRepository @@ -18,7 +19,7 @@
    @if (User == null) { - Register for @(Data[0]) + Register for @(Data[0].Value) } else { @@ -38,18 +39,18 @@ public AuditLogEntry Entry { get; set; } private User? User; - private string[] Data; + private LogData[] Data; protected override void OnInitialized() { - Data = JsonConvert.DeserializeObject(Entry.JsonData)!; + Data = JsonConvert.DeserializeObject(Entry.JsonData)!; } protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { - User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0]); + User = UserRepository.Get().FirstOrDefault(x => x.Email == Data[0].Value); await InvokeAsync(StateHasChanged); } diff --git a/Moonlight/Shared/Views/Profile/Security.razor b/Moonlight/Shared/Views/Profile/Security.razor index e648de9..db0bf9f 100644 --- a/Moonlight/Shared/Views/Profile/Security.razor +++ b/Moonlight/Shared/Views/Profile/Security.razor @@ -236,7 +236,7 @@ private async void Enable() { - await AuditLogService.Log(AuditLogType.EnableTotp, "Totp enabled"); + await AuditLogService.Log(AuditLogType.EnableTotp, x => x.Add("Totp enabled")); await TotpService.Enable(); TotpEnabled = await TotpService.GetEnabled(); TotpSecret = await TotpService.GetSecret(); @@ -262,7 +262,7 @@ private async void Disable() { - await AuditLogService.Log(AuditLogType.DisableTotp, "Totp disabled"); + await AuditLogService.Log(AuditLogType.DisableTotp, x => x.Add("Totp disabled")); await TotpService.Disable(); NavigationManager.NavigateTo(NavigationManager.Uri, true); } @@ -286,7 +286,7 @@ { await UserService.ChangePassword(User, Password); - await AuditLogService.Log(AuditLogType.PasswordChange, "The password has been set to a new one"); + await AuditLogService.Log(AuditLogType.PasswordChange, x => x.Add("The password has been set to a new one")); // Reload to make the user login again NavigationManager.NavigateTo(NavigationManager.Uri, true); From 5b807a667d6c4fcb9afe35d63b885f39305c4083 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 19:51:29 +0200 Subject: [PATCH 31/39] error log --- .../Services/LogServices/ErrorLogService.cs | 33 ++++++++++++++++--- Moonlight/App/Services/ServerService.cs | 6 +++- .../App/Services/Sessions/IdentityService.cs | 4 +-- .../ComponentErrorBoundary.razor | 2 +- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/Moonlight/App/Services/LogServices/ErrorLogService.cs b/Moonlight/App/Services/LogServices/ErrorLogService.cs index 6c41945..4328c95 100644 --- a/Moonlight/App/Services/LogServices/ErrorLogService.cs +++ b/Moonlight/App/Services/LogServices/ErrorLogService.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.Reflection; using Moonlight.App.Database.Entities.LogsEntries; +using Moonlight.App.Models.Log; using Moonlight.App.Repositories.LogEntries; using Moonlight.App.Services.Sessions; using Newtonsoft.Json; @@ -18,15 +19,17 @@ public class ErrorLogService HttpContextAccessor = httpContextAccessor; } - public Task Log(Exception exception, params object[] objects) + public Task Log(Exception exception, Action data) { var ip = GetIp(); + var al = new ErrorLogParameters(); + data(al); var entry = new ErrorLogEntry() { Ip = ip, System = false, - JsonData = !objects.Any() ? "" : JsonConvert.SerializeObject(objects), + JsonData = al.Build(), Class = NameOfCallingClass(), Stacktrace = exception.ToStringDemystified() }; @@ -36,12 +39,15 @@ public class ErrorLogService return Task.CompletedTask; } - public Task LogSystem(Exception exception, params object[] objects) + public Task LogSystem(Exception exception, Action data) { + var al = new ErrorLogParameters(); + data(al); + var entry = new ErrorLogEntry() { System = true, - JsonData = !objects.Any() ? "" : JsonConvert.SerializeObject(objects), + JsonData = al.Build(), Class = NameOfCallingClass(), Stacktrace = exception.ToStringDemystified() }; @@ -87,4 +93,23 @@ public class ErrorLogService return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString(); } + + public class ErrorLogParameters + { + private List Data = new List(); + + public void Add(object data) + { + Data.Add(new LogData() + { + Type = typeof(T), + Value = data.ToString() + }); + } + + internal string Build() + { + return JsonConvert.SerializeObject(Data); + } + } } \ No newline at end of file diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index 84522e8..71c3778 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -334,7 +334,11 @@ public class ServerService } catch (Exception e) { - await ErrorLogService.Log(e, new[] { newServerData.Uuid.ToString(), node.Id.ToString() }); + await ErrorLogService.Log(e, x => + { + x.Add(newServerData.Uuid); + x.Add(node.Id); + }); ServerRepository.Delete(newServerData); diff --git a/Moonlight/App/Services/Sessions/IdentityService.cs b/Moonlight/App/Services/Sessions/IdentityService.cs index bce9382..eaeac7b 100644 --- a/Moonlight/App/Services/Sessions/IdentityService.cs +++ b/Moonlight/App/Services/Sessions/IdentityService.cs @@ -94,7 +94,7 @@ public class IdentityService } catch (Exception e) { - await ErrorLogService.Log(e); + await ErrorLogService.Log(e, x => {}); return null; } @@ -130,7 +130,7 @@ public class IdentityService } catch (Exception e) { - await ErrorLogService.Log(e); + await ErrorLogService.Log(e, x => {}); return null; } } diff --git a/Moonlight/Shared/Components/ErrorBoundaries/ComponentErrorBoundary.razor b/Moonlight/Shared/Components/ErrorBoundaries/ComponentErrorBoundary.razor index d8f29c9..c540c4c 100644 --- a/Moonlight/Shared/Components/ErrorBoundaries/ComponentErrorBoundary.razor +++ b/Moonlight/Shared/Components/ErrorBoundaries/ComponentErrorBoundary.razor @@ -53,7 +53,7 @@ else { receivedExceptions.Add(exception); - await ErrorLogService.Log(exception); + await ErrorLogService.Log(exception, x => {}); await base.OnErrorAsync(exception); } From e80af275f7d0e96874b79d845c99f4d8dbefafa0 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 19:55:11 +0200 Subject: [PATCH 32/39] audit log (I forgot) --- Moonlight/App/Services/LogServices/AuditLogService.cs | 7 +++++-- Moonlight/App/Services/UserService.cs | 10 ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Moonlight/App/Services/LogServices/AuditLogService.cs b/Moonlight/App/Services/LogServices/AuditLogService.cs index ac9c884..4b0fdf8 100644 --- a/Moonlight/App/Services/LogServices/AuditLogService.cs +++ b/Moonlight/App/Services/LogServices/AuditLogService.cs @@ -39,13 +39,16 @@ public class AuditLogService return Task.CompletedTask; } - public Task LogSystem(AuditLogType type, params object[] data) + public Task LogSystem(AuditLogType type, Action data) { + var al = new AuditLogParameters(); + data(al); + var entry = new AuditLogEntry() { Type = type, System = true, - JsonData = data.Length == 0 ? "" : JsonConvert.SerializeObject(data) + JsonData = al.Build() }; Repository.Add(entry); diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs index c70ae8e..d26be75 100644 --- a/Moonlight/App/Services/UserService.cs +++ b/Moonlight/App/Services/UserService.cs @@ -158,7 +158,10 @@ public class UserService if (isSystemAction) { - await AuditLogService.LogSystem(AuditLogType.ChangePassword, user.Email); + await AuditLogService.LogSystem(AuditLogType.ChangePassword, x=> + { + x.Add(user.Email); + }); } else { @@ -188,7 +191,10 @@ public class UserService if (BCrypt.Net.BCrypt.Verify(password, user.Password)) { - await AuditLogService.LogSystem(AuditLogType.Login, user.Email); + await AuditLogService.LogSystem(AuditLogType.Login, x => + { + x.Add(user.Email); + }); return user; } From c7a31d6e05f2e46333696290244e1aae6bcd7a8c Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 20:06:06 +0200 Subject: [PATCH 33/39] security log --- .../Api/Moonlight/ResourcesController.cs | 5 ++- .../LogServices/SecurityLogService.cs | 34 ++++++++++++++++--- Moonlight/App/Services/OneTimeJwtService.cs | 5 ++- Moonlight/App/Services/ServerService.cs | 5 ++- .../App/Services/Sessions/IdentityService.cs | 5 ++- Moonlight/App/Services/UserService.cs | 29 +++++++++++++--- 6 files changed, 70 insertions(+), 13 deletions(-) diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs index a02762c..52750c4 100644 --- a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs +++ b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs @@ -21,7 +21,10 @@ public class ResourcesController : Controller { if (name.Contains("..")) { - await SecurityLogService.Log(SecurityLogType.PathTransversal, name); + await SecurityLogService.Log(SecurityLogType.PathTransversal, x => + { + x.Add(name); + }); return NotFound(); } diff --git a/Moonlight/App/Services/LogServices/SecurityLogService.cs b/Moonlight/App/Services/LogServices/SecurityLogService.cs index d276a2b..f58fa19 100644 --- a/Moonlight/App/Services/LogServices/SecurityLogService.cs +++ b/Moonlight/App/Services/LogServices/SecurityLogService.cs @@ -1,4 +1,5 @@ using Moonlight.App.Database.Entities.LogsEntries; +using Moonlight.App.Models.Log; using Moonlight.App.Models.Misc; using Moonlight.App.Repositories.LogEntries; using Moonlight.App.Services.Sessions; @@ -17,16 +18,18 @@ public class SecurityLogService HttpContextAccessor = httpContextAccessor; } - public Task Log(SecurityLogType type, params object[] data) + public Task Log(SecurityLogType type, Action data) { var ip = GetIp(); + var al = new SecurityLogParameters(); + data(al); var entry = new SecurityLogEntry() { Ip = ip, Type = type, System = false, - JsonData = data.Length == 0 ? "" : JsonConvert.SerializeObject(data) + JsonData = al.Build() }; Repository.Add(entry); @@ -34,13 +37,16 @@ public class SecurityLogService return Task.CompletedTask; } - public Task LogSystem(SecurityLogType type, params object[] data) + public Task LogSystem(SecurityLogType type, Action data) { + var al = new SecurityLogParameters(); + data(al); + var entry = new SecurityLogEntry() { Type = type, System = true, - JsonData = data.Length == 0 ? "" : JsonConvert.SerializeObject(data) + JsonData = al.Build() }; Repository.Add(entry); @@ -60,4 +66,24 @@ public class SecurityLogService return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString(); } + + + public class SecurityLogParameters + { + private List Data = new List(); + + public void Add(object data) + { + Data.Add(new LogData() + { + Type = typeof(T), + Value = data.ToString() + }); + } + + internal string Build() + { + return JsonConvert.SerializeObject(Data); + } + } } \ No newline at end of file diff --git a/Moonlight/App/Services/OneTimeJwtService.cs b/Moonlight/App/Services/OneTimeJwtService.cs index 871a1b0..0f70d59 100644 --- a/Moonlight/App/Services/OneTimeJwtService.cs +++ b/Moonlight/App/Services/OneTimeJwtService.cs @@ -76,7 +76,10 @@ public class OneTimeJwtService } catch (SignatureVerificationException) { - await SecurityLogService.LogSystem(SecurityLogType.ManipulatedJwt, token); + await SecurityLogService.LogSystem(SecurityLogType.ManipulatedJwt, x => + { + x.Add(token); + }); return null; } catch (Exception e) diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index 71c3778..7969bd7 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -364,7 +364,10 @@ public class ServerService if (server == null) { - await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, serverId); + await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x => + { + x.Add(id); + }); throw new Exception("Server not found"); } diff --git a/Moonlight/App/Services/Sessions/IdentityService.cs b/Moonlight/App/Services/Sessions/IdentityService.cs index eaeac7b..f35519e 100644 --- a/Moonlight/App/Services/Sessions/IdentityService.cs +++ b/Moonlight/App/Services/Sessions/IdentityService.cs @@ -89,7 +89,10 @@ public class IdentityService } catch (SignatureVerificationException) { - await SecurityLogService.Log(SecurityLogType.ManipulatedJwt, token); + await SecurityLogService.Log(SecurityLogType.ManipulatedJwt, x => + { + x.Add(token); + }); return null; } catch (Exception e) diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs index d26be75..60ec0a9 100644 --- a/Moonlight/App/Services/UserService.cs +++ b/Moonlight/App/Services/UserService.cs @@ -94,7 +94,11 @@ public class UserService if (user == null) { - await SecurityLogService.Log(SecurityLogType.LoginFail, new[] { email, password }); + await SecurityLogService.Log(SecurityLogType.LoginFail, x => + { + x.Add(email); + x.Add(password); + }); throw new DisplayException("Email and password combination not found"); } @@ -103,7 +107,11 @@ public class UserService return user.TotpEnabled; } - await SecurityLogService.Log(SecurityLogType.LoginFail, new[] { email, password }); + await SecurityLogService.Log(SecurityLogType.LoginFail, x => + { + x.Add(email); + x.Add(password); + }); throw new DisplayException("Email and password combination not found");; } @@ -136,7 +144,11 @@ public class UserService } else { - await SecurityLogService.Log(SecurityLogType.LoginFail, new[] { email, password }); + await SecurityLogService.Log(SecurityLogType.LoginFail, x => + { + x.Add(email); + x.Add(password); + }); throw new DisplayException("2FA code invalid"); } } @@ -185,7 +197,10 @@ public class UserService if (user == null) { - await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, id); + await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x => + { + x.Add(id); + }); throw new Exception("Invalid username"); } @@ -198,7 +213,11 @@ public class UserService return user; } - await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, new[] { id.ToString(), password }); + await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x => + { + x.Add(id); + x.Add(password); + }); throw new Exception("Invalid userid or password"); } From 5d8796299c005d947466b125a6eef567a7997548 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:07:55 +0200 Subject: [PATCH 34/39] force password change after login --- Moonlight/App/Models/Forms/PasswordModel.cs | 10 +++ Moonlight/App/Models/Misc/UserStatus.cs | 3 +- .../Components/Auth/PasswordChangeView.razor | 64 +++++++++++++++++++ Moonlight/Shared/Layouts/MainLayout.razor | 4 ++ Moonlight/resources/lang/de_de.lang | 2 + Moonlight/resources/mail/passwordChange.html | 53 +++++++++++++++ 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 Moonlight/App/Models/Forms/PasswordModel.cs create mode 100644 Moonlight/Shared/Components/Auth/PasswordChangeView.razor create mode 100644 Moonlight/resources/mail/passwordChange.html diff --git a/Moonlight/App/Models/Forms/PasswordModel.cs b/Moonlight/App/Models/Forms/PasswordModel.cs new file mode 100644 index 0000000..237f6a4 --- /dev/null +++ b/Moonlight/App/Models/Forms/PasswordModel.cs @@ -0,0 +1,10 @@ +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Models.Forms; + +public class PasswordModel +{ + [Required(ErrorMessage = "You need to enter a password")] + [MinLength(8, ErrorMessage = "You need to enter a password with minimum 8 characters in lenght")] + public string Password { get; set; } +} \ No newline at end of file diff --git a/Moonlight/App/Models/Misc/UserStatus.cs b/Moonlight/App/Models/Misc/UserStatus.cs index 22bf70c..a270ead 100644 --- a/Moonlight/App/Models/Misc/UserStatus.cs +++ b/Moonlight/App/Models/Misc/UserStatus.cs @@ -9,5 +9,6 @@ public enum UserStatus Warned, Banned, Disabled, - DataPending + DataPending, + PasswordPending } \ No newline at end of file diff --git a/Moonlight/Shared/Components/Auth/PasswordChangeView.razor b/Moonlight/Shared/Components/Auth/PasswordChangeView.razor new file mode 100644 index 0000000..f57d1aa --- /dev/null +++ b/Moonlight/Shared/Components/Auth/PasswordChangeView.razor @@ -0,0 +1,64 @@ +@using Moonlight.App.Services +@using Moonlight.App.Models.Forms +@using Moonlight.App.Services.Sessions +@using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Misc +@using Moonlight.App.Repositories + +@inject SmartTranslateService SmartTranslateService +@inject IdentityService IdentityService +@inject UserService UserService +@inject UserRepository UserRepository +@inject NavigationManager NavigationManager + +
    +
    +
    +
    + + +
    +

    + Change your password +

    +
    + You need to change your password in order to use moonlight +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +     +     +
    +
    +
    +
    + +@code { + private PasswordModel Password = new(); + private User User; + + private async Task Load(LazyLoader loader) + { + User = await IdentityService.Get(); + } + + private async Task DoChange() + { + await UserService.ChangePassword(User, Password.Password); + User.Status = UserStatus.Unverified; + UserRepository.Update(User); + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Layouts/MainLayout.razor b/Moonlight/Shared/Layouts/MainLayout.razor index b2de036..1c2303a 100644 --- a/Moonlight/Shared/Layouts/MainLayout.razor +++ b/Moonlight/Shared/Layouts/MainLayout.razor @@ -79,6 +79,10 @@ { } + else if (User.Status == UserStatus.PasswordPending) + { + + } else { @Body diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index 0cfc0d2..c7b639d 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -462,3 +462,5 @@ Create subscription;Create subscription Options;Options Amount;Amount Do you really want to delete it?;Do you really want to delete it? +Change your password;Change your password +You need to change your password in order to use moonlight;You need to change your password in order to use moonlight diff --git a/Moonlight/resources/mail/passwordChange.html b/Moonlight/resources/mail/passwordChange.html new file mode 100644 index 0000000..ae3e5a1 --- /dev/null +++ b/Moonlight/resources/mail/passwordChange.html @@ -0,0 +1,53 @@ + + + + + Moonlight password change + + +
    + + + + + + + + + + + + +
    +
    +
    + + Logo + +
    +
    +

    Hey {{FirstName}}, your password has been changed

    +

    If this was not you please contact us. Also here is the data we collected.

    +

    IP: {{Ip}}

    +

    Device: {{Device}}

    +

    Location: {{Location}}

    +
    + Open Moonlight + +
    +
    +

    You need help?

    +

    We are happy to help!

    +

    More information at + endelon.link/support. +

    +
    +

    Copyright 2023 Endelon Hosting

    +
    +
    + + \ No newline at end of file From 49e75c5a8d9f36fd263e86a5e2f45d15e02f69e6 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:22:54 +0200 Subject: [PATCH 35/39] require name before use (--> user status 7) --- Moonlight/App/Models/Forms/NameModel.cs | 14 ++++ .../Components/Auth/UserDataSetView.razor | 67 +++++++++++++++++++ Moonlight/Shared/Layouts/MainLayout.razor | 4 ++ Moonlight/resources/lang/de_de.lang | 3 + 4 files changed, 88 insertions(+) create mode 100644 Moonlight/App/Models/Forms/NameModel.cs create mode 100644 Moonlight/Shared/Components/Auth/UserDataSetView.razor diff --git a/Moonlight/App/Models/Forms/NameModel.cs b/Moonlight/App/Models/Forms/NameModel.cs new file mode 100644 index 0000000..17d832a --- /dev/null +++ b/Moonlight/App/Models/Forms/NameModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace Moonlight.App.Models.Forms; + +public class NameModel +{ + [Required] + [MinLength(2, ErrorMessage = "Do you think, that works?")] + public string FirstName { get; set; } + + [Required] + [MinLength(2, ErrorMessage = "Do you think, that works?")] + public string LastName { get; set; } +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Auth/UserDataSetView.razor b/Moonlight/Shared/Components/Auth/UserDataSetView.razor new file mode 100644 index 0000000..d1191ec --- /dev/null +++ b/Moonlight/Shared/Components/Auth/UserDataSetView.razor @@ -0,0 +1,67 @@ +@using Microsoft.AspNetCore.Components +@using Moonlight.App.Database.Entities +@using Moonlight.App.Models.Forms +@using Moonlight.App.Models.Misc +@using Moonlight.App.Repositories +@using Moonlight.App.Services +@using Moonlight.App.Services.Sessions + +@inject IdentityService IdentityService +@inject UserRepository UserRepository +@inject SmartTranslateService SmartTranslateService +@inject NavigationManager NavigationManager + +
    +
    +
    +
    + + +
    +

    + Enter your information +

    +
    + You need to enter your full name in order to use moonlight +
    +
    + +
    +
    + +
    + +
    + +
    +
    + + +     +     +
    +
    +
    +
    + +@code { + private User User; + private NameModel Name = new (); + + private async Task Load(LazyLoader loader) + { + User = await IdentityService.Get(); + } + + private async Task SetName() + { + User.FirstName = Name.FirstName; + User.LastName = Name.LastName; + User.Status = UserStatus.Unverified; + + UserRepository.Update(User); + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } +} \ No newline at end of file diff --git a/Moonlight/Shared/Layouts/MainLayout.razor b/Moonlight/Shared/Layouts/MainLayout.razor index 1c2303a..5345b49 100644 --- a/Moonlight/Shared/Layouts/MainLayout.razor +++ b/Moonlight/Shared/Layouts/MainLayout.razor @@ -83,6 +83,10 @@ { } + else if (User.Status == UserStatus.DataPending) + { + + } else { @Body diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang index c7b639d..02ca6ef 100644 --- a/Moonlight/resources/lang/de_de.lang +++ b/Moonlight/resources/lang/de_de.lang @@ -464,3 +464,6 @@ Amount;Amount Do you really want to delete it?;Do you really want to delete it? Change your password;Change your password You need to change your password in order to use moonlight;You need to change your password in order to use moonlight +You need to enter your full name in order to use moonlight;You need to enter your full name in order to use moonlight +Enter your information;Enter your information +The field FirstName must be a string or array type with a minimum length of '2'.;The field FirstName must be a string or array type with a minimum length of '2'. From bed1c3df05e2c20937c46eef008c482270d33634 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:39:26 +0200 Subject: [PATCH 36/39] Update Index.razor --- Moonlight/Shared/Views/Profile/Index.razor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor index 030e4a3..b939450 100644 --- a/Moonlight/Shared/Views/Profile/Index.razor +++ b/Moonlight/Shared/Views/Profile/Index.razor @@ -15,7 +15,9 @@
    -

    Persönliche Daten

    +

    + Personal information +

    From a056e454fab34deaef958b08cf9736502b5f61e3 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Mon, 3 Apr 2023 23:52:03 +0200 Subject: [PATCH 37/39] typing indicator resize --- Moonlight/Shared/Views/Support.razor | 6 +++--- Moonlight/wwwroot/assets/css/utils.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor index e674e42..994bc46 100644 --- a/Moonlight/Shared/Views/Support.razor +++ b/Moonlight/Shared/Views/Support.razor @@ -105,9 +105,9 @@ {
    -
    -
    -
    +
    +
    +
    @if (typingUsers.Length > 1) { diff --git a/Moonlight/wwwroot/assets/css/utils.css b/Moonlight/wwwroot/assets/css/utils.css index 872fe2c..3477750 100644 --- a/Moonlight/wwwroot/assets/css/utils.css +++ b/Moonlight/wwwroot/assets/css/utils.css @@ -39,6 +39,6 @@ div.wave .dot:nth-child(3) { transform: initial; } 30% { - transform: translateY(-15px); + transform: translateY(-8px); } } \ No newline at end of file From 7f10c7576991946f785689bae7c29e7b47e7d3a9 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Tue, 4 Apr 2023 00:43:26 +0200 Subject: [PATCH 38/39] new support chat layout --- .../Shared/Views/Admin/Support/View.razor | 78 ++++++++++--------- Moonlight/Shared/Views/Support.razor | 38 +++++---- 2 files changed, 64 insertions(+), 52 deletions(-) diff --git a/Moonlight/Shared/Views/Admin/Support/View.razor b/Moonlight/Shared/Views/Admin/Support/View.razor index fcf77c6..3921a68 100644 --- a/Moonlight/Shared/Views/Admin/Support/View.razor +++ b/Moonlight/Shared/Views/Admin/Support/View.razor @@ -22,11 +22,11 @@ {
    -
    +
    -
    +
    @foreach (var message in Messages) { if (message.IsSystem || message.IsSupport) @@ -99,10 +99,10 @@ @if (typingUsers.Any()) { -
    -
    -
    -
    +
    +
    +
    +
    @if (typingUsers.Length > 1) { @@ -118,52 +118,56 @@ } } - +
    -
    - -
    - - + + + + + + +
    + + + + + + +
    -
    -

    +
    +

    User information

    -
    - - Firstname: @(User.FirstName) - +
    + + Name: @(User.FirstName) @User.LastName +
    -
    - - Lastname: @(User.LastName) - +
    + + Email: @(User.Email) +
    -
    - - Email: @(User.Email) - -
    -
    - +
    + - +
    diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor index 994bc46..6a57312 100644 --- a/Moonlight/Shared/Views/Support.razor +++ b/Moonlight/Shared/Views/Support.razor @@ -13,7 +13,7 @@
    -
    +
    @foreach (var message in Messages) { if (message.IsSystem || message.IsSupport) @@ -21,7 +21,7 @@
    -
    +
    Logo
    @@ -104,7 +104,7 @@ @if (typingUsers.Any()) { -
    +
    @@ -120,19 +120,27 @@ } -
    -
    - -
    - - + + + + + + +
    + + + + + + +
    From f5e98bf774b4a4046b07d353f38f0ca232c48890 Mon Sep 17 00:00:00 2001 From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:07:19 +0200 Subject: [PATCH 39/39] removed upload button | changed overview layout --- .../Shared/Views/Admin/Support/Index.razor | 101 +++++++----------- .../Shared/Views/Admin/Support/View.razor | 4 +- Moonlight/Shared/Views/Support.razor | 4 +- 3 files changed, 42 insertions(+), 67 deletions(-) diff --git a/Moonlight/Shared/Views/Admin/Support/Index.razor b/Moonlight/Shared/Views/Admin/Support/Index.razor index 7e1d8b1..355a863 100644 --- a/Moonlight/Shared/Views/Admin/Support/Index.razor +++ b/Moonlight/Shared/Views/Admin/Support/Index.razor @@ -14,45 +14,53 @@
    -
    +
    -

    +

    Open tickets

    -
    +
    +
    @if (Users.Any()) { foreach (var user in Users) { -
    - - - - -
    -
    - - @(user.FirstName) @(user.LastName) - -
    - - - @{ - var lastMessage = MessageCache.ContainsKey(user) ? MessageCache[user] : null; - } - - @if (lastMessage == null) - { - No message sent yet - } - else - { - @(lastMessage.Message) - } - -
    +
    + + + + + + + + +
    + + + + + + @(user.FirstName) @(user.LastName) + +
    + + @{ + var lastMessage = MessageCache.ContainsKey(user) ? MessageCache[user] : null; + } + + @if (lastMessage == null) + { + No message sent yet + } + else + { + @(lastMessage.Message) + } + +
    +
    } } else @@ -64,39 +72,6 @@
    - -
    - -
    -

    - Actions -

    - -
    - - - - - -
    -
    Project Briefing
    - - -
    - - Check out our - - - - Support Policy - -
    - -
    - -
    -
    -
    diff --git a/Moonlight/Shared/Views/Admin/Support/View.razor b/Moonlight/Shared/Views/Admin/Support/View.razor index 3921a68..d114d93 100644 --- a/Moonlight/Shared/Views/Admin/Support/View.razor +++ b/Moonlight/Shared/Views/Admin/Support/View.razor @@ -122,11 +122,11 @@
    -
    + diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor index 6a57312..9ef48cf 100644 --- a/Moonlight/Shared/Views/Support.razor +++ b/Moonlight/Shared/Views/Support.razor @@ -123,11 +123,11 @@
    -
    +