diff --git a/CleanArchitecture.sln b/CleanArchitecture.sln index 0df7c34f7..a36379e19 100644 --- a/CleanArchitecture.sln +++ b/CleanArchitecture.sln @@ -29,20 +29,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "src\Web\Web.csproj", "{4E4EE20C-F06A-4A1B-851F-C5577796941C}" EndProject -#if (!UseApiOnly) Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.AcceptanceTests", "tests\Web.AcceptanceTests\Web.AcceptanceTests.csproj", "{21334974-6B07-47BB-B664-AC62FE58C12B}" EndProject -#endif Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.FunctionalTests", "tests\Application.FunctionalTests\Application.FunctionalTests.csproj", "{EA6127A5-94C9-4C31-AD11-E6811B92B520}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure.IntegrationTests", "tests\Infrastructure.IntegrationTests\Infrastructure.IntegrationTests.csproj", "{01FA6786-921D-4CE8-8C50-4FDA66C9477D}" EndProject -#if (UseAspire) Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppHost", "src\AppHost\AppHost.csproj", "{36483B25-E165-46F3-AA1C-ADE75A46BD8E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceDefaults", "src\ServiceDefaults\ServiceDefaults.csproj", "{15AFAC17-7E6E-4DB9-A5D9-EA96C5287CD2}" EndProject -#endif Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,12 +69,10 @@ Global {4E4EE20C-F06A-4A1B-851F-C5577796941C}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E4EE20C-F06A-4A1B-851F-C5577796941C}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E4EE20C-F06A-4A1B-851F-C5577796941C}.Release|Any CPU.Build.0 = Release|Any CPU -#if (!UseApiOnly) {21334974-6B07-47BB-B664-AC62FE58C12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21334974-6B07-47BB-B664-AC62FE58C12B}.Debug|Any CPU.Build.0 = Debug|Any CPU {21334974-6B07-47BB-B664-AC62FE58C12B}.Release|Any CPU.ActiveCfg = Release|Any CPU {21334974-6B07-47BB-B664-AC62FE58C12B}.Release|Any CPU.Build.0 = Release|Any CPU -#endif {EA6127A5-94C9-4C31-AD11-E6811B92B520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA6127A5-94C9-4C31-AD11-E6811B92B520}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA6127A5-94C9-4C31-AD11-E6811B92B520}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -87,7 +81,6 @@ Global {01FA6786-921D-4CE8-8C50-4FDA66C9477D}.Debug|Any CPU.Build.0 = Debug|Any CPU {01FA6786-921D-4CE8-8C50-4FDA66C9477D}.Release|Any CPU.ActiveCfg = Release|Any CPU {01FA6786-921D-4CE8-8C50-4FDA66C9477D}.Release|Any CPU.Build.0 = Release|Any CPU - #if (UseAspire) {36483B25-E165-46F3-AA1C-ADE75A46BD8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {36483B25-E165-46F3-AA1C-ADE75A46BD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {36483B25-E165-46F3-AA1C-ADE75A46BD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -96,7 +89,6 @@ Global {15AFAC17-7E6E-4DB9-A5D9-EA96C5287CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU {15AFAC17-7E6E-4DB9-A5D9-EA96C5287CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU {15AFAC17-7E6E-4DB9-A5D9-EA96C5287CD2}.Release|Any CPU.Build.0 = Release|Any CPU - #endif EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -108,15 +100,11 @@ Global {DEFF4009-1FAB-4392-80B6-707E2DC5C00B} = {664D406C-2F83-48F0-BFC3-408D5CB53C65} {DC37FD87-552C-4613-9F16-1537CA522898} = {664D406C-2F83-48F0-BFC3-408D5CB53C65} {4E4EE20C-F06A-4A1B-851F-C5577796941C} = {6ED356A7-8B47-4613-AD01-C85CF28491BD} - #if (!UseApiOnly) {21334974-6B07-47BB-B664-AC62FE58C12B} = {664D406C-2F83-48F0-BFC3-408D5CB53C65} - #endif {EA6127A5-94C9-4C31-AD11-E6811B92B520} = {664D406C-2F83-48F0-BFC3-408D5CB53C65} {01FA6786-921D-4CE8-8C50-4FDA66C9477D} = {664D406C-2F83-48F0-BFC3-408D5CB53C65} - #if (UseAspire) {36483B25-E165-46F3-AA1C-ADE75A46BD8E} = {6ED356A7-8B47-4613-AD01-C85CF28491BD} {15AFAC17-7E6E-4DB9-A5D9-EA96C5287CD2} = {6ED356A7-8B47-4613-AD01-C85CF28491BD} - #endif EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3CB609D9-5D54-4C11-A371-DAAC8B74E430} diff --git a/Directory.Build.props b/Directory.Build.props index a1b539c9a..44538eb4a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,5 +7,6 @@ enable enable + $(DefineConstants);UseApiOnly \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index dd66fcb3b..66ef98634 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -18,6 +18,7 @@ + @@ -49,6 +50,7 @@ + @@ -65,8 +67,6 @@ - - diff --git a/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.Designer.cs b/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.Designer.cs index ce6636fe6..a13266ad0 100644 --- a/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.Designer.cs +++ b/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.Designer.cs @@ -26,390 +26,369 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoItem", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("Created") - .HasColumnType("datetimeoffset"); + b.Property("Created") + .HasColumnType("datetimeoffset"); - b.Property("CreatedBy") - .HasColumnType("nvarchar(max)"); + b.Property("CreatedBy") + .HasColumnType("nvarchar(max)"); - b.Property("Done") - .HasColumnType("bit"); + b.Property("Done") + .HasColumnType("bit"); - b.Property("LastModified") - .HasColumnType("datetimeoffset"); + b.Property("LastModified") + .HasColumnType("datetimeoffset"); - b.Property("LastModifiedBy") - .HasColumnType("nvarchar(max)"); + b.Property("LastModifiedBy") + .HasColumnType("nvarchar(max)"); - b.Property("ListId") - .HasColumnType("int"); + b.Property("ListId") + .HasColumnType("int"); - b.Property("Note") - .HasColumnType("nvarchar(max)"); + b.Property("Note") + .HasColumnType("nvarchar(max)"); - b.Property("Priority") - .HasColumnType("int"); + b.Property("Priority") + .HasColumnType("int"); - b.Property("Reminder") - .HasColumnType("datetime2"); + b.Property("Reminder") + .HasColumnType("datetime2"); - b.Property("Title") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("nvarchar(200)"); + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("ListId"); + b.HasIndex("ListId"); - b.ToTable("TodoItems"); - }); + b.ToTable("TodoItems"); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("Created") - .HasColumnType("datetimeoffset"); + b.Property("Created") + .HasColumnType("datetimeoffset"); - b.Property("CreatedBy") - .HasColumnType("nvarchar(max)"); + b.Property("CreatedBy") + .HasColumnType("nvarchar(max)"); - b.Property("LastModified") - .HasColumnType("datetimeoffset"); + b.Property("LastModified") + .HasColumnType("datetimeoffset"); - b.Property("LastModifiedBy") - .HasColumnType("nvarchar(max)"); + b.Property("LastModifiedBy") + .HasColumnType("nvarchar(max)"); - b.Property("Title") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("nvarchar(200)"); + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.ToTable("TodoLists"); - }); + b.ToTable("TodoLists"); + }); modelBuilder.Entity("CleanArchitecture.Infrastructure.Identity.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("AccessFailedCount") - .HasColumnType("int"); + b.Property("AccessFailedCount") + .HasColumnType("int"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("EmailConfirmed") - .HasColumnType("bit"); + b.Property("EmailConfirmed") + .HasColumnType("bit"); - b.Property("LockoutEnabled") - .HasColumnType("bit"); + b.Property("LockoutEnabled") + .HasColumnType("bit"); - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); + b.Property("PasswordHash") + .HasColumnType("nvarchar(max)"); - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); + b.Property("PhoneNumberConfirmed") + .HasColumnType("bit"); - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); + b.Property("SecurityStamp") + .HasColumnType("nvarchar(max)"); - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); + b.Property("TwoFactorEnabled") + .HasColumnType("bit"); - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex") + .HasFilter("[NormalizedUserName] IS NOT NULL"); - b.ToTable("AspNetUsers", (string)null); - }); + b.ToTable("AspNetUsers", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex") + .HasFilter("[NormalizedName] IS NOT NULL"); - b.ToTable("AspNetRoles", (string)null); - }); + b.ToTable("AspNetRoles", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("RoleId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetRoleClaims", (string)null); - }); + b.ToTable("AspNetRoleClaims", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserClaims", (string)null); - }); + b.ToTable("AspNetUserClaims", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif - + { + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); - b.Property("ProviderKey") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif + b.Property("ProviderKey") + .HasColumnType("nvarchar(450)"); - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("LoginProvider", "ProviderKey"); + b.HasKey("LoginProvider", "ProviderKey"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserLogins", (string)null); - }); + b.ToTable("AspNetUserLogins", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); + b.Property("RoleId") + .HasColumnType("nvarchar(450)"); - b.HasKey("UserId", "RoleId"); + b.HasKey("UserId", "RoleId"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetUserRoles", (string)null); - }); + b.ToTable("AspNetUserRoles", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif - - b.Property("Name") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("Name") + .HasColumnType("nvarchar(450)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoItem", b => - { - b.HasOne("CleanArchitecture.Domain.Entities.TodoList", "List") - .WithMany("Items") - .HasForeignKey("ListId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + { + b.HasOne("CleanArchitecture.Domain.Entities.TodoList", "List") + .WithMany("Items") + .HasForeignKey("ListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.Navigation("List"); - }); + b.Navigation("List"); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.OwnsOne("CleanArchitecture.Domain.ValueObjects.Colour", "Colour", b1 => { - b1.Property("TodoListId") - .HasColumnType("int"); + b.OwnsOne("CleanArchitecture.Domain.ValueObjects.Colour", "Colour", b1 => + { + b1.Property("TodoListId") + .HasColumnType("int"); - b1.Property("Code") - .IsRequired() - .HasColumnType("nvarchar(max)"); + b1.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(max)"); - b1.HasKey("TodoListId"); + b1.HasKey("TodoListId"); - b1.ToTable("TodoLists"); + b1.ToTable("TodoLists"); - b1.WithOwner() - .HasForeignKey("TodoListId"); - }); + b1.WithOwner() + .HasForeignKey("TodoListId"); + }); - b.Navigation("Colour") - .IsRequired(); - }); + b.Navigation("Colour") + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.Navigation("Items"); - }); + { + b.Navigation("Items"); + }); #pragma warning restore 612, 618 } } diff --git a/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.cs b/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.cs index 181cc7536..9ed966f85 100644 --- a/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.cs +++ b/src/Infrastructure/Data/Migrations/00000000000000_InitialCreate.cs @@ -113,14 +113,9 @@ protected override void Up(MigrationBuilder migrationBuilder) migrationBuilder.CreateTable( name: "AspNetUserLogins", columns: table => new - { -#if (UseApiOnly && UseSqlServer) + { LoginProvider = table.Column(type: "nvarchar(450)", nullable: false), - ProviderKey = table.Column(type: "nvarchar(450)", nullable: false), -#else - LoginProvider = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), - ProviderKey = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), -#endif + ProviderKey = table.Column(type: "nvarchar(450)", nullable: false), ProviderDisplayName = table.Column(type: "nvarchar(max)", nullable: true), UserId = table.Column(type: "nvarchar(450)", nullable: false) }, @@ -163,14 +158,9 @@ protected override void Up(MigrationBuilder migrationBuilder) name: "AspNetUserTokens", columns: table => new { - UserId = table.Column(type: "nvarchar(450)", nullable: false), -#if (UseApiOnly && UseSqlServer) + UserId = table.Column(type: "nvarchar(450)", nullable: false), LoginProvider = table.Column(type: "nvarchar(450)", nullable: false), - Name = table.Column(type: "nvarchar(450)", nullable: false), -#else - LoginProvider = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), - Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), -#endif + Name = table.Column(type: "nvarchar(450)", nullable: false), Value = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => diff --git a/src/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 5e6d67a7d..823b80347 100644 --- a/src/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -23,389 +23,369 @@ protected override void BuildModel(ModelBuilder modelBuilder) SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoItem", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("Created") - .HasColumnType("datetimeoffset"); + b.Property("Created") + .HasColumnType("datetimeoffset"); - b.Property("CreatedBy") - .HasColumnType("nvarchar(max)"); + b.Property("CreatedBy") + .HasColumnType("nvarchar(max)"); - b.Property("Done") - .HasColumnType("bit"); + b.Property("Done") + .HasColumnType("bit"); - b.Property("LastModified") - .HasColumnType("datetimeoffset"); + b.Property("LastModified") + .HasColumnType("datetimeoffset"); - b.Property("LastModifiedBy") - .HasColumnType("nvarchar(max)"); + b.Property("LastModifiedBy") + .HasColumnType("nvarchar(max)"); - b.Property("ListId") - .HasColumnType("int"); + b.Property("ListId") + .HasColumnType("int"); - b.Property("Note") - .HasColumnType("nvarchar(max)"); + b.Property("Note") + .HasColumnType("nvarchar(max)"); - b.Property("Priority") - .HasColumnType("int"); + b.Property("Priority") + .HasColumnType("int"); - b.Property("Reminder") - .HasColumnType("datetime2"); + b.Property("Reminder") + .HasColumnType("datetime2"); - b.Property("Title") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("nvarchar(200)"); + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("ListId"); + b.HasIndex("ListId"); - b.ToTable("TodoItems"); - }); + b.ToTable("TodoItems"); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("Created") - .HasColumnType("datetimeoffset"); + b.Property("Created") + .HasColumnType("datetimeoffset"); - b.Property("CreatedBy") - .HasColumnType("nvarchar(max)"); + b.Property("CreatedBy") + .HasColumnType("nvarchar(max)"); - b.Property("LastModified") - .HasColumnType("datetimeoffset"); + b.Property("LastModified") + .HasColumnType("datetimeoffset"); - b.Property("LastModifiedBy") - .HasColumnType("nvarchar(max)"); + b.Property("LastModifiedBy") + .HasColumnType("nvarchar(max)"); - b.Property("Title") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("nvarchar(200)"); + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.ToTable("TodoLists"); - }); + b.ToTable("TodoLists"); + }); modelBuilder.Entity("CleanArchitecture.Infrastructure.Identity.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("AccessFailedCount") - .HasColumnType("int"); + b.Property("AccessFailedCount") + .HasColumnType("int"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("EmailConfirmed") - .HasColumnType("bit"); + b.Property("EmailConfirmed") + .HasColumnType("bit"); - b.Property("LockoutEnabled") - .HasColumnType("bit"); + b.Property("LockoutEnabled") + .HasColumnType("bit"); - b.Property("LockoutEnd") - .HasColumnType("datetimeoffset"); + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("PasswordHash") - .HasColumnType("nvarchar(max)"); + b.Property("PasswordHash") + .HasColumnType("nvarchar(max)"); - b.Property("PhoneNumber") - .HasColumnType("nvarchar(max)"); + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); - b.Property("PhoneNumberConfirmed") - .HasColumnType("bit"); + b.Property("PhoneNumberConfirmed") + .HasColumnType("bit"); - b.Property("SecurityStamp") - .HasColumnType("nvarchar(max)"); + b.Property("SecurityStamp") + .HasColumnType("nvarchar(max)"); - b.Property("TwoFactorEnabled") - .HasColumnType("bit"); + b.Property("TwoFactorEnabled") + .HasColumnType("bit"); - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex") - .HasFilter("[NormalizedUserName] IS NOT NULL"); + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex") + .HasFilter("[NormalizedUserName] IS NOT NULL"); - b.ToTable("AspNetUsers", (string)null); - }); + b.ToTable("AspNetUsers", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("nvarchar(450)"); + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex") - .HasFilter("[NormalizedName] IS NOT NULL"); + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex") + .HasFilter("[NormalizedName] IS NOT NULL"); - b.ToTable("AspNetRoles", (string)null); - }); + b.ToTable("AspNetRoles", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); - b.Property("RoleId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("RoleId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetRoleClaims", (string)null); - }); + b.ToTable("AspNetRoleClaims", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - b.Property("ClaimType") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); - b.Property("ClaimValue") - .HasColumnType("nvarchar(max)"); + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserClaims", (string)null); - }); + b.ToTable("AspNetUserClaims", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif + { + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); - b.Property("ProviderKey") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif + b.Property("ProviderKey") + .HasColumnType("nvarchar(450)"); - b.Property("ProviderDisplayName") - .HasColumnType("nvarchar(max)"); + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(max)"); - b.Property("UserId") - .IsRequired() - .HasColumnType("nvarchar(450)"); + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); - b.HasKey("LoginProvider", "ProviderKey"); + b.HasKey("LoginProvider", "ProviderKey"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserLogins", (string)null); - }); + b.ToTable("AspNetUserLogins", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); - b.Property("RoleId") - .HasColumnType("nvarchar(450)"); + b.Property("RoleId") + .HasColumnType("nvarchar(450)"); - b.HasKey("UserId", "RoleId"); + b.HasKey("UserId", "RoleId"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetUserRoles", (string)null); - }); + b.ToTable("AspNetUserRoles", (string)null); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("nvarchar(450)"); - - b.Property("LoginProvider") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif - - b.Property("Name") -#if (UseApiOnly && UseSqlServer) - .HasColumnType("nvarchar(450)"); -#else - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); -#endif - - b.Property("Value") - .HasColumnType("nvarchar(max)"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(450)"); + + b.Property("Name") + .HasColumnType("nvarchar(450)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoItem", b => - { - b.HasOne("CleanArchitecture.Domain.Entities.TodoList", "List") - .WithMany("Items") - .HasForeignKey("ListId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + { + b.HasOne("CleanArchitecture.Domain.Entities.TodoList", "List") + .WithMany("Items") + .HasForeignKey("ListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.Navigation("List"); - }); + b.Navigation("List"); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.OwnsOne("CleanArchitecture.Domain.ValueObjects.Colour", "Colour", b1 => { - b1.Property("TodoListId") - .HasColumnType("int"); + b.OwnsOne("CleanArchitecture.Domain.ValueObjects.Colour", "Colour", b1 => + { + b1.Property("TodoListId") + .HasColumnType("int"); - b1.Property("Code") - .IsRequired() - .HasColumnType("nvarchar(max)"); + b1.Property("Code") + .IsRequired() + .HasColumnType("nvarchar(max)"); - b1.HasKey("TodoListId"); + b1.HasKey("TodoListId"); - b1.ToTable("TodoLists"); + b1.ToTable("TodoLists"); - b1.WithOwner() - .HasForeignKey("TodoListId"); - }); + b1.WithOwner() + .HasForeignKey("TodoListId"); + }); - b.Navigation("Colour") - .IsRequired(); - }); + b.Navigation("Colour") + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + { + b.HasOne("CleanArchitecture.Infrastructure.Identity.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); modelBuilder.Entity("CleanArchitecture.Domain.Entities.TodoList", b => - { - b.Navigation("Items"); - }); + { + b.Navigation("Items"); + }); #pragma warning restore 612, 618 } } diff --git a/src/Infrastructure/DependencyInjection.cs b/src/Infrastructure/DependencyInjection.cs index ecd89851a..30101c1cf 100644 --- a/src/Infrastructure/DependencyInjection.cs +++ b/src/Infrastructure/DependencyInjection.cs @@ -31,8 +31,8 @@ public static void AddInfrastructureServices(this IHostApplicationBuilder builde #else options.UseSqlServer(connectionString).AddAsyncSeeding(sp); #endif - }); - + }); + #if (UseAspire) #if (UsePostgreSQL) builder.EnrichNpgsqlDbContext(); @@ -40,7 +40,7 @@ public static void AddInfrastructureServices(this IHostApplicationBuilder builde builder.EnrichSqlServerDbContext(); #endif #endif - + builder.Services.AddScoped(provider => provider.GetRequiredService()); builder.Services.AddScoped(); diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index cabceede6..faff691af 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -10,10 +10,6 @@ - - - - diff --git a/src/Web/ClientApp/proxy.conf.js b/src/Web/ClientApp/proxy.conf.js index 7550b100a..f6126bfd3 100644 --- a/src/Web/ClientApp/proxy.conf.js +++ b/src/Web/ClientApp/proxy.conf.js @@ -7,6 +7,8 @@ const PROXY_CONFIG = [ { context: [ "/api", + "/scalar", + "/openapi", "/Identity", "/weatherforecast", "/WeatherForecast" diff --git a/src/Web/ClientApp/src/app/nav-menu/nav-menu.component.html b/src/Web/ClientApp/src/app/nav-menu/nav-menu.component.html index b6d2d3991..e722cb2df 100644 --- a/src/Web/ClientApp/src/app/nav-menu/nav-menu.component.html +++ b/src/Web/ClientApp/src/app/nav-menu/nav-menu.component.html @@ -31,7 +31,7 @@ Todo
  • - API + Scalar
  • Account diff --git a/src/Web/DependencyInjection.cs b/src/Web/DependencyInjection.cs index afb948896..5ae4a6b48 100644 --- a/src/Web/DependencyInjection.cs +++ b/src/Web/DependencyInjection.cs @@ -3,10 +3,10 @@ using CleanArchitecture.Infrastructure.Data; using CleanArchitecture.Web.Services; using Microsoft.AspNetCore.Mvc; - #if (UseApiOnly) -using NSwag; -using NSwag.Generation.Processors.Security; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.OpenApi; +using Microsoft.OpenApi.Models; #endif namespace Microsoft.Extensions.DependencyInjection; @@ -37,23 +37,14 @@ public static void AddWebServices(this IHostApplicationBuilder builder) builder.Services.AddEndpointsApiExplorer(); - builder.Services.AddOpenApiDocument((configure, sp) => +#if (!UseApiOnly) + builder.Services.AddOpenApi(); +#else + builder.Services.AddOpenApi(options => { - configure.Title = "CleanArchitecture API"; - -#if (UseApiOnly) - // Add JWT - configure.AddSecurity("JWT", Enumerable.Empty(), new OpenApiSecurityScheme - { - Type = OpenApiSecuritySchemeType.ApiKey, - Name = "Authorization", - In = OpenApiSecurityApiKeyLocation.Header, - Description = "Type into the textbox: Bearer {your JWT token}." - }); - - configure.OperationProcessors.Add(new AspNetCoreOperationSecurityScopeProcessor("JWT")); -#endif + options.AddDocumentTransformer(); }); +#endif } public static void AddKeyVaultIfConfigured(this IHostApplicationBuilder builder) @@ -67,3 +58,28 @@ public static void AddKeyVaultIfConfigured(this IHostApplicationBuilder builder) } } } + +#if (UseApiOnly) +internal sealed class BearerSecuritySchemeTransformer(IAuthenticationSchemeProvider authenticationSchemeProvider) : IOpenApiDocumentTransformer +{ + public async Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerContext context, CancellationToken cancellationToken) + { + var authenticationSchemes = await authenticationSchemeProvider.GetAllSchemesAsync(); + if (authenticationSchemes.Any(authScheme => authScheme.Name == "Bearer")) + { + var requirements = new Dictionary + { + ["Bearer"] = new OpenApiSecurityScheme + { + Type = SecuritySchemeType.Http, + Scheme = "bearer", // "bearer" refers to the header name here + In = ParameterLocation.Header, + BearerFormat = "Json Web Token" + } + }; + document.Components ??= new OpenApiComponents(); + document.Components.SecuritySchemes = requirements; + } + } +} +#endif diff --git a/src/Web/Endpoints/TodoItems.cs b/src/Web/Endpoints/TodoItems.cs index 26b855d17..783433d3e 100644 --- a/src/Web/Endpoints/TodoItems.cs +++ b/src/Web/Endpoints/TodoItems.cs @@ -21,13 +21,21 @@ public override void Map(WebApplication app) .MapDelete(DeleteTodoItem, "{id}"); } - public async Task>> GetTodoItemsWithPagination(ISender sender, [AsParameters] GetTodoItemsWithPaginationQuery query) + [EndpointName(nameof(GetTodoItemsWithPagination))] + [EndpointSummary("Get Todo Items with Pagination")] + [EndpointDescription("Retrieves a paginated list of todo items based on the provided query parameters.")] + public async Task>> GetTodoItemsWithPagination( + ISender sender, + [AsParameters] GetTodoItemsWithPaginationQuery query) { var result = await sender.Send(query); return TypedResults.Ok(result); } + [EndpointName(nameof(CreateTodoItem))] + [EndpointSummary("Create a new Todo Item")] + [EndpointDescription("Creates a new todo item using the provided details and returns the ID of the created item.")] public async Task> CreateTodoItem(ISender sender, CreateTodoItemCommand command) { var id = await sender.Send(command); @@ -35,24 +43,35 @@ public async Task> CreateTodoItem(ISender sender, CreateTodoItemCom return TypedResults.Created($"/{nameof(TodoItems)}/{id}", id); } + [EndpointName(nameof(UpdateTodoItem))] + [EndpointSummary("Update a Todo Item")] + [EndpointDescription("Updates the specified todo item. The ID in the URL must match the ID in the payload.")] public async Task> UpdateTodoItem(ISender sender, int id, UpdateTodoItemCommand command) { - if (id != command.Id) return TypedResults.BadRequest(); + if (id != command.Id) + return TypedResults.BadRequest(); await sender.Send(command); return TypedResults.NoContent(); } + [EndpointName(nameof(UpdateTodoItemDetail))] + [EndpointSummary("Update Todo Item Details")] + [EndpointDescription("Updates the detail fields of a specific todo item. The ID in the URL must match the ID in the payload.")] public async Task> UpdateTodoItemDetail(ISender sender, int id, UpdateTodoItemDetailCommand command) { - if (id != command.Id) return TypedResults.BadRequest(); - + if (id != command.Id) + return TypedResults.BadRequest(); + await sender.Send(command); - + return TypedResults.NoContent(); } + [EndpointName(nameof(DeleteTodoItem))] + [EndpointSummary("Delete a Todo Item")] + [EndpointDescription("Deletes the todo item with the specified ID.")] public async Task DeleteTodoItem(ISender sender, int id) { await sender.Send(new DeleteTodoItemCommand(id)); diff --git a/src/Web/Endpoints/TodoLists.cs b/src/Web/Endpoints/TodoLists.cs index 65a06018b..dddccd007 100644 --- a/src/Web/Endpoints/TodoLists.cs +++ b/src/Web/Endpoints/TodoLists.cs @@ -18,6 +18,9 @@ public override void Map(WebApplication app) .MapDelete(DeleteTodoList, "{id}"); } + [EndpointName(nameof(GetTodoLists))] + [EndpointSummary("Get all Todo Lists")] + [EndpointDescription("Retrieves all todo lists along with their items.")] public async Task> GetTodoLists(ISender sender) { var vm = await sender.Send(new GetTodosQuery()); @@ -25,6 +28,9 @@ public async Task> GetTodoLists(ISender sender) return TypedResults.Ok(vm); } + [EndpointName(nameof(CreateTodoList))] + [EndpointSummary("Create a new Todo List")] + [EndpointDescription("Creates a new todo list using the provided details and returns the ID of the created list.")] public async Task> CreateTodoList(ISender sender, CreateTodoListCommand command) { var id = await sender.Send(command); @@ -32,15 +38,22 @@ public async Task> CreateTodoList(ISender sender, CreateTodoListCom return TypedResults.Created($"/{nameof(TodoLists)}/{id}", id); } + [EndpointName(nameof(UpdateTodoList))] + [EndpointSummary("Update a Todo List")] + [EndpointDescription("Updates the specified todo list. The ID in the URL must match the ID in the payload.")] public async Task> UpdateTodoList(ISender sender, int id, UpdateTodoListCommand command) { - if (id != command.Id) return TypedResults.BadRequest(); - + if (id != command.Id) + return TypedResults.BadRequest(); + await sender.Send(command); return TypedResults.NoContent(); } + [EndpointName(nameof(DeleteTodoList))] + [EndpointSummary("Delete a Todo List")] + [EndpointDescription("Deletes the todo list with the specified ID.")] public async Task DeleteTodoList(ISender sender, int id) { await sender.Send(new DeleteTodoListCommand(id)); diff --git a/src/Web/Endpoints/WeatherForecasts.cs b/src/Web/Endpoints/WeatherForecasts.cs index 343adebc7..95d3cba07 100644 --- a/src/Web/Endpoints/WeatherForecasts.cs +++ b/src/Web/Endpoints/WeatherForecasts.cs @@ -12,10 +12,13 @@ public override void Map(WebApplication app) .MapGet(GetWeatherForecasts); } + [EndpointName(nameof(GetWeatherForecasts))] + [EndpointSummary("Get Weather Forecasts")] + [EndpointDescription("Retrieves a list of weather forecasts for the next few days.")] public async Task>> GetWeatherForecasts(ISender sender) { var forecasts = await sender.Send(new GetWeatherForecastsQuery()); - + return TypedResults.Ok(forecasts); } -} \ No newline at end of file +} diff --git a/src/Web/Infrastructure/WebApplicationExtensions.cs b/src/Web/Infrastructure/WebApplicationExtensions.cs index 89c8fde0d..3b624b71e 100644 --- a/src/Web/Infrastructure/WebApplicationExtensions.cs +++ b/src/Web/Infrastructure/WebApplicationExtensions.cs @@ -9,9 +9,7 @@ public static RouteGroupBuilder MapGroup(this WebApplication app, EndpointGroupB var groupName = group.GetType().Name; return app - .MapGroup($"/api/{groupName}") - .WithGroupName(groupName) - .WithTags(groupName); + .MapGroup($"/api/{groupName}"); } public static WebApplication MapEndpoints(this WebApplication app) diff --git a/src/Web/Program.cs b/src/Web/Program.cs index a8281cb27..dfb404188 100644 --- a/src/Web/Program.cs +++ b/src/Web/Program.cs @@ -1,4 +1,5 @@ using CleanArchitecture.Infrastructure.Data; +using Scalar.AspNetCore; var builder = WebApplication.CreateBuilder(args); @@ -30,11 +31,7 @@ app.UseHttpsRedirection(); app.UseStaticFiles(); -app.UseSwaggerUi(settings => -{ - settings.Path = "/api"; - settings.DocumentPath = "/api/specification.json"; -}); +app.MapScalarApiReference(); #if (!UseApiOnly) app.MapRazorPages(); diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 843caa237..dacb0e26c 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -8,6 +8,8 @@ CleanArchitecture.Web CleanArchitecture.Web + .\wwwroot\openapi\ + --file-name v1 @@ -30,18 +32,18 @@ false - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -67,16 +69,7 @@ OnBuildSuccess - - - - - - - - - - + diff --git a/src/Web/appsettings.json b/src/Web/appsettings.json index d9d9a9bff..e37898bf1 100644 --- a/src/Web/appsettings.json +++ b/src/Web/appsettings.json @@ -1,4 +1,7 @@ { + "ConnectionStrings": { + "CleanArchitectureDb": "Server=(localdb)\\mssqllocaldb;Database=CleanArchitectureDb;Trusted_Connection=True;MultipleActiveResultSets=true" + }, "Logging": { "LogLevel": { "Default": "Information", diff --git a/src/Web/wwwroot/openapi/v1.json b/src/Web/wwwroot/openapi/v1.json new file mode 100644 index 000000000..565bec778 --- /dev/null +++ b/src/Web/wwwroot/openapi/v1.json @@ -0,0 +1,1159 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "CleanArchitecture.Web | v1", + "version": "1.0.0" + }, + "paths": { + "/api/TodoItems": { + "get": { + "tags": [ + "TodoItems" + ], + "summary": "Get Todo Items with Pagination", + "description": "Retrieves a paginated list of todo items based on the provided query parameters.", + "operationId": "GetTodoItemsWithPagination", + "parameters": [ + { + "name": "ListId", + "in": "query", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageNumber", + "in": "query", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "PageSize", + "in": "query", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PaginatedListOfTodoItemBriefDto" + } + } + } + } + } + }, + "post": { + "tags": [ + "TodoItems" + ], + "summary": "Create a new Todo Item", + "description": "Creates a new todo item using the provided details and returns the ID of the created item.", + "operationId": "CreateTodoItem", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateTodoItemCommand" + } + } + }, + "required": true + }, + "responses": { + "201": { + "description": "Created", + "content": { + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/TodoItems/{id}": { + "put": { + "tags": [ + "TodoItems" + ], + "summary": "Update a Todo Item", + "description": "Updates the specified todo item. The ID in the URL must match the ID in the payload.", + "operationId": "UpdateTodoItem", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UpdateTodoItemCommand" + } + } + }, + "required": true + }, + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request" + } + } + }, + "delete": { + "tags": [ + "TodoItems" + ], + "summary": "Delete a Todo Item", + "description": "Deletes the todo item with the specified ID.", + "operationId": "DeleteTodoItem", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "204": { + "description": "No Content" + } + } + } + }, + "/api/TodoItems/UpdateDetail/{id}": { + "put": { + "tags": [ + "TodoItems" + ], + "summary": "Update Todo Item Details", + "description": "Updates the detail fields of a specific todo item. The ID in the URL must match the ID in the payload.", + "operationId": "UpdateTodoItemDetail", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UpdateTodoItemDetailCommand" + } + } + }, + "required": true + }, + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request" + } + } + } + }, + "/api/TodoLists": { + "get": { + "tags": [ + "TodoLists" + ], + "summary": "Get all Todo Lists", + "description": "Retrieves all todo lists along with their items.", + "operationId": "GetTodoLists", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TodosVm" + } + } + } + } + } + }, + "post": { + "tags": [ + "TodoLists" + ], + "summary": "Create a new Todo List", + "description": "Creates a new todo list using the provided details and returns the ID of the created list.", + "operationId": "CreateTodoList", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateTodoListCommand" + } + } + }, + "required": true + }, + "responses": { + "201": { + "description": "Created", + "content": { + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/TodoLists/{id}": { + "put": { + "tags": [ + "TodoLists" + ], + "summary": "Update a Todo List", + "description": "Updates the specified todo list. The ID in the URL must match the ID in the payload.", + "operationId": "UpdateTodoList", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UpdateTodoListCommand" + } + } + }, + "required": true + }, + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request" + } + } + }, + "delete": { + "tags": [ + "TodoLists" + ], + "summary": "Delete a Todo List", + "description": "Deletes the todo list with the specified ID.", + "operationId": "DeleteTodoList", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "204": { + "description": "No Content" + } + } + } + }, + "/api/Users/register": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegisterRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + } + } + } + }, + "/api/Users/login": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "parameters": [ + { + "name": "useCookies", + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "useSessionCookies", + "in": "query", + "schema": { + "type": "boolean" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LoginRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessTokenResponse" + } + } + } + } + } + } + }, + "/api/Users/refresh": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RefreshRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessTokenResponse" + } + } + } + } + } + } + }, + "/api/Users/confirmEmail": { + "get": { + "tags": [ + "CleanArchitecture.Web" + ], + "operationId": "MapIdentityApi-/api/Users/confirmEmail", + "parameters": [ + { + "name": "userId", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "code", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "changedEmail", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/api/Users/resendConfirmationEmail": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ResendConfirmationEmailRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/api/Users/forgotPassword": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ForgotPasswordRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + } + } + } + }, + "/api/Users/resetPassword": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ResetPasswordRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + } + } + } + }, + "/api/Users/manage/2fa": { + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TwoFactorRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TwoFactorResponse" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/api/Users/manage/info": { + "get": { + "tags": [ + "CleanArchitecture.Web" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/InfoResponse" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + }, + "post": { + "tags": [ + "CleanArchitecture.Web" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/InfoRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/InfoResponse" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "application/problem+json": { + "schema": { + "$ref": "#/components/schemas/HttpValidationProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/api/WeatherForecasts": { + "get": { + "tags": [ + "WeatherForecasts" + ], + "summary": "Get Weather Forecasts", + "description": "Retrieves a list of weather forecasts for the next few days.", + "operationId": "GetWeatherForecasts", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/WeatherForecast" + } + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "AccessTokenResponse": { + "required": [ + "accessToken", + "expiresIn", + "refreshToken" + ], + "type": "object", + "properties": { + "tokenType": { + "type": "string", + "nullable": true + }, + "accessToken": { + "type": "string" + }, + "expiresIn": { + "type": "integer", + "format": "int64" + }, + "refreshToken": { + "type": "string" + } + } + }, + "CreateTodoItemCommand": { + "type": "object", + "properties": { + "listId": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + } + } + }, + "CreateTodoListCommand": { + "type": "object", + "properties": { + "title": { + "type": "string", + "nullable": true + } + } + }, + "ForgotPasswordRequest": { + "required": [ + "email" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + } + } + }, + "HttpValidationProblemDetails": { + "type": "object", + "properties": { + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + }, + "errors": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "InfoRequest": { + "type": "object", + "properties": { + "newEmail": { + "type": "string", + "nullable": true + }, + "newPassword": { + "type": "string", + "nullable": true + }, + "oldPassword": { + "type": "string", + "nullable": true + } + } + }, + "InfoResponse": { + "required": [ + "email", + "isEmailConfirmed" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "isEmailConfirmed": { + "type": "boolean" + } + } + }, + "LoginRequest": { + "required": [ + "email", + "password" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "password": { + "type": "string" + }, + "twoFactorCode": { + "type": "string", + "nullable": true + }, + "twoFactorRecoveryCode": { + "type": "string", + "nullable": true + } + } + }, + "LookupDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + } + } + }, + "PaginatedListOfTodoItemBriefDto": { + "required": [ + "items", + "pageNumber" + ], + "type": "object", + "properties": { + "items": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TodoItemBriefDto" + } + }, + "pageNumber": { + "type": "integer", + "format": "int32" + }, + "totalPages": { + "type": "integer", + "format": "int32" + }, + "totalCount": { + "type": "integer", + "format": "int32" + }, + "hasPreviousPage": { + "type": "boolean" + }, + "hasNextPage": { + "type": "boolean" + } + } + }, + "PriorityLevel": { + "type": "integer" + }, + "RefreshRequest": { + "required": [ + "refreshToken" + ], + "type": "object", + "properties": { + "refreshToken": { + "type": "string" + } + } + }, + "RegisterRequest": { + "required": [ + "email", + "password" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "password": { + "type": "string" + } + } + }, + "ResendConfirmationEmailRequest": { + "required": [ + "email" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + } + } + }, + "ResetPasswordRequest": { + "required": [ + "email", + "resetCode", + "newPassword" + ], + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "resetCode": { + "type": "string" + }, + "newPassword": { + "type": "string" + } + } + }, + "TodoItemBriefDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "listId": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "done": { + "type": "boolean" + } + } + }, + "TodoItemDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "listId": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "done": { + "type": "boolean" + }, + "priority": { + "type": "integer", + "format": "int32" + }, + "note": { + "type": "string", + "nullable": true + } + } + }, + "TodoListDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "colour": { + "type": "string", + "nullable": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TodoItemDto" + } + } + } + }, + "TodosVm": { + "type": "object", + "properties": { + "priorityLevels": { + "type": "array", + "items": { + "$ref": "#/components/schemas/LookupDto" + } + }, + "lists": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TodoListDto" + } + } + } + }, + "TwoFactorRequest": { + "type": "object", + "properties": { + "enable": { + "type": "boolean", + "nullable": true + }, + "twoFactorCode": { + "type": "string", + "nullable": true + }, + "resetSharedKey": { + "type": "boolean" + }, + "resetRecoveryCodes": { + "type": "boolean" + }, + "forgetMachine": { + "type": "boolean" + } + } + }, + "TwoFactorResponse": { + "required": [ + "sharedKey", + "recoveryCodesLeft", + "isTwoFactorEnabled", + "isMachineRemembered" + ], + "type": "object", + "properties": { + "sharedKey": { + "type": "string" + }, + "recoveryCodesLeft": { + "type": "integer", + "format": "int32" + }, + "recoveryCodes": { + "type": "array", + "items": { + "type": "string" + }, + "nullable": true + }, + "isTwoFactorEnabled": { + "type": "boolean" + }, + "isMachineRemembered": { + "type": "boolean" + } + } + }, + "UpdateTodoItemCommand": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + }, + "done": { + "type": "boolean" + } + } + }, + "UpdateTodoItemDetailCommand": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "listId": { + "type": "integer", + "format": "int32" + }, + "priority": { + "$ref": "#/components/schemas/PriorityLevel" + }, + "note": { + "type": "string", + "nullable": true + } + } + }, + "UpdateTodoListCommand": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "title": { + "type": "string", + "nullable": true + } + } + }, + "WeatherForecast": { + "type": "object", + "properties": { + "date": { + "type": "string", + "format": "date-time" + }, + "temperatureC": { + "type": "integer", + "format": "int32" + }, + "temperatureF": { + "type": "integer", + "format": "int32" + }, + "summary": { + "type": "string", + "nullable": true + } + } + } + } + }, + "tags": [ + { + "name": "TodoItems" + }, + { + "name": "TodoLists" + }, + { + "name": "CleanArchitecture.Web" + }, + { + "name": "WeatherForecasts" + } + ] +} \ No newline at end of file