chylex/Minecraft-Phantom-Panel
1
0
Fork 0
mirror of https://github.com/chylex/Minecraft-Phantom-Panel.git synced 2025-05-05 12:34:06 +02:00
Code

Update namespaces in Controller and Web projects

Browse Source
This commit is contained in:
chylex 2023-10-09 16:43:20 +02:00
parent 2c623cbd9a
commit 3a17eee8d0
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
155 changed files with 397 additions and 434 deletions
Controller
Phantom.Controller.Database.Postgres
ApplicationDbContextDesignFactory.cs
Migrations
20221007033307_Agents.Designer.cs20221007033307_Agents.cs20221007095438_Instances.Designer.cs20221007095438_Instances.cs20221008163849_Identity.Designer.cs20221008163849_Identity.cs20221010193220_InstanceJvmArguments.Designer.cs20221010193220_InstanceJvmArguments.cs20221016035515_AuditLog.Designer.cs20221016035515_AuditLog.cs20221018231328_AgentVersion.Designer.cs20221018231328_AgentVersion.cs20221021125232_Permissions.Designer.cs20221021125232_Permissions.cs20230213040522_AuditLogRename.Designer.cs20230213040522_AuditLogRename.cs20230215101444_EventLog.Designer.cs20230215101444_EventLog.cs20231008122637_ReplaceIdentity.Designer.cs20231008122637_ReplaceIdentity.cs20231008123315_ReplaceIdentity2.Designer.cs20231008123315_ReplaceIdentity2.csApplicationDbContextModelSnapshot.cs
Phantom.Controller.Database.Postgres.csproj
Phantom.Controller.Database
ApplicationDbContext.cs
Converters
RamAllocationUnitsConverter.cs
DatabaseProvider.cs
Entities
AgentEntity.csAuditLogEntity.csEventLogEntity.csInstanceEntity.csPermissionEntity.csRoleEntity.csRolePermissionEntity.csUserEntity.csUserPermissionEntity.csUserRoleEntity.cs
Enums
AuditLogEventType.csAuditLogSubjectType.csEventLogEventType.csEventLogSubjectType.cs
Factories
AbstractUpsertHelper.csAgentEntityUpsert.csInstanceEntityUpsert.cs
Phantom.Controller.Database.csproj
Phantom.Controller.Minecraft
JvmArgumentsHelper.csMinecraftVersionApi.csMinecraftVersions.csPhantom.Controller.Minecraft.csproj
Phantom.Controller.Rpc
Phantom.Controller.Rpc.csprojRpcClientConnection.csRpcClientConnectionClosedEventArgs.csRpcLauncher.cs
Phantom.Controller.Services
Agents
Agent.csAgentConnection.csAgentJavaRuntimesManager.csAgentManager.csAgentStats.cs
Audit
AuditLog.EventTypes.csAuditLog.csAuditLogItem.cs
Events
EventLog.InstanceEventVisitor.csEventLog.csEventLogItem.cs
Instances
AddOrEditInstanceResult.csInstance.csInstanceLogHtmlFilters.csInstanceLogManager.csInstanceManager.cs
Phantom.Controller.Services.csproj
Rpc
MessageToServerListener.csMessageToServerListenerFactory.cs
ServiceConfiguration.cs
Users
AddRoleError.csAddUserError.csDeleteUserResult.csPasswordRequirementViolation.csRoleManager.csSetUserPasswordError.csUserManager.csUserPasswords.csUserRoleManager.cs
Phantom.Controller
CertificateFiles.csPhantom.Controller.csprojProgram.csVariables.csWebConfigurator.cs
Web/Phantom.Web.Components
Dialogs
Modal.razor
Forms
Base
FormInputBase.csFormInputBaseDebounced.csICustomFormField.cs
Fields
InputFieldNumeric.csInputFieldText.cs
FormButtonSubmit.csFormLabel.razorFormModel.csFormNumberInputType.csFormSubmitError.razorFormTextInputType.cs
Show More

2
Controller/Phantom.Controller.Database.Postgres/ApplicationDbContextDesignFactory.cs
View File

@ -2,7 +2,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
namespace Phantom.Server.Database.Postgres;
namespace Phantom.Controller.Database.Postgres;
public sealed class ApplicationDbContextDesignFactory : IDesignTimeDbContextFactory<ApplicationDbContext> {
public ApplicationDbContext CreateDbContext(string[] args) {

6
Controller/Phantom.Controller.Database.Postgres/Migrations/20221007033307_Agents.Designer.cs generated
View File

@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221007033307_Agents")]
@ -25,7 +25,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221007033307_Agents.cs
View File

@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class Agents : Migration

8
Controller/Phantom.Controller.Database.Postgres/Migrations/20221007095438_Instances.Designer.cs generated
View File

@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221007095438_Instances")]
@ -25,7 +25,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -49,7 +49,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221007095438_Instances.cs
View File

@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class Instances : Migration

8
Controller/Phantom.Controller.Database.Postgres/Migrations/20221008163849_Identity.Designer.cs generated
View File

@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221008163849_Identity")]
@ -221,7 +221,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -245,7 +245,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221008163849_Identity.cs
View File

@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class Identity : Migration

8
Controller/Phantom.Controller.Database.Postgres/Migrations/20221010193220_InstanceJvmArguments.Designer.cs generated
View File

@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221010193220_InstanceJvmArguments")]
@ -221,7 +221,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -245,7 +245,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221010193220_InstanceJvmArguments.cs
View File

@ -2,7 +2,7 @@
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class InstanceJvmArguments : Migration

12
Controller/Phantom.Controller.Database.Postgres/Migrations/20221016035515_AuditLog.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221016035515_AuditLog")]
@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -246,7 +246,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -282,7 +282,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditEvents", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -378,7 +378,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
.WithMany()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221016035515_AuditLog.cs
View File

@ -5,7 +5,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class AuditLog : Migration

12
Controller/Phantom.Controller.Database.Postgres/Migrations/20221018231328_AgentVersion.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221018231328_AgentVersion")]
@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditEvents", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -382,7 +382,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
.WithMany()

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221018231328_AgentVersion.cs
View File

@ -2,7 +2,7 @@
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class AgentVersion : Migration

26
Controller/Phantom.Controller.Database.Postgres/Migrations/20221021125232_Permissions.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20221021125232_Permissions")]
@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditEvents", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -331,7 +331,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
@ -341,7 +341,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Permissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.Property<string>("RoleId")
.HasColumnType("text");
@ -356,7 +356,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("RolePermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.Property<string>("UserId")
.HasColumnType("text");
@ -422,7 +422,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
.WithMany()
@ -431,9 +431,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.Navigation("User");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
@ -446,9 +446,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20221021125232_Permissions.cs
View File

@ -2,7 +2,7 @@
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class Permissions : Migration

26
Controller/Phantom.Controller.Database.Postgres/Migrations/20230213040522_AuditLogRename.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20230213040522_AuditLogRename")]
@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -331,7 +331,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
@ -341,7 +341,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Permissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.Property<string>("RoleId")
.HasColumnType("text");
@ -356,7 +356,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("RolePermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.Property<string>("UserId")
.HasColumnType("text");
@ -422,7 +422,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditEventEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditEventEntity", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
.WithMany()
@ -431,9 +431,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.Navigation("User");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
@ -446,9 +446,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20230213040522_AuditLogRename.cs
View File

@ -2,7 +2,7 @@
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class AuditLogRename : Migration

28
Controller/Phantom.Controller.Database.Postgres/Migrations/20230215101444_EventLog.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20230215101444_EventLog")]
@ -222,7 +222,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserTokens", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -250,7 +250,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -286,7 +286,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
{
b.Property<Guid>("EventGuid")
.ValueGeneratedOnAdd()
@ -318,7 +318,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("EventLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -363,7 +363,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
@ -373,7 +373,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Permissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.Property<string>("RoleId")
.HasColumnType("text");
@ -388,7 +388,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("RolePermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.Property<string>("UserId")
.HasColumnType("text");
@ -454,7 +454,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
.WithMany()
@ -463,9 +463,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.Navigation("User");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
@ -478,9 +478,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20230215101444_EventLog.cs
View File

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class EventLog : Migration

14
Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20231008122637_ReplaceIdentity")]
@ -26,7 +26,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -54,7 +54,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -88,7 +88,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
{
b.Property<Guid>("EventGuid")
.ValueGeneratedOnAdd()
@ -120,7 +120,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("EventLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -165,7 +165,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20231008122637_ReplaceIdentity.cs
View File

@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class ReplaceIdentity : Migration

46
Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.Designer.cs generated
View File

@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20231008123315_ReplaceIdentity2")]
@ -26,7 +26,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -54,7 +54,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -90,7 +90,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
{
b.Property<Guid>("EventGuid")
.ValueGeneratedOnAdd()
@ -122,7 +122,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("EventLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -167,7 +167,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
@ -177,7 +177,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Permissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
{
b.Property<Guid>("RoleGuid")
.ValueGeneratedOnAdd()
@ -192,7 +192,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Roles", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.Property<Guid>("RoleGuid")
.HasColumnType("uuid");
@ -207,7 +207,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("RolePermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
{
b.Property<Guid>("UserGuid")
.ValueGeneratedOnAdd()
@ -229,7 +229,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Users", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.Property<Guid>("UserGuid")
.HasColumnType("uuid");
@ -244,7 +244,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserPermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
{
b.Property<Guid>("UserGuid")
.HasColumnType("uuid");
@ -259,9 +259,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserRoles", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.SetNull);
@ -269,45 +269,45 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.Navigation("User");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.RoleEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
.WithMany()
.HasForeignKey("RoleGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.UserEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.RoleEntity", "Role")
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
.WithMany()
.HasForeignKey("RoleGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.Cascade)

2
Controller/Phantom.Controller.Database.Postgres/Migrations/20231008123315_ReplaceIdentity2.cs
View File

@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
/// <inheritdoc />
public partial class ReplaceIdentity2 : Migration

46
Controller/Phantom.Controller.Database.Postgres/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Phantom.Server.Database;
using Phantom.Controller.Database;
#nullable disable
namespace Phantom.Server.Database.Postgres.Migrations
namespace Phantom.Controller.Database.Postgres.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@ -23,7 +23,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Phantom.Server.Database.Entities.AgentEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AgentEntity", b =>
{
b.Property<Guid>("AgentGuid")
.ValueGeneratedOnAdd()
@ -51,7 +51,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Agents", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
@ -87,7 +87,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("AuditLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.EventLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.EventLogEntity", b =>
{
b.Property<Guid>("EventGuid")
.ValueGeneratedOnAdd()
@ -119,7 +119,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("EventLog", "system");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.InstanceEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.InstanceEntity", b =>
{
b.Property<Guid>("InstanceGuid")
.ValueGeneratedOnAdd()
@ -164,7 +164,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Instances", "agents");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.PermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.PermissionEntity", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
@ -174,7 +174,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Permissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RoleEntity", b =>
{
b.Property<Guid>("RoleGuid")
.ValueGeneratedOnAdd()
@ -189,7 +189,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Roles", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.Property<Guid>("RoleGuid")
.HasColumnType("uuid");
@ -204,7 +204,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("RolePermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserEntity", b =>
{
b.Property<Guid>("UserGuid")
.ValueGeneratedOnAdd()
@ -226,7 +226,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("Users", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.Property<Guid>("UserGuid")
.HasColumnType("uuid");
@ -241,7 +241,7 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserPermissions", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
{
b.Property<Guid>("UserGuid")
.HasColumnType("uuid");
@ -256,9 +256,9 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.ToTable("UserRoles", "identity");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.AuditLogEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.AuditLogEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.SetNull);
@ -266,45 +266,45 @@ namespace Phantom.Server.Database.Postgres.Migrations
b.Navigation("User");
});
modelBuilder.Entity("Phantom.Server.Database.Entities.RolePermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.RolePermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.RoleEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", null)
.WithMany()
.HasForeignKey("RoleGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserPermissionEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserPermissionEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.PermissionEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.PermissionEntity", null)
.WithMany()
.HasForeignKey("PermissionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.UserEntity", null)
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", null)
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Phantom.Server.Database.Entities.UserRoleEntity", b =>
modelBuilder.Entity("Phantom.Controller.Database.Entities.UserRoleEntity", b =>
{
b.HasOne("Phantom.Server.Database.Entities.RoleEntity", "Role")
b.HasOne("Phantom.Controller.Database.Entities.RoleEntity", "Role")
.WithMany()
.HasForeignKey("RoleGuid")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Phantom.Server.Database.Entities.UserEntity", "User")
b.HasOne("Phantom.Controller.Database.Entities.UserEntity", "User")
.WithMany()
.HasForeignKey("UserGuid")
.OnDelete(DeleteBehavior.Cascade)

4
Controller/Phantom.Controller.Database.Postgres/Phantom.Controller.Database.Postgres.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server.Database.Postgres</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
<PrivateAssets>all</PrivateAssets>

10
Controller/Phantom.Controller.Database/ApplicationDbContext.cs
View File

@ -3,12 +3,12 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Phantom.Common.Data;
using Phantom.Common.Data.Minecraft;
using Phantom.Server.Database.Converters;
using Phantom.Server.Database.Entities;
using Phantom.Server.Database.Enums;
using Phantom.Server.Database.Factories;
using Phantom.Controller.Database.Converters;
using Phantom.Controller.Database.Entities;
using Phantom.Controller.Database.Enums;
using Phantom.Controller.Database.Factories;
namespace Phantom.Server.Database;
namespace Phantom.Controller.Database;
[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]
public class ApplicationDbContext : DbContext {

2
Controller/Phantom.Controller.Database/Converters/RamAllocationUnitsConverter.cs
View File

@ -2,7 +2,7 @@
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Phantom.Common.Data;
namespace Phantom.Server.Database.Converters;
namespace Phantom.Controller.Database.Converters;
[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
sealed class RamAllocationUnitsConverter : ValueConverter<RamAllocationUnits, ushort> {

2
Controller/Phantom.Controller.Database/DatabaseProvider.cs
View File

@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
namespace Phantom.Server.Database;
namespace Phantom.Controller.Database;
public sealed class DatabaseProvider {
private readonly IServiceScopeFactory serviceScopeFactory;

2
Controller/Phantom.Controller.Database/Entities/AgentEntity.cs
View File

@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics.CodeAnalysis;
using Phantom.Common.Data;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("Agents", Schema = "agents")]
[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

4
Controller/Phantom.Controller.Database/Entities/AuditLogEntity.cs
View File

@ -2,9 +2,9 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("AuditLog", Schema = "system")]
[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

4
Controller/Phantom.Controller.Database/Entities/EventLogEntity.cs
View File

@ -2,9 +2,9 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("EventLog", Schema = "system")]
[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

2
Controller/Phantom.Controller.Database/Entities/InstanceEntity.cs
View File

@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using Phantom.Common.Data;
using Phantom.Common.Data.Minecraft;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("Instances", Schema = "agents")]
[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]

2
Controller/Phantom.Controller.Database/Entities/PermissionEntity.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("Permissions", Schema = "identity")]
public sealed class PermissionEntity {

2
Controller/Phantom.Controller.Database/Entities/RoleEntity.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("Roles", Schema = "identity")]
public sealed class RoleEntity {

2
Controller/Phantom.Controller.Database/Entities/RolePermissionEntity.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("RolePermissions", Schema = "identity")]
public sealed class RolePermissionEntity {

2
Controller/Phantom.Controller.Database/Entities/UserEntity.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("Users", Schema = "identity")]
public sealed class UserEntity {

2
Controller/Phantom.Controller.Database/Entities/UserPermissionEntity.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("UserPermissions", Schema = "identity")]
public sealed class UserPermissionEntity {

2
Controller/Phantom.Controller.Database/Entities/UserRoleEntity.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace Phantom.Server.Database.Entities;
namespace Phantom.Controller.Database.Entities;
[Table("UserRoles", Schema = "identity")]
public sealed class UserRoleEntity {

2
Controller/Phantom.Controller.Database/Enums/AuditLogEventType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Database.Enums;
namespace Phantom.Controller.Database.Enums;
public enum AuditLogEventType {
AdministratorUserCreated,

2
Controller/Phantom.Controller.Database/Enums/AuditLogSubjectType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Database.Enums;
namespace Phantom.Controller.Database.Enums;
public enum AuditLogSubjectType {
User,

2
Controller/Phantom.Controller.Database/Enums/EventLogEventType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Database.Enums;
namespace Phantom.Controller.Database.Enums;
public enum EventLogEventType {
InstanceLaunchSucceded,

2
Controller/Phantom.Controller.Database/Enums/EventLogSubjectType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Database.Enums;
namespace Phantom.Controller.Database.Enums;
public enum EventLogSubjectType {
Instance

2
Controller/Phantom.Controller.Database/Factories/AbstractUpsertHelper.cs
View File

@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
namespace Phantom.Server.Database.Factories;
namespace Phantom.Controller.Database.Factories;
public abstract class AbstractUpsertHelper<T> where T : class {
private protected readonly ApplicationDbContext Ctx;

4
Controller/Phantom.Controller.Database/Factories/AgentEntityUpsert.cs
View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database.Entities;
namespace Phantom.Server.Database.Factories;
namespace Phantom.Controller.Database.Factories;
public sealed class AgentEntityUpsert : AbstractUpsertHelper<AgentEntity> {
internal AgentEntityUpsert(ApplicationDbContext ctx) : base(ctx) {}

4
Controller/Phantom.Controller.Database/Factories/InstanceEntityUpsert.cs
View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database.Entities;
namespace Phantom.Server.Database.Factories;
namespace Phantom.Controller.Database.Factories;
public sealed class InstanceEntityUpsert : AbstractUpsertHelper<InstanceEntity> {
internal InstanceEntityUpsert(ApplicationDbContext ctx) : base(ctx) {}

4
Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server.Database</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">

2
Controller/Phantom.Controller.Minecraft/JvmArgumentsHelper.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Immutable;
namespace Phantom.Server.Minecraft;
namespace Phantom.Controller.Minecraft;
public static class JvmArgumentsHelper {
public static ImmutableArray<string> Split(string arguments) {

2
Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs
View File

@ -8,7 +8,7 @@ using Phantom.Utils.IO;
using Phantom.Utils.Runtime;
using Serilog;
namespace Phantom.Server.Minecraft;
namespace Phantom.Controller.Minecraft;
sealed class MinecraftVersionApi : IDisposable {
private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersionApi>();

2
Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs
View File

@ -4,7 +4,7 @@ using Phantom.Common.Data.Minecraft;
using Phantom.Common.Logging;
using Serilog;
namespace Phantom.Server.Minecraft;
namespace Phantom.Controller.Minecraft;
public sealed class MinecraftVersions : IDisposable {
private static readonly ILogger Logger = PhantomLogger.Create<MinecraftVersions>();

4
Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server.Minecraft</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
<ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />

4
Controller/Phantom.Controller.Rpc/Phantom.Controller.Rpc.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server.Rpc</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
</ItemGroup>

2
Controller/Phantom.Controller.Rpc/RpcClientConnection.cs
View File

@ -4,7 +4,7 @@ using Phantom.Common.Messages;
using Phantom.Common.Messages.BiDirectional;
using Phantom.Utils.Rpc.Message;
namespace Phantom.Server.Rpc;
namespace Phantom.Controller.Rpc;
public sealed class RpcClientConnection {
private readonly ServerSocket socket;

2
Controller/Phantom.Controller.Rpc/RpcClientConnectionClosedEventArgs.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Rpc;
namespace Phantom.Controller.Rpc;
sealed class RpcClientConnectionClosedEventArgs : EventArgs {
public uint RoutingId { get; }

2
Controller/Phantom.Controller.Rpc/RpcLauncher.cs
View File

@ -8,7 +8,7 @@ using Phantom.Utils.Tasks;
using Serilog;
using Serilog.Events;
namespace Phantom.Server.Rpc;
namespace Phantom.Controller.Rpc;
public sealed class RpcLauncher : RpcRuntime<ServerSocket> {
public static Task Launch(RpcConfiguration config, Func<RpcClientConnection, IMessageToServerListener> listenerFactory, CancellationToken cancellationToken) {

2
Controller/Phantom.Controller.Services/Agents/Agent.cs
View File

@ -1,7 +1,7 @@
using Phantom.Common.Data;
using Phantom.Common.Data.Agent;
namespace Phantom.Server.Services.Agents;
namespace Phantom.Controller.Services.Agents;
public sealed record Agent(
Guid Guid,

4
Controller/Phantom.Controller.Services/Agents/AgentConnection.cs
View File

@ -1,7 +1,7 @@
using Phantom.Common.Messages;
using Phantom.Server.Rpc;
using Phantom.Controller.Rpc;
namespace Phantom.Server.Services.Agents;
namespace Phantom.Controller.Services.Agents;
sealed class AgentConnection {
private readonly RpcClientConnection connection;

2
Controller/Phantom.Controller.Services/Agents/AgentJavaRuntimesManager.cs
View File

@ -2,7 +2,7 @@
using Phantom.Common.Data.Java;
using Phantom.Utils.Collections;
namespace Phantom.Server.Services.Agents;
namespace Phantom.Controller.Services.Agents;
public sealed class AgentJavaRuntimesManager {
private readonly RwLockedDictionary<Guid, ImmutableArray<TaggedJavaRuntime>> runtimes = new (LockRecursionPolicy.NoRecursion);

8
Controller/Phantom.Controller.Services/Agents/AgentManager.cs
View File

@ -5,15 +5,15 @@ using Phantom.Common.Data.Replies;
using Phantom.Common.Logging;
using Phantom.Common.Messages;
using Phantom.Common.Messages.ToAgent;
using Phantom.Server.Database;
using Phantom.Server.Rpc;
using Phantom.Server.Services.Instances;
using Phantom.Controller.Database;
using Phantom.Controller.Rpc;
using Phantom.Controller.Services.Instances;
using Phantom.Utils.Collections;
using Phantom.Utils.Events;
using Phantom.Utils.Tasks;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Agents;
namespace Phantom.Controller.Services.Agents;
public sealed class AgentManager {
private static readonly ILogger Logger = PhantomLogger.Create<AgentManager>();

2
Controller/Phantom.Controller.Services/Agents/AgentStats.cs
View File

@ -1,6 +1,6 @@
using Phantom.Common.Data;
namespace Phantom.Server.Services.Agents;
namespace Phantom.Controller.Services.Agents;
public sealed record AgentStats(
int RunningInstanceCount,

6
Controller/Phantom.Controller.Services/Audit/AuditLog.EventTypes.cs
View File

@ -1,7 +1,7 @@
using Phantom.Server.Database.Entities;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Entities;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Services.Audit;
namespace Phantom.Controller.Services.Audit;
public sealed partial class AuditLog {
public Task AddAdministratorUserCreatedEvent(UserEntity administratorUser) {

10
Controller/Phantom.Controller.Services/Audit/AuditLog.cs
View File

@ -1,12 +1,12 @@
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.EntityFrameworkCore;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Server.Database.Enums;
using Phantom.Server.Services.Users;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Controller.Database.Enums;
using Phantom.Controller.Services.Users;
using Phantom.Utils.Tasks;
namespace Phantom.Server.Services.Audit;
namespace Phantom.Controller.Services.Audit;
public sealed partial class AuditLog {
private readonly CancellationToken cancellationToken;

4
Controller/Phantom.Controller.Services/Audit/AuditLogItem.cs
View File

@ -1,6 +1,6 @@
using System.Text.Json;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Services.Audit;
namespace Phantom.Controller.Services.Audit;
public sealed record AuditLogItem(DateTime UtcTime, Guid? UserGuid, string? UserName, AuditLogEventType EventType, AuditLogSubjectType SubjectType, string? SubjectId, JsonDocument? Data);

4
Controller/Phantom.Controller.Services/Events/EventLog.InstanceEventVisitor.cs
View File

@ -1,8 +1,8 @@
using Phantom.Common.Data.Backups;
using Phantom.Common.Data.Instance;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Services.Events;
namespace Phantom.Controller.Services.Events;
public sealed partial class EventLog {
internal IInstanceEventVisitor CreateInstanceEventVisitor(Guid eventGuid, DateTime utcTime, Guid agentGuid, Guid instanceGuid) {

8
Controller/Phantom.Controller.Services/Events/EventLog.cs
View File

@ -1,10 +1,10 @@
using Microsoft.EntityFrameworkCore;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Controller.Database.Enums;
using Phantom.Utils.Tasks;
namespace Phantom.Server.Services.Events;
namespace Phantom.Controller.Services.Events;
public sealed partial class EventLog {
private readonly CancellationToken cancellationToken;

4
Controller/Phantom.Controller.Services/Events/EventLogItem.cs
View File

@ -1,6 +1,6 @@
using System.Text.Json;
using Phantom.Server.Database.Enums;
using Phantom.Controller.Database.Enums;
namespace Phantom.Server.Services.Events;
namespace Phantom.Controller.Services.Events;
public sealed record EventLogItem(DateTime UtcTime, Guid? AgentGuid, EventLogEventType EventType, EventLogSubjectType SubjectType, string SubjectId, JsonDocument? Data);

2
Controller/Phantom.Controller.Services/Instances/AddOrEditInstanceResult.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Services.Instances;
namespace Phantom.Controller.Services.Instances;
public enum AddOrEditInstanceResult : byte {
UnknownError,

2
Controller/Phantom.Controller.Services/Instances/Instance.cs
View File

@ -1,6 +1,6 @@
using Phantom.Common.Data.Instance;
namespace Phantom.Server.Services.Instances;
namespace Phantom.Controller.Services.Instances;
public sealed record Instance(
InstanceConfiguration Configuration,

2
Controller/Phantom.Controller.Services/Instances/InstanceLogHtmlFilters.cs
View File

@ -1,7 +1,7 @@
using System.Net;
using System.Text.RegularExpressions;
namespace Phantom.Server.Services.Instances;
namespace Phantom.Controller.Services.Instances;
static partial class InstanceLogHtmlFilters {
/// <summary>

2
Controller/Phantom.Controller.Services/Instances/InstanceLogManager.cs
View File

@ -5,7 +5,7 @@ using Phantom.Utils.Collections;
using Phantom.Utils.Events;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Instances;
namespace Phantom.Controller.Services.Instances;
public sealed class InstanceLogManager {
private const int RetainedLines = 1000;

11
Controller/Phantom.Controller.Services/Instances/InstanceManager.cs
View File

@ -2,21 +2,20 @@
using System.Diagnostics.CodeAnalysis;
using Phantom.Common.Data;
using Phantom.Common.Data.Instance;
using Phantom.Common.Data.Java;
using Phantom.Common.Data.Minecraft;
using Phantom.Common.Data.Replies;
using Phantom.Common.Logging;
using Phantom.Common.Messages;
using Phantom.Common.Messages.ToAgent;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Server.Minecraft;
using Phantom.Server.Services.Agents;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Controller.Minecraft;
using Phantom.Controller.Services.Agents;
using Phantom.Utils.Collections;
using Phantom.Utils.Events;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Instances;
namespace Phantom.Controller.Services.Instances;
public sealed class InstanceManager {
private static readonly ILogger Logger = PhantomLogger.Create<InstanceManager>();

4
Controller/Phantom.Controller.Services/Phantom.Controller.Services.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server.Services</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>

10
Controller/Phantom.Controller.Services/Rpc/MessageToServerListener.cs
View File

@ -4,14 +4,14 @@ using Phantom.Common.Messages;
using Phantom.Common.Messages.BiDirectional;
using Phantom.Common.Messages.ToAgent;
using Phantom.Common.Messages.ToServer;
using Phantom.Server.Rpc;
using Phantom.Server.Services.Agents;
using Phantom.Server.Services.Events;
using Phantom.Server.Services.Instances;
using Phantom.Controller.Rpc;
using Phantom.Controller.Services.Agents;
using Phantom.Controller.Services.Events;
using Phantom.Controller.Services.Instances;
using Phantom.Utils.Rpc.Message;
using Phantom.Utils.Tasks;
namespace Phantom.Server.Services.Rpc;
namespace Phantom.Controller.Services.Rpc;
public sealed class MessageToServerListener : IMessageToServerListener {
private readonly RpcClientConnection connection;

10
Controller/Phantom.Controller.Services/Rpc/MessageToServerListenerFactory.cs
View File

@ -1,9 +1,9 @@
using Phantom.Server.Rpc;
using Phantom.Server.Services.Agents;
using Phantom.Server.Services.Events;
using Phantom.Server.Services.Instances;
using Phantom.Controller.Rpc;
using Phantom.Controller.Services.Agents;
using Phantom.Controller.Services.Events;
using Phantom.Controller.Services.Instances;
namespace Phantom.Server.Services.Rpc;
namespace Phantom.Controller.Services.Rpc;
public sealed class MessageToServerListenerFactory {
private readonly ServiceConfiguration configuration;

2
Controller/Phantom.Controller.Services/ServiceConfiguration.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Services;
namespace Phantom.Controller.Services;
public sealed record ServiceConfiguration(
string Version,

2
Controller/Phantom.Controller.Services/Users/AddRoleError.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public enum AddRoleError : byte {
NameIsEmpty,

2
Controller/Phantom.Controller.Services/Users/AddUserError.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Immutable;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public abstract record AddUserError {
private AddUserError() {}

2
Controller/Phantom.Controller.Services/Users/DeleteUserResult.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public enum DeleteUserResult : byte {
Deleted,

2
Controller/Phantom.Controller.Services/Users/PasswordRequirementViolation.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public abstract record PasswordRequirementViolation {
private PasswordRequirementViolation() {}

6
Controller/Phantom.Controller.Services/Users/RoleManager.cs
View File

@ -1,13 +1,13 @@
using System.Collections.Immutable;
using Microsoft.EntityFrameworkCore;
using Phantom.Common.Logging;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Utils.Collections;
using Phantom.Utils.Tasks;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public sealed class RoleManager {
private static readonly ILogger Logger = PhantomLogger.Create<RoleManager>();

2
Controller/Phantom.Controller.Services/Users/SetUserPasswordError.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Immutable;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public abstract record SetUserPasswordError {
private SetUserPasswordError() {}

6
Controller/Phantom.Controller.Services/Users/UserManager.cs
View File

@ -3,13 +3,13 @@ using System.Security.Claims;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Phantom.Common.Logging;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Utils.Collections;
using Phantom.Utils.Tasks;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public sealed class UserManager {
private static readonly ILogger Logger = PhantomLogger.Create<UserManager>();

4
Controller/Phantom.Controller.Services/Users/UserPasswords.cs
View File

@ -1,8 +1,8 @@
using System.Collections.Immutable;
using Microsoft.AspNetCore.Identity;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database.Entities;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
internal static class UserPasswords {
private static PasswordHasher<UserEntity> Hasher { get; } = new ();

6
Controller/Phantom.Controller.Services/Users/UserRoleManager.cs
View File

@ -1,12 +1,12 @@
using System.Collections.Immutable;
using Microsoft.EntityFrameworkCore;
using Phantom.Common.Logging;
using Phantom.Server.Database;
using Phantom.Server.Database.Entities;
using Phantom.Controller.Database;
using Phantom.Controller.Database.Entities;
using Phantom.Utils.Collections;
using ILogger = Serilog.ILogger;
namespace Phantom.Server.Services.Users;
namespace Phantom.Controller.Services.Users;
public sealed class UserRoleManager {
private static readonly ILogger Logger = PhantomLogger.Create<UserRoleManager>();

2
Controller/Phantom.Controller/CertificateFiles.cs
View File

@ -5,7 +5,7 @@ using Phantom.Utils.Cryptography;
using Phantom.Utils.IO;
using Serilog;
namespace Phantom.Server;
namespace Phantom.Controller;
static class CertificateFiles {
private static ILogger Logger { get; } = PhantomLogger.Create(nameof(CertificateFiles));

4
Controller/Phantom.Controller/Phantom.Controller.csproj
View File

@ -5,10 +5,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>Phantom.Server</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

14
Controller/Phantom.Controller/Program.cs
View File

@ -2,18 +2,18 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Phantom.Common.Logging;
using Phantom.Server;
using Phantom.Server.Database.Postgres;
using Phantom.Server.Rpc;
using Phantom.Server.Services;
using Phantom.Server.Services.Rpc;
using Phantom.Controller;
using Phantom.Controller.Database.Postgres;
using Phantom.Controller.Rpc;
using Phantom.Controller.Services;
using Phantom.Controller.Services.Rpc;
using Phantom.Utils.Cryptography;
using Phantom.Utils.IO;
using Phantom.Utils.Rpc;
using Phantom.Utils.Runtime;
using Phantom.Utils.Tasks;
using WebConfiguration = Phantom.Server.Web.Configuration;
using WebLauncher = Phantom.Server.Web.Launcher;
using WebConfiguration = Phantom.Web.Configuration;
using WebLauncher = Phantom.Web.Launcher;
var cancellationTokenSource = new CancellationTokenSource();

2
Controller/Phantom.Controller/Variables.cs
View File

@ -2,7 +2,7 @@
using Phantom.Common.Logging;
using Phantom.Utils.Runtime;
namespace Phantom.Server;
namespace Phantom.Controller;
sealed record Variables(
string WebServerHost,

18
Controller/Phantom.Controller/WebConfigurator.cs
View File

@ -1,16 +1,16 @@
using Microsoft.Extensions.DependencyInjection;
using Phantom.Common.Data.Agent;
using Phantom.Server.Minecraft;
using Phantom.Server.Services;
using Phantom.Server.Services.Agents;
using Phantom.Server.Services.Audit;
using Phantom.Server.Services.Events;
using Phantom.Server.Services.Instances;
using Phantom.Server.Services.Rpc;
using Phantom.Controller.Minecraft;
using Phantom.Controller.Services;
using Phantom.Controller.Services.Agents;
using Phantom.Controller.Services.Audit;
using Phantom.Controller.Services.Events;
using Phantom.Controller.Services.Instances;
using Phantom.Controller.Services.Rpc;
using Phantom.Utils.Tasks;
using WebLauncher = Phantom.Server.Web.Launcher;
using WebLauncher = Phantom.Web.Launcher;
namespace Phantom.Server;
namespace Phantom.Controller;
sealed class WebConfigurator : WebLauncher.IConfigurator {
private readonly ServiceConfiguration serviceConfiguration;

2
Web/Phantom.Web.Components/Dialogs/Modal.razor
View File

@ -1,4 +1,4 @@
@using Phantom.Server.Web.Components.Utils
@using Phantom.Web.Components.Utils
<div id="@Id" class="modal fade" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">

2
Web/Phantom.Web.Components/Forms/Base/FormInputBase.cs
View File

@ -1,7 +1,7 @@
using System.Linq.Expressions;
using Microsoft.AspNetCore.Components;
namespace Phantom.Server.Web.Components.Forms.Base;
namespace Phantom.Web.Components.Forms.Base;
public abstract class FormInputBase<TValue> : ComponentBase {
[Parameter, EditorRequired]

4
Web/Phantom.Web.Components/Forms/Base/FormInputBaseDebounced.cs
View File

@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Web;
using Phantom.Server.Web.Components.Utils;
using Phantom.Web.Components.Utils;
namespace Phantom.Server.Web.Components.Forms.Base;
namespace Phantom.Web.Components.Forms.Base;
public abstract class FormInputBaseDebounced<TValue> : FormInputBase<TValue>, IDisposable {
private const uint DefaultDebounceMillis = 700;

2
Web/Phantom.Web.Components/Forms/Base/ICustomFormField.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Web.Components.Forms.Base;
namespace Phantom.Web.Components.Forms.Base;
public interface ICustomFormField {
bool TwoWayValueBinding { get; set; }

4
Web/Phantom.Web.Components/Forms/Fields/InputFieldNumeric.cs
View File

@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.Web;
using Phantom.Server.Web.Components.Forms.Base;
using Phantom.Web.Components.Forms.Base;
namespace Phantom.Server.Web.Components.Forms.Fields;
namespace Phantom.Web.Components.Forms.Fields;
public sealed class InputFieldNumeric<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TValue> : InputBase<TValue>, ICustomFormField {
[Parameter]

4
Web/Phantom.Web.Components/Forms/Fields/InputFieldText.cs
View File

@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.Web;
using Phantom.Server.Web.Components.Forms.Base;
using Phantom.Web.Components.Forms.Base;
namespace Phantom.Server.Web.Components.Forms.Fields;
namespace Phantom.Web.Components.Forms.Fields;
public sealed class InputFieldText : InputBase<string?>, ICustomFormField {
[Parameter]

4
Web/Phantom.Web.Components/Forms/FormButtonSubmit.cs
View File

@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
using Phantom.Server.Web.Components.Utils;
using Phantom.Web.Components.Utils;
namespace Phantom.Server.Web.Components.Forms;
namespace Phantom.Web.Components.Forms;
public sealed class FormButtonSubmit : ComponentBase {
[Parameter]

2
Web/Phantom.Web.Components/Forms/FormLabel.razor
View File

@ -1,4 +1,4 @@
@using Phantom.Server.Web.Components.Utils
@using Phantom.Web.Components.Utils
@if (Label != null) {
<label for="@Id" class="form-label">@Label</label>
}

4
Web/Phantom.Web.Components/Forms/FormModel.cs
View File

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components.Forms;
using Phantom.Server.Web.Components.Utils;
using Phantom.Web.Components.Utils;
namespace Phantom.Server.Web.Components.Forms;
namespace Phantom.Web.Components.Forms;
public abstract class FormModel {
public EditContext EditContext { get; }

2
Web/Phantom.Web.Components/Forms/FormNumberInputType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Web.Components.Forms;
namespace Phantom.Web.Components.Forms;
public enum FormNumberInputType {
Number,

2
Web/Phantom.Web.Components/Forms/FormSubmitError.razor
View File

@ -1,4 +1,4 @@
@using Phantom.Server.Web.Components.Utils
@using Phantom.Web.Components.Utils
@if (messageLines.Length > 0) {
<div class="form-submit-errors text-danger">
@for (int i = 0; i < messageLines.Length; i++) {

2
Web/Phantom.Web.Components/Forms/FormTextInputType.cs
View File

@ -1,4 +1,4 @@
namespace Phantom.Server.Web.Components.Forms;
namespace Phantom.Web.Components.Forms;
public enum FormTextInputType {
Text,

Some files were not shown because too many files have changed in this diff Show More