diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1e725f654..fb4f1ff4f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -40,6 +40,7 @@
+
@@ -89,4 +90,4 @@
-
\ No newline at end of file
+
diff --git a/src/ClientApp/Models/Orders/CardType.cs b/src/ClientApp/Models/Orders/CardType.cs
deleted file mode 100644
index 6534ffbc3..000000000
--- a/src/ClientApp/Models/Orders/CardType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace eShop.ClientApp.Models.Orders;
-
-public class CardType
-{
- public int Id { get; set; }
- public string Name { get; set; }
-}
diff --git a/src/ClientApp/Models/Orders/Order.cs b/src/ClientApp/Models/Orders/Order.cs
index ab8a6fd4f..548a4ea99 100644
--- a/src/ClientApp/Models/Orders/Order.cs
+++ b/src/ClientApp/Models/Orders/Order.cs
@@ -32,15 +32,8 @@ public Order()
[JsonPropertyName("zipCode")] public string ShippingZipCode { get; set; }
- public int CardTypeId { get; set; }
-
- public string CardNumber { get; set; }
-
- public string CardHolderName { get; set; }
-
- public DateTime CardExpiration { get; set; }
-
- public string CardSecurityNumber { get; set; }
+ [JsonPropertyName("paymentToken")]
+ public string PaymentToken { get; set; }
[JsonPropertyName("items")]
public List OrderItems { get; set; }
diff --git a/src/ClientApp/Models/Orders/OrderCheckout.cs b/src/ClientApp/Models/Orders/OrderCheckout.cs
index 344064e8d..ba6130939 100644
--- a/src/ClientApp/Models/Orders/OrderCheckout.cs
+++ b/src/ClientApp/Models/Orders/OrderCheckout.cs
@@ -16,17 +16,7 @@ public class OrderCheckout
public string ZipCode { get; set; }
[Required]
- public string CardNumber { get; set; }
- [Required]
- public string CardHolderName { get; set; }
-
- [Required]
- public DateTime CardExpiration { get; set; }
-
- [Required]
- public string CardSecurityNumber { get; set; }
-
- public int CardTypeId { get; set; }
+ public string PaymentToken { get; set; }
public string Buyer { get; set; }
diff --git a/src/ClientApp/Models/User/PaymentInfo.cs b/src/ClientApp/Models/User/PaymentInfo.cs
deleted file mode 100644
index f46841ac7..000000000
--- a/src/ClientApp/Models/User/PaymentInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using eShop.ClientApp.Models.Orders;
-
-namespace eShop.ClientApp.Models.User;
-
-public class PaymentInfo
-{
- public Guid Id { get; set; }
- public string CardNumber { get; set; }
- public string SecurityNumber { get; set; }
- public int ExpirationMonth { get; set; }
- public int ExpirationYear { get; set; }
- public string CardHolderName { get; set; }
- public CardType CardType { get; set; }
- public string Expiration { get; set; }
-}
diff --git a/src/ClientApp/Models/User/UserInfo.cs b/src/ClientApp/Models/User/UserInfo.cs
index b98be38db..6b7ed802d 100644
--- a/src/ClientApp/Models/User/UserInfo.cs
+++ b/src/ClientApp/Models/User/UserInfo.cs
@@ -13,13 +13,6 @@ public class UserInfo
[JsonPropertyName("last_name")] public string LastName { get; set; }
- [JsonPropertyName("card_number")] public string CardNumber { get; set; }
-
- [JsonPropertyName("card_holder")] public string CardHolder { get; set; }
-
- [JsonPropertyName("card_security_number")]
- public string CardSecurityNumber { get; set; }
-
[JsonPropertyName("address_city")] public string Address { get; set; }
[JsonPropertyName("address_country")] public string Country { get; set; }
diff --git a/src/ClientApp/Services/Identity/IdentityMockService.cs b/src/ClientApp/Services/Identity/IdentityMockService.cs
index 4e06f6f79..981c650cd 100644
--- a/src/ClientApp/Services/Identity/IdentityMockService.cs
+++ b/src/ClientApp/Services/Identity/IdentityMockService.cs
@@ -31,9 +31,6 @@ public Task GetUserInfoAsync()
PreferredUsername = "sampleUser",
Name = "Sample",
LastName = "User",
- CardNumber = "XXXXXXXXXXXX3456",
- CardHolder = "Sample User",
- CardSecurityNumber = "123",
Address = "123 Sample Street",
Country = "USA",
State = "Washington",
diff --git a/src/ClientApp/Services/Identity/IdentityService.cs b/src/ClientApp/Services/Identity/IdentityService.cs
index 086759e26..dd3277b72 100644
--- a/src/ClientApp/Services/Identity/IdentityService.cs
+++ b/src/ClientApp/Services/Identity/IdentityService.cs
@@ -82,10 +82,6 @@ public async Task GetUserInfoAsync()
userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "preferred_username")?.Value,
Name = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "name")?.Value,
LastName = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "last_name")?.Value,
- CardNumber = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_number")?.Value,
- CardHolder = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_holder")?.Value,
- CardSecurityNumber =
- userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_security_number")?.Value,
PhoneNumberVerified =
bool.Parse(userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "phone_number_verified")
?.Value ?? "false"),
diff --git a/src/ClientApp/Services/Order/OrderMockService.cs b/src/ClientApp/Services/Order/OrderMockService.cs
index f18219415..4a8f41247 100644
--- a/src/ClientApp/Services/Order/OrderMockService.cs
+++ b/src/ClientApp/Services/Order/OrderMockService.cs
@@ -1,12 +1,11 @@
using eShop.ClientApp.Models.Basket;
using eShop.ClientApp.Models.Orders;
-using eShop.ClientApp.Models.User;
namespace eShop.ClientApp.Services.Order;
public class OrderMockService : IOrderService
{
- private static readonly DateTime MockExpirationDate = DateTime.Now.AddYears(5);
+ private const string MockPaymentToken = "pm_mock_mobile";
private static readonly Address MockAdress = new()
{
@@ -22,22 +21,6 @@ public class OrderMockService : IOrderService
ZipCode = "98101"
};
- private static readonly PaymentInfo MockPaymentInfo = new()
- {
- Id = Guid.NewGuid(),
- CardHolderName = "American Express",
- CardNumber = "XXXXXXXXXXXX0005",
- CardType = new CardType
- {
- Id = 3,
- Name = "MasterCard"
- },
- Expiration = MockExpirationDate.ToString(),
- ExpirationMonth = MockExpirationDate.Month,
- ExpirationYear = MockExpirationDate.Year,
- SecurityNumber = "123"
- };
-
private static readonly List MockOrderItems = new()
{
new OrderItem
@@ -64,11 +47,7 @@ public class OrderMockService : IOrderService
private static readonly OrderCheckout MockOrderCheckout = new()
{
- CardExpiration = DateTime.UtcNow,
- CardHolderName = "FakeCardHolderName",
- CardNumber = "XXXXXXXXXXXX3224",
- CardSecurityNumber = "1234",
- CardTypeId = 1,
+ PaymentToken = MockPaymentToken,
City = "FakeCity",
Country = "FakeCountry",
ZipCode = "FakeZipCode",
@@ -84,11 +63,7 @@ public class OrderMockService : IOrderService
OrderDate = DateTime.Now,
OrderStatus = "Submitted",
OrderItems = MockOrderItems,
- CardTypeId = MockPaymentInfo.CardType.Id,
- CardHolderName = MockPaymentInfo.CardHolderName,
- CardNumber = MockPaymentInfo.CardNumber,
- CardSecurityNumber = MockPaymentInfo.SecurityNumber,
- CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1),
+ PaymentToken = MockPaymentToken,
ShippingCity = MockAdress.City,
ShippingState = MockAdress.State,
ShippingCountry = MockAdress.Country,
@@ -102,11 +77,7 @@ public class OrderMockService : IOrderService
OrderDate = DateTime.Now,
OrderStatus = "Paid",
OrderItems = MockOrderItems,
- CardTypeId = MockPaymentInfo.CardType.Id,
- CardHolderName = MockPaymentInfo.CardHolderName,
- CardNumber = MockPaymentInfo.CardNumber,
- CardSecurityNumber = MockPaymentInfo.SecurityNumber,
- CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1),
+ PaymentToken = MockPaymentToken,
ShippingCity = MockAdress.City,
ShippingState = MockAdress.State,
ShippingCountry = MockAdress.Country,
@@ -120,11 +91,7 @@ public class OrderMockService : IOrderService
OrderDate = DateTime.Now,
OrderStatus = "Cancelled",
OrderItems = MockOrderItems,
- CardTypeId = MockPaymentInfo.CardType.Id,
- CardHolderName = MockPaymentInfo.CardHolderName,
- CardNumber = MockPaymentInfo.CardNumber,
- CardSecurityNumber = MockPaymentInfo.SecurityNumber,
- CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1),
+ PaymentToken = MockPaymentToken,
ShippingCity = MockAdress.City,
ShippingState = MockAdress.State,
ShippingCountry = MockAdress.Country,
@@ -138,11 +105,7 @@ public class OrderMockService : IOrderService
OrderDate = DateTime.Now,
OrderStatus = "Shipped",
OrderItems = MockOrderItems,
- CardTypeId = MockPaymentInfo.CardType.Id,
- CardHolderName = MockPaymentInfo.CardHolderName,
- CardNumber = MockPaymentInfo.CardNumber,
- CardSecurityNumber = MockPaymentInfo.SecurityNumber,
- CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1),
+ PaymentToken = MockPaymentToken,
ShippingCity = MockAdress.City,
ShippingState = MockAdress.State,
ShippingCountry = MockAdress.Country,
diff --git a/src/ClientApp/Services/Order/OrderService.cs b/src/ClientApp/Services/Order/OrderService.cs
index d7f6a9887..0fc34f850 100644
--- a/src/ClientApp/Services/Order/OrderService.cs
+++ b/src/ClientApp/Services/Order/OrderService.cs
@@ -113,11 +113,7 @@ public OrderCheckout MapOrderToBasket(Models.Orders.Order order)
{
return new OrderCheckout
{
- CardExpiration = order.CardExpiration,
- CardHolderName = order.CardHolderName,
- CardNumber = order.CardNumber,
- CardSecurityNumber = order.CardSecurityNumber,
- CardTypeId = order.CardTypeId,
+ PaymentToken = order.PaymentToken,
City = order.ShippingCity,
State = order.ShippingState,
Country = order.ShippingCountry,
diff --git a/src/ClientApp/ViewModels/CheckoutViewModel.cs b/src/ClientApp/ViewModels/CheckoutViewModel.cs
index b02c5f3e9..9a8cde642 100644
--- a/src/ClientApp/ViewModels/CheckoutViewModel.cs
+++ b/src/ClientApp/ViewModels/CheckoutViewModel.cs
@@ -55,15 +55,6 @@ await IsBusyFor(
City = userInfo?.Address
};
- // Create Payment Info
- var paymentInfo = new PaymentInfo
- {
- CardNumber = userInfo?.CardNumber,
- CardHolderName = userInfo?.CardHolder,
- CardType = new CardType {Id = 3, Name = "MasterCard"},
- SecurityNumber = userInfo?.CardSecurityNumber
- };
-
var orderItems = CreateOrderItems(basketItems);
// Create new Order
@@ -76,11 +67,7 @@ await IsBusyFor(
OrderItems = orderItems,
OrderStatus = "Submitted",
OrderDate = DateTime.Now,
- CardHolderName = paymentInfo.CardHolderName,
- CardNumber = paymentInfo.CardNumber,
- CardSecurityNumber = paymentInfo.SecurityNumber,
- CardExpiration = DateTime.UtcNow.AddYears(5),
- CardTypeId = paymentInfo.CardType.Id,
+ PaymentToken = "pm_sample_mobile",
ShippingState = ShippingAddress.State,
ShippingCountry = ShippingAddress.Country,
ShippingStreet = ShippingAddress.Street,
diff --git a/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs
new file mode 100644
index 000000000..e83596029
--- /dev/null
+++ b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs
@@ -0,0 +1,304 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using eShop.Identity.API.Data;
+
+#nullable disable
+
+namespace Identity.API.Data.Migrations;
+
+[DbContext(typeof(ApplicationDbContext))]
+[Migration("20261117125859_RemoveSensitiveCardProfileData")]
+partial class _20261117125859_RemoveSensitiveCardProfileData
+{
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasDatabaseName("RoleNameIndex");
+
+ b.ToTable("AspNetRoles");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id);
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetRoleClaims");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id);
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserClaims");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("ProviderKey")
+ .HasColumnType("text");
+
+ b.Property("ProviderDisplayName")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("LoginProvider", "ProviderKey");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserLogins");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "RoleId");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetUserRoles");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.Property("Value")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "LoginProvider", "Name");
+
+ b.ToTable("AspNetUserTokens");
+ });
+
+ modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("AccessFailedCount")
+ .HasColumnType("integer");
+
+ b.Property("City")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("Country")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("EmailConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("LastName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("LockoutEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("LockoutEnd")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("PasswordHash")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumber")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumberConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("SecurityStamp")
+ .HasColumnType("text");
+
+ b.Property("State")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Street")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("TwoFactorEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("ZipCode")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedEmail")
+ .HasDatabaseName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasDatabaseName("UserNameIndex");
+
+ b.ToTable("AspNetUsers");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.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("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+#pragma warning restore 612, 618
+ }
+}
diff --git a/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs
new file mode 100644
index 000000000..954adba51
--- /dev/null
+++ b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs
@@ -0,0 +1,72 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Identity.API.Data.Migrations;
+
+///
+public partial class _20261117125859_RemoveSensitiveCardProfileData : Migration
+{
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "CardHolderName",
+ table: "AspNetUsers");
+
+ migrationBuilder.DropColumn(
+ name: "CardNumber",
+ table: "AspNetUsers");
+
+ migrationBuilder.DropColumn(
+ name: "CardType",
+ table: "AspNetUsers");
+
+ migrationBuilder.DropColumn(
+ name: "Expiration",
+ table: "AspNetUsers");
+
+ migrationBuilder.DropColumn(
+ name: "SecurityNumber",
+ table: "AspNetUsers");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "CardHolderName",
+ table: "AspNetUsers",
+ type: "text",
+ nullable: false,
+ defaultValue: "");
+
+ migrationBuilder.AddColumn(
+ name: "CardNumber",
+ table: "AspNetUsers",
+ type: "text",
+ nullable: false,
+ defaultValue: "");
+
+ migrationBuilder.AddColumn(
+ name: "CardType",
+ table: "AspNetUsers",
+ type: "integer",
+ nullable: false,
+ defaultValue: 0);
+
+ migrationBuilder.AddColumn(
+ name: "Expiration",
+ table: "AspNetUsers",
+ type: "text",
+ nullable: false,
+ defaultValue: "");
+
+ migrationBuilder.AddColumn(
+ name: "SecurityNumber",
+ table: "AspNetUsers",
+ type: "text",
+ nullable: false,
+ defaultValue: "");
+ }
+}
diff --git a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs
index 92d3a0943..b276aca69 100644
--- a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,321 +1,306 @@
-//
+//
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using eShop.Identity.API.Data;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using eShop.Identity.API.Data;
#nullable disable
-namespace eShop.Identity.API.Data.Migrations
+namespace eShop.Identity.API.Data.Migrations;
+
+[DbContext(typeof(ApplicationDbContext))]
+partial class ApplicationDbContextModelSnapshot : ModelSnapshot
{
- [DbContext(typeof(ApplicationDbContext))]
- partial class ApplicationDbContextModelSnapshot : ModelSnapshot
+ // If you encounter a merge conflict in the line below, it means you need to
+ // discard one of the migration branches and recreate its migrations on top of
+ // the other branch. See https://aka.ms/efcore-docs-migrations-conflicts for more info.
+ public override string LastMigrationId => "20261117125859_RemoveSensitiveCardProfileData";
+
+ protected override void BuildModel(ModelBuilder modelBuilder)
{
- protected override void BuildModel(ModelBuilder modelBuilder)
- {
#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
+ modelBuilder
+ .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
- {
- b.Property("Id")
- .HasColumnType("text");
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("text");
+ b.Property("Name")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
- b.Property("Name")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
+ b.Property("NormalizedName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
- b.Property("NormalizedName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
+ b.HasKey("Id");
- b.HasKey("Id");
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasDatabaseName("RoleNameIndex");
- b.HasIndex("NormalizedName")
- .IsUnique()
- .HasDatabaseName("RoleNameIndex");
+ b.ToTable("AspNetRoles");
+ });
- b.ToTable("AspNetRoles", (string)null);
- });
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id);
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+ b.Property("ClaimType")
+ .HasColumnType("text");
- b.Property("ClaimType")
- .HasColumnType("text");
+ b.Property("ClaimValue")
+ .HasColumnType("text");
- b.Property("ClaimValue")
- .HasColumnType("text");
+ b.Property("RoleId")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("RoleId")
- .IsRequired()
- .HasColumnType("text");
+ b.HasKey("Id");
- b.HasKey("Id");
+ b.HasIndex("RoleId");
- b.HasIndex("RoleId");
+ b.ToTable("AspNetRoleClaims");
+ });
- b.ToTable("AspNetRoleClaims", (string)null);
- });
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id);
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+ b.Property("ClaimType")
+ .HasColumnType("text");
- b.Property("ClaimType")
- .HasColumnType("text");
+ b.Property("ClaimValue")
+ .HasColumnType("text");
- b.Property("ClaimValue")
- .HasColumnType("text");
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("text");
+ b.HasKey("Id");
- b.HasKey("Id");
+ b.HasIndex("UserId");
- b.HasIndex("UserId");
+ b.ToTable("AspNetUserClaims");
+ });
- b.ToTable("AspNetUserClaims", (string)null);
- });
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider")
+ .HasColumnType("text");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.Property("LoginProvider")
- .HasColumnType("text");
+ b.Property("ProviderKey")
+ .HasColumnType("text");
- b.Property("ProviderKey")
- .HasColumnType("text");
+ b.Property("ProviderDisplayName")
+ .HasColumnType("text");
- b.Property("ProviderDisplayName")
- .HasColumnType("text");
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("text");
+ b.HasKey("LoginProvider", "ProviderKey");
- b.HasKey("LoginProvider", "ProviderKey");
+ b.HasIndex("UserId");
- b.HasIndex("UserId");
+ b.ToTable("AspNetUserLogins");
+ });
- b.ToTable("AspNetUserLogins", (string)null);
- });
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
- {
- b.Property("UserId")
- .HasColumnType("text");
+ b.Property("RoleId")
+ .HasColumnType("text");
- b.Property("RoleId")
- .HasColumnType("text");
+ b.HasKey("UserId", "RoleId");
- b.HasKey("UserId", "RoleId");
+ b.HasIndex("RoleId");
- b.HasIndex("RoleId");
+ b.ToTable("AspNetUserRoles");
+ });
- b.ToTable("AspNetUserRoles", (string)null);
- });
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.Property("UserId")
- .HasColumnType("text");
+ b.Property("LoginProvider")
+ .HasColumnType("text");
- b.Property("LoginProvider")
- .HasColumnType("text");
+ b.Property("Name")
+ .HasColumnType("text");
- b.Property("Name")
- .HasColumnType("text");
+ b.Property("Value")
+ .HasColumnType("text");
- b.Property("Value")
- .HasColumnType("text");
+ b.HasKey("UserId", "LoginProvider", "Name");
- b.HasKey("UserId", "LoginProvider", "Name");
+ b.ToTable("AspNetUserTokens");
+ });
- b.ToTable("AspNetUserTokens", (string)null);
- });
+ modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
- modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b =>
- {
- b.Property("Id")
- .HasColumnType("text");
+ b.Property("AccessFailedCount")
+ .HasColumnType("integer");
- b.Property("AccessFailedCount")
- .HasColumnType("integer");
+ b.Property("City")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("CardHolderName")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
- b.Property("CardNumber")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("Country")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("CardType")
- .HasColumnType("integer");
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
- b.Property("City")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("EmailConfirmed")
+ .HasColumnType("boolean");
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("text");
+ b.Property("LastName")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("Country")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("LockoutEnabled")
+ .HasColumnType("boolean");
- b.Property("Email")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
+ b.Property("LockoutEnd")
+ .HasColumnType("timestamp with time zone");
- b.Property("EmailConfirmed")
- .HasColumnType("boolean");
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
- b.Property("Expiration")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
- b.Property("LastName")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
- b.Property("LockoutEnabled")
- .HasColumnType("boolean");
+ b.Property("PasswordHash")
+ .HasColumnType("text");
- b.Property("LockoutEnd")
- .HasColumnType("timestamp with time zone");
+ b.Property("PhoneNumber")
+ .HasColumnType("text");
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text");
+ b.Property("PhoneNumberConfirmed")
+ .HasColumnType("boolean");
- b.Property("NormalizedEmail")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
+ b.Property("SecurityStamp")
+ .HasColumnType("text");
- b.Property("NormalizedUserName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("PasswordHash")
- .HasColumnType("text");
-
- b.Property("PhoneNumber")
- .HasColumnType("text");
-
- b.Property("PhoneNumberConfirmed")
- .HasColumnType("boolean");
-
- b.Property("SecurityNumber")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("SecurityStamp")
- .HasColumnType("text");
-
- b.Property("State")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Street")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("TwoFactorEnabled")
- .HasColumnType("boolean");
-
- b.Property("UserName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("ZipCode")
- .IsRequired()
- .HasColumnType("text");
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedEmail")
- .HasDatabaseName("EmailIndex");
-
- b.HasIndex("NormalizedUserName")
- .IsUnique()
- .HasDatabaseName("UserNameIndex");
-
- b.ToTable("AspNetUsers", (string)null);
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.HasOne("eShop.Identity.API.Models.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("eShop.Identity.API.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
+ b.Property("State")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Street")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("TwoFactorEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("ZipCode")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedEmail")
+ .HasDatabaseName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasDatabaseName("UserNameIndex");
+
+ b.ToTable("AspNetUsers");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.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("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.HasOne("eShop.Identity.API.Models.ApplicationUser", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
#pragma warning restore 612, 618
- }
}
}
diff --git a/src/Identity.API/Identity.API.csproj b/src/Identity.API/Identity.API.csproj
index a98007a75..4e961f194 100644
--- a/src/Identity.API/Identity.API.csproj
+++ b/src/Identity.API/Identity.API.csproj
@@ -16,6 +16,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/src/Identity.API/Models/ApplicationUser.cs b/src/Identity.API/Models/ApplicationUser.cs
index 11a151a1f..40c390365 100644
--- a/src/Identity.API/Models/ApplicationUser.cs
+++ b/src/Identity.API/Models/ApplicationUser.cs
@@ -3,16 +3,6 @@
// Add profile data for application users by adding properties to the ApplicationUser class
public class ApplicationUser : IdentityUser
{
- [Required]
- public string CardNumber { get; set; }
- [Required]
- public string SecurityNumber { get; set; }
- [Required]
- [RegularExpression(@"(0[1-9]|1[0-2])\/[0-9]{2}", ErrorMessage = "Expiration should match a valid MM/YY value")]
- public string Expiration { get; set; }
- [Required]
- public string CardHolderName { get; set; }
- public int CardType { get; set; }
[Required]
public string Street { get; set; }
[Required]
diff --git a/src/Identity.API/Services/ProfileService.cs b/src/Identity.API/Services/ProfileService.cs
index f42a50fad..6c4341247 100644
--- a/src/Identity.API/Services/ProfileService.cs
+++ b/src/Identity.API/Services/ProfileService.cs
@@ -67,18 +67,6 @@ private IEnumerable GetClaimsFromUser(ApplicationUser user)
if (!string.IsNullOrWhiteSpace(user.LastName))
claims.Add(new Claim("last_name", user.LastName));
- if (!string.IsNullOrWhiteSpace(user.CardNumber))
- claims.Add(new Claim("card_number", user.CardNumber));
-
- if (!string.IsNullOrWhiteSpace(user.CardHolderName))
- claims.Add(new Claim("card_holder", user.CardHolderName));
-
- if (!string.IsNullOrWhiteSpace(user.SecurityNumber))
- claims.Add(new Claim("card_security_number", user.SecurityNumber));
-
- if (!string.IsNullOrWhiteSpace(user.Expiration))
- claims.Add(new Claim("card_expiration", user.Expiration));
-
if (!string.IsNullOrWhiteSpace(user.City))
claims.Add(new Claim("address_city", user.City));
diff --git a/src/Identity.API/UsersSeed.cs b/src/Identity.API/UsersSeed.cs
index 881cc097f..ea94ed15b 100644
--- a/src/Identity.API/UsersSeed.cs
+++ b/src/Identity.API/UsersSeed.cs
@@ -14,20 +14,15 @@ public async Task SeedAsync(ApplicationDbContext context)
UserName = "alice",
Email = "AliceSmith@email.com",
EmailConfirmed = true,
- CardHolderName = "Alice Smith",
- CardNumber = "XXXXXXXXXXXX1881",
- CardType = 1,
City = "Redmond",
Country = "U.S.",
- Expiration = "12/24",
Id = Guid.NewGuid().ToString(),
LastName = "Smith",
Name = "Alice",
PhoneNumber = "1234567890",
ZipCode = "98052",
State = "WA",
- Street = "15703 NE 61st Ct",
- SecurityNumber = "123"
+ Street = "15703 NE 61st Ct"
};
var result = await userManager.CreateAsync(alice, "Pass123$");
@@ -59,20 +54,15 @@ public async Task SeedAsync(ApplicationDbContext context)
UserName = "bob",
Email = "BobSmith@email.com",
EmailConfirmed = true,
- CardHolderName = "Bob Smith",
- CardNumber = "XXXXXXXXXXXX1881",
- CardType = 1,
City = "Redmond",
Country = "U.S.",
- Expiration = "12/24",
Id = Guid.NewGuid().ToString(),
LastName = "Smith",
Name = "Bob",
PhoneNumber = "1234567890",
ZipCode = "98052",
State = "WA",
- Street = "15703 NE 61st Ct",
- SecurityNumber = "456"
+ Street = "15703 NE 61st Ct"
};
var result = await userManager.CreateAsync(bob, "Pass123$");
diff --git a/src/Ordering.API/Apis/OrdersApi.cs b/src/Ordering.API/Apis/OrdersApi.cs
index b8c339cf8..b164b950a 100644
--- a/src/Ordering.API/Apis/OrdersApi.cs
+++ b/src/Ordering.API/Apis/OrdersApi.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Http.HttpResults;
-using CardType = eShop.Ordering.API.Application.Queries.CardType;
using Order = eShop.Ordering.API.Application.Queries.Order;
public static class OrdersApi
@@ -12,7 +11,6 @@ public static RouteGroupBuilder MapOrdersApiV1(this IEndpointRouteBuilder app)
api.MapPut("/ship", ShipOrderAsync);
api.MapGet("{orderId:int}", GetOrderAsync);
api.MapGet("/", GetOrdersByUserAsync);
- api.MapGet("/cardtypes", GetCardTypesAsync);
api.MapPost("/draft", CreateOrderDraftAsync);
api.MapPost("/", CreateOrderAsync);
@@ -97,12 +95,6 @@ public static async Task>> GetOrdersByUserAsync([As
return TypedResults.Ok(orders);
}
- public static async Task>> GetCardTypesAsync(IOrderQueries orderQueries)
- {
- var cardTypes = await orderQueries.GetCardTypesAsync();
- return TypedResults.Ok(cardTypes);
- }
-
public static async Task CreateOrderDraftAsync(CreateOrderDraftCommand command, [AsParameters] OrderServices services)
{
services.Logger.LogInformation(
@@ -121,36 +113,34 @@ public static async Task>> CreateOrderAsync(
[AsParameters] OrderServices services)
{
- //mask the credit card number
-
services.Logger.LogInformation(
"Sending command: {CommandName} - {IdProperty}: {CommandId}",
request.GetGenericTypeName(),
nameof(request.UserId),
- request.UserId); //don't log the request as it has CC number
+ request.UserId);
if (requestId == Guid.Empty)
{
- services.Logger.LogWarning("Invalid IntegrationEvent - RequestId is missing - {@IntegrationEvent}", request);
+ services.Logger.LogWarning(
+ "Invalid IntegrationEvent - RequestId is missing - UserId: {UserId}",
+ request.UserId);
return TypedResults.BadRequest("RequestId is missing.");
}
using (services.Logger.BeginScope(new List> { new("IdentifiedCommandId", requestId) }))
{
- var maskedCCNumber = request.CardNumber.Substring(request.CardNumber.Length - 4).PadLeft(request.CardNumber.Length, 'X');
var createOrderCommand = new CreateOrderCommand(request.Items, request.UserId, request.UserName, request.City, request.Street,
request.State, request.Country, request.ZipCode,
- maskedCCNumber, request.CardHolderName, request.CardExpiration,
- request.CardSecurityNumber, request.CardTypeId);
+ request.PaymentToken);
var requestCreateOrder = new IdentifiedCommand(createOrderCommand, requestId);
services.Logger.LogInformation(
- "Sending command: {CommandName} - {IdProperty}: {CommandId} ({@Command})",
+ "Sending command: {CommandName} - {IdProperty}: {CommandId} - RequestId: {RequestId}",
requestCreateOrder.GetGenericTypeName(),
- nameof(requestCreateOrder.Id),
- requestCreateOrder.Id,
- requestCreateOrder);
+ nameof(requestCreateOrder.Command.UserId),
+ requestCreateOrder.Command.UserId,
+ requestCreateOrder.Id);
var result = await services.Mediator.Send(requestCreateOrder);
@@ -176,10 +166,6 @@ public record CreateOrderRequest(
string State,
string Country,
string ZipCode,
- string CardNumber,
- string CardHolderName,
- DateTime CardExpiration,
- string CardSecurityNumber,
- int CardTypeId,
+ string PaymentToken,
string Buyer,
List Items);
diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs
index 61f46c124..3c95e9638 100644
--- a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs
+++ b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs
@@ -41,19 +41,7 @@ public class CreateOrderCommand
public string ZipCode { get; private set; }
[DataMember]
- public string CardNumber { get; private set; }
-
- [DataMember]
- public string CardHolderName { get; private set; }
-
- [DataMember]
- public DateTime CardExpiration { get; private set; }
-
- [DataMember]
- public string CardSecurityNumber { get; private set; }
-
- [DataMember]
- public int CardTypeId { get; private set; }
+ public string PaymentToken { get; private set; }
[DataMember]
public IEnumerable OrderItems => _orderItems;
@@ -64,8 +52,7 @@ public CreateOrderCommand()
}
public CreateOrderCommand(List basketItems, string userId, string userName, string city, string street, string state, string country, string zipcode,
- string cardNumber, string cardHolderName, DateTime cardExpiration,
- string cardSecurityNumber, int cardTypeId)
+ string paymentToken)
{
_orderItems = basketItems.ToOrderItemsDTO().ToList();
UserId = userId;
@@ -75,11 +62,7 @@ public CreateOrderCommand(List basketItems, string userId, string us
State = state;
Country = country;
ZipCode = zipcode;
- CardNumber = cardNumber;
- CardHolderName = cardHolderName;
- CardExpiration = cardExpiration;
- CardSecurityNumber = cardSecurityNumber;
- CardTypeId = cardTypeId;
+ PaymentToken = paymentToken;
}
}
diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
index 8a0365ee0..d3659ebd3 100644
--- a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
+++ b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
@@ -37,7 +37,7 @@ public async Task Handle(CreateOrderCommand message, CancellationToken can
// methods and constructor so validations, invariants and business logic
// make sure that consistency is preserved across the whole aggregate
var address = new Address(message.Street, message.City, message.State, message.Country, message.ZipCode);
- var order = new Order(message.UserId, message.UserName, address, message.CardTypeId, message.CardNumber, message.CardSecurityNumber, message.CardHolderName, message.CardExpiration);
+ var order = new Order(message.UserId, message.UserName, address, message.PaymentToken);
foreach (var item in message.OrderItems)
{
diff --git a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
index 8cde0d406..4552a6ca0 100644
--- a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
+++ b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
@@ -19,7 +19,6 @@ public ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler(
public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken cancellationToken)
{
- var cardTypeId = domainEvent.CardTypeId != 0 ? domainEvent.CardTypeId : 1;
var buyer = await _buyerRepository.FindAsync(domainEvent.UserId);
var buyerExisted = buyer is not null;
@@ -31,12 +30,8 @@ public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken
// REVIEW: The event this creates needs to be sent after SaveChanges has propagated the buyer Id. It currently only
// works by coincidence. If we remove HiLo or if anything decides to yield earlier, it will break.
- buyer.VerifyOrAddPaymentMethod(cardTypeId,
- $"Payment Method on {DateTime.UtcNow}",
- domainEvent.CardNumber,
- domainEvent.CardSecurityNumber,
- domainEvent.CardHolderName,
- domainEvent.CardExpiration,
+ buyer.VerifyOrAddPaymentMethod($"Payment Method on {DateTime.UtcNow}",
+ domainEvent.PaymentToken,
domainEvent.Order.Id);
if (!buyerExisted)
diff --git a/src/Ordering.API/Application/Queries/IOrderQueries.cs b/src/Ordering.API/Application/Queries/IOrderQueries.cs
index 3dc0fcc7f..d12a584d8 100644
--- a/src/Ordering.API/Application/Queries/IOrderQueries.cs
+++ b/src/Ordering.API/Application/Queries/IOrderQueries.cs
@@ -6,5 +6,4 @@ public interface IOrderQueries
Task> GetOrdersFromUserAsync(string userId);
- Task> GetCardTypesAsync();
}
diff --git a/src/Ordering.API/Application/Queries/OrderQueries.cs b/src/Ordering.API/Application/Queries/OrderQueries.cs
index 93891d1c1..d74040e3d 100644
--- a/src/Ordering.API/Application/Queries/OrderQueries.cs
+++ b/src/Ordering.API/Application/Queries/OrderQueries.cs
@@ -48,6 +48,4 @@ public async Task> GetOrdersFromUserAsync(string userI
.ToListAsync();
}
- public async Task> GetCardTypesAsync() =>
- await context.CardTypes.Select(c=> new CardType { Id = c.Id, Name = c.Name }).ToListAsync();
}
diff --git a/src/Ordering.API/Application/Queries/OrderViewModel.cs b/src/Ordering.API/Application/Queries/OrderViewModel.cs
index 084c2816d..68756d057 100644
--- a/src/Ordering.API/Application/Queries/OrderViewModel.cs
+++ b/src/Ordering.API/Application/Queries/OrderViewModel.cs
@@ -30,9 +30,3 @@ public record OrderSummary
public string Status { get; init; }
public double Total { get; init; }
}
-
-public record CardType
-{
- public int Id { get; init; }
- public string Name { get; init; }
-}
diff --git a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs
index 4781ca264..af83d7a98 100644
--- a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs
+++ b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs
@@ -8,11 +8,7 @@ public CreateOrderCommandValidator(ILogger logger)
RuleFor(command => command.State).NotEmpty();
RuleFor(command => command.Country).NotEmpty();
RuleFor(command => command.ZipCode).NotEmpty();
- RuleFor(command => command.CardNumber).NotEmpty().Length(12, 19);
- RuleFor(command => command.CardHolderName).NotEmpty();
- RuleFor(command => command.CardExpiration).NotEmpty().Must(BeValidExpirationDate).WithMessage("Please specify a valid card expiration date");
- RuleFor(command => command.CardSecurityNumber).NotEmpty().Length(3);
- RuleFor(command => command.CardTypeId).NotEmpty();
+ RuleFor(command => command.PaymentToken).NotEmpty().MaximumLength(200);
RuleFor(command => command.OrderItems).Must(ContainOrderItems).WithMessage("No order items found");
if (logger.IsEnabled(LogLevel.Trace))
@@ -21,11 +17,6 @@ public CreateOrderCommandValidator(ILogger logger)
}
}
- private bool BeValidExpirationDate(DateTime dateTime)
- {
- return dateTime >= DateTime.UtcNow;
- }
-
private bool ContainOrderItems(IEnumerable orderItems)
{
return orderItems.Any();
diff --git a/src/Ordering.API/Infrastructure/OrderingContextSeed.cs b/src/Ordering.API/Infrastructure/OrderingContextSeed.cs
index b54ef84d7..7b6d40329 100644
--- a/src/Ordering.API/Infrastructure/OrderingContextSeed.cs
+++ b/src/Ordering.API/Infrastructure/OrderingContextSeed.cs
@@ -4,22 +4,5 @@
public class OrderingContextSeed: IDbSeeder
{
- public async Task SeedAsync(OrderingContext context)
- {
- if (!context.CardTypes.Any())
- {
- context.CardTypes.AddRange(GetPredefinedCardTypes());
-
- await context.SaveChangesAsync();
- }
-
- await context.SaveChangesAsync();
- }
-
- private static IEnumerable GetPredefinedCardTypes()
- {
- yield return new CardType { Id = 1, Name = "Amex" };
- yield return new CardType { Id = 2, Name = "Visa" };
- yield return new CardType { Id = 3, Name = "MasterCard" };
- }
+ public Task SeedAsync(OrderingContext context) => Task.CompletedTask;
}
diff --git a/src/Ordering.API/Ordering.API.csproj b/src/Ordering.API/Ordering.API.csproj
index f37bea499..a9f166a1f 100644
--- a/src/Ordering.API/Ordering.API.csproj
+++ b/src/Ordering.API/Ordering.API.csproj
@@ -32,6 +32,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
@@ -42,4 +46,4 @@
-
\ No newline at end of file
+
diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
index 825cdc73a..2d1d017eb 100644
--- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
+++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
@@ -26,12 +26,10 @@ public Buyer(string identity, string name) : this()
Name = !string.IsNullOrWhiteSpace(name) ? name : throw new ArgumentNullException(nameof(name));
}
- public PaymentMethod VerifyOrAddPaymentMethod(
- int cardTypeId, string alias, string cardNumber,
- string securityNumber, string cardHolderName, DateTime expiration, int orderId)
+ public PaymentMethod VerifyOrAddPaymentMethod(string alias, string paymentToken, int orderId)
{
var existingPayment = _paymentMethods
- .SingleOrDefault(p => p.IsEqualTo(cardTypeId, cardNumber, expiration));
+ .SingleOrDefault(p => p.IsEqualTo(paymentToken));
if (existingPayment != null)
{
@@ -40,7 +38,7 @@ public PaymentMethod VerifyOrAddPaymentMethod(
return existingPayment;
}
- var payment = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration);
+ var payment = new PaymentMethod(alias, paymentToken);
_paymentMethods.Add(payment);
diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
deleted file mode 100644
index f01eacea0..000000000
--- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace eShop.Ordering.Domain.AggregatesModel.BuyerAggregate;
-
-public sealed class CardType
-{
- public int Id { get; init; }
- public required string Name { get; init; }
-}
diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs
index c6964291f..32c43f338 100644
--- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs
+++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs
@@ -7,37 +7,18 @@ public class PaymentMethod : Entity
[Required]
private string _alias;
[Required]
- private string _cardNumber;
- private string _securityNumber;
- [Required]
- private string _cardHolderName;
- private DateTime _expiration;
-
- private int _cardTypeId;
- public CardType CardType { get; private set; }
+ private string _paymentToken;
protected PaymentMethod() { }
- public PaymentMethod(int cardTypeId, string alias, string cardNumber, string securityNumber, string cardHolderName, DateTime expiration)
+ public PaymentMethod(string alias, string paymentToken)
{
- _cardNumber = !string.IsNullOrWhiteSpace(cardNumber) ? cardNumber : throw new OrderingDomainException(nameof(cardNumber));
- _securityNumber = !string.IsNullOrWhiteSpace(securityNumber) ? securityNumber : throw new OrderingDomainException(nameof(securityNumber));
- _cardHolderName = !string.IsNullOrWhiteSpace(cardHolderName) ? cardHolderName : throw new OrderingDomainException(nameof(cardHolderName));
-
- if (expiration < DateTime.UtcNow)
- {
- throw new OrderingDomainException(nameof(expiration));
- }
-
_alias = alias;
- _expiration = expiration;
- _cardTypeId = cardTypeId;
+ _paymentToken = !string.IsNullOrWhiteSpace(paymentToken) ? paymentToken : throw new OrderingDomainException(nameof(paymentToken));
}
- public bool IsEqualTo(int cardTypeId, string cardNumber, DateTime expiration)
+ public bool IsEqualTo(string paymentToken)
{
- return _cardTypeId == cardTypeId
- && _cardNumber == cardNumber
- && _expiration == expiration;
+ return _paymentToken == paymentToken;
}
}
diff --git a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
index 3f51f71c2..3948d9094 100644
--- a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
+++ b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
@@ -49,8 +49,7 @@ protected Order()
_isDraft = false;
}
- public Order(string userId, string userName, Address address, int cardTypeId, string cardNumber, string cardSecurityNumber,
- string cardHolderName, DateTime cardExpiration, int? buyerId = null, int? paymentMethodId = null) : this()
+ public Order(string userId, string userName, Address address, string paymentToken, int? buyerId = null, int? paymentMethodId = null) : this()
{
BuyerId = buyerId;
PaymentId = paymentMethodId;
@@ -60,8 +59,7 @@ public Order(string userId, string userName, Address address, int cardTypeId, st
// Add the OrderStarterDomainEvent to the domain events collection
// to be raised/dispatched when committing changes into the Database [ After DbContext.SaveChanges() ]
- AddOrderStartedDomainEvent(userId, userName, cardTypeId, cardNumber,
- cardSecurityNumber, cardHolderName, cardExpiration);
+ AddOrderStartedDomainEvent(userId, userName, paymentToken);
}
// DDD Patterns comment
@@ -167,12 +165,9 @@ public void SetCancelledStatusWhenStockIsRejected(IEnumerable orderStockRej
}
}
- private void AddOrderStartedDomainEvent(string userId, string userName, int cardTypeId, string cardNumber,
- string cardSecurityNumber, string cardHolderName, DateTime cardExpiration)
+ private void AddOrderStartedDomainEvent(string userId, string userName, string paymentToken)
{
- var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, cardTypeId,
- cardNumber, cardSecurityNumber,
- cardHolderName, cardExpiration);
+ var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentToken);
this.AddDomainEvent(orderStartedDomainEvent);
}
diff --git a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs
index 7bb0b17e4..a1397b3db 100644
--- a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs
+++ b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs
@@ -8,8 +8,4 @@ public record class OrderStartedDomainEvent(
Order Order,
string UserId,
string UserName,
- int CardTypeId,
- string CardNumber,
- string CardSecurityNumber,
- string CardHolderName,
- DateTime CardExpiration) : INotification;
+ string PaymentToken) : INotification;
diff --git a/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs b/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs
deleted file mode 100644
index 40d5e900d..000000000
--- a/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace eShop.Ordering.Infrastructure.EntityConfigurations;
-
-class CardTypeEntityTypeConfiguration
- : IEntityTypeConfiguration
-{
- public void Configure(EntityTypeBuilder cardTypesConfiguration)
- {
- cardTypesConfiguration.ToTable("cardtypes");
-
- cardTypesConfiguration.Property(ct => ct.Id)
- .ValueGeneratedNever();
-
- cardTypesConfiguration.Property(ct => ct.Name)
- .HasMaxLength(200)
- .IsRequired();
- }
-}
diff --git a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
index cd6697acd..1acc05f1e 100644
--- a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
+++ b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
@@ -14,33 +14,15 @@ public void Configure(EntityTypeBuilder paymentConfiguration)
paymentConfiguration.Property("BuyerId");
- paymentConfiguration
- .Property("_cardHolderName")
- .HasColumnName("CardHolderName")
- .HasMaxLength(200);
-
paymentConfiguration
.Property("_alias")
.HasColumnName("Alias")
.HasMaxLength(200);
paymentConfiguration
- .Property("_cardNumber")
- .HasColumnName("CardNumber")
- .HasMaxLength(25)
+ .Property("_paymentToken")
+ .HasColumnName("PaymentToken")
+ .HasMaxLength(200)
.IsRequired();
-
- paymentConfiguration
- .Property("_expiration")
- .HasColumnName("Expiration")
- .HasMaxLength(25);
-
- paymentConfiguration
- .Property("_cardTypeId")
- .HasColumnName("CardTypeId");
-
- paymentConfiguration.HasOne(p => p.CardType)
- .WithMany()
- .HasForeignKey("_cardTypeId");
}
}
diff --git a/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs
new file mode 100644
index 000000000..414436856
--- /dev/null
+++ b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs
@@ -0,0 +1,290 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using eShop.Ordering.Infrastructure;
+
+#nullable disable
+
+namespace Ordering.Infrastructure.Migrations;
+
+[DbContext(typeof(OrderingContext))]
+[Migration("20261117125854_RemoveSensitivePaymentMethodData")]
+partial class _20261117125854_RemoveSensitivePaymentMethodData
+{
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasDefaultSchema("ordering")
+ .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.HasSequence("buyerseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("orderitemseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("orderseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("paymentseq")
+ .IncrementsBy(10);
+
+ modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b =>
+ {
+ b.Property("EventId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("EventTypeName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("State")
+ .HasColumnType("integer");
+
+ b.Property("TimesSent")
+ .HasColumnType("integer");
+
+ b.Property("TransactionId")
+ .HasColumnType("uuid");
+
+ b.HasKey("EventId");
+
+ b.ToTable("IntegrationEventLog", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseHiLo(id, "buyerseq");
+
+ b.Property("IdentityGuid")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)");
+
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("IdentityGuid")
+ .IsUnique();
+
+ b.ToTable("buyers", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseHiLo(id, "paymentseq");
+
+ b.Property("BuyerId")
+ .HasColumnType("integer");
+
+ b.Property("_alias")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)")
+ .HasColumnName("Alias");
+
+ b.Property("_paymentMethodId")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)")
+ .HasColumnName("PaymentMethodId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BuyerId");
+
+ b.ToTable("paymentmethods", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderseq");
+
+ b.Property("BuyerId")
+ .HasColumnType("integer");
+
+ b.Property("Description")
+ .HasColumnType("text");
+
+ b.Property("OrderDate")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("OrderStatus")
+ .IsRequired()
+ .HasMaxLength(30)
+ .HasColumnType("character varying(30)");
+
+ b.Property("PaymentId")
+ .HasColumnType("integer")
+ .HasColumnName("PaymentMethodId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BuyerId");
+
+ b.HasIndex("PaymentId");
+
+ b.ToTable("orders", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b =>
+ {
+ var id = b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderitemseq");
+
+ b.Property("Discount")
+ .HasColumnType("numeric");
+
+ b.Property("OrderId")
+ .HasColumnType("integer");
+
+ b.Property("PictureUrl")
+ .HasColumnType("text");
+
+ b.Property("ProductId")
+ .HasColumnType("integer");
+
+ b.Property("ProductName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UnitPrice")
+ .HasColumnType("numeric");
+
+ b.Property("Units")
+ .HasColumnType("integer");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OrderId");
+
+ b.ToTable("orderItems", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Time")
+ .HasColumnType("timestamp with time zone");
+
+ b.HasKey("Id");
+
+ b.ToTable("requests", "ordering");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b =>
+ {
+ b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null)
+ .WithMany("PaymentMethods")
+ .HasForeignKey("BuyerId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b =>
+ {
+ b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer")
+ .WithMany()
+ .HasForeignKey("BuyerId");
+
+ b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null)
+ .WithMany()
+ .HasForeignKey("PaymentId")
+ .OnDelete(DeleteBehavior.Restrict);
+
+ b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 =>
+ {
+ b1.Property("OrderId")
+ .HasColumnType("integer");
+
+ b1.Property("City")
+ .HasColumnType("text");
+
+ b1.Property("Country")
+ .HasColumnType("text");
+
+ b1.Property("State")
+ .HasColumnType("text");
+
+ b1.Property("Street")
+ .HasColumnType("text");
+
+ b1.Property("ZipCode")
+ .HasColumnType("text");
+
+ b1.HasKey("OrderId");
+
+ b1.ToTable("orders", "ordering");
+
+ b1.WithOwner()
+ .HasForeignKey("OrderId");
+ });
+
+ b.Navigation("Address")
+ .IsRequired();
+
+ b.Navigation("Buyer");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b =>
+ {
+ b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null)
+ .WithMany("OrderItems")
+ .HasForeignKey("OrderId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b =>
+ {
+ b.Navigation("PaymentMethods");
+ });
+
+ modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b =>
+ {
+ b.Navigation("OrderItems");
+ });
+#pragma warning restore 612, 618
+ }
+}
diff --git a/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs
new file mode 100644
index 000000000..246aafb16
--- /dev/null
+++ b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs
@@ -0,0 +1,154 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Ordering.Infrastructure.Migrations;
+
+///
+public partial class _20261117125854_RemoveSensitivePaymentMethodData : Migration
+{
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropForeignKey(
+ name: "FK_paymentmethods_cardtypes_CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.DropTable(
+ name: "cardtypes",
+ schema: "ordering");
+
+ migrationBuilder.DropIndex(
+ name: "IX_paymentmethods_CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.DropColumn(
+ name: "CardNumber",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.DropColumn(
+ name: "CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.DropColumn(
+ name: "Expiration",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.DropColumn(
+ name: "CardHolderName",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.AddColumn(
+ name: "PaymentMethodId",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "character varying(200)",
+ maxLength: 200,
+ nullable: true);
+
+ migrationBuilder.Sql("UPDATE ordering.paymentmethods SET \"PaymentMethodId\" = 'legacy-' || \"Id\"::text");
+
+ migrationBuilder.AlterColumn(
+ name: "PaymentMethodId",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "character varying(200)",
+ maxLength: 200,
+ nullable: false,
+ oldClrType: typeof(string),
+ oldType: "character varying(200)",
+ oldMaxLength: 200,
+ oldNullable: true);
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "PaymentMethodId",
+ schema: "ordering",
+ table: "paymentmethods");
+
+ migrationBuilder.AddColumn(
+ name: "CardHolderName",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "character varying(200)",
+ maxLength: 200,
+ nullable: false,
+ defaultValue: "");
+
+ migrationBuilder.AddColumn(
+ name: "CardNumber",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "character varying(25)",
+ maxLength: 25,
+ nullable: false,
+ defaultValue: "");
+
+ migrationBuilder.AddColumn(
+ name: "CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "integer",
+ nullable: false,
+ defaultValue: 1);
+
+ migrationBuilder.AddColumn(
+ name: "Expiration",
+ schema: "ordering",
+ table: "paymentmethods",
+ type: "timestamp with time zone",
+ maxLength: 25,
+ nullable: false,
+ defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+ migrationBuilder.CreateTable(
+ name: "cardtypes",
+ schema: "ordering",
+ columns: table => new
+ {
+ Id = table.Column(type: "integer", nullable: false),
+ Name = table.Column(type: "character varying(200)", maxLength: 200, nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_cardtypes", x => x.Id);
+ });
+
+ migrationBuilder.InsertData(
+ schema: "ordering",
+ table: "cardtypes",
+ columns: new[] { "Id", "Name" },
+ values: new object[,]
+ {
+ { 1, "Amex" },
+ { 2, "Visa" },
+ { 3, "MasterCard" }
+ });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_paymentmethods_CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods",
+ column: "CardTypeId");
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_paymentmethods_cardtypes_CardTypeId",
+ schema: "ordering",
+ table: "paymentmethods",
+ column: "CardTypeId",
+ principalSchema: "ordering",
+ principalTable: "cardtypes",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ }
+}
diff --git a/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs
new file mode 100644
index 000000000..c91005f28
--- /dev/null
+++ b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs
@@ -0,0 +1,290 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using eShop.Ordering.Infrastructure;
+
+#nullable disable
+
+namespace Ordering.Infrastructure.Migrations;
+
+[DbContext(typeof(OrderingContext))]
+[Migration("20261117131357_RenamePaymentMethodTokenColumn")]
+partial class _20261117131357_RenamePaymentMethodTokenColumn
+{
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasDefaultSchema("ordering")
+ .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.HasSequence("buyerseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("orderitemseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("orderseq")
+ .IncrementsBy(10);
+
+ modelBuilder.HasSequence("paymentseq")
+ .IncrementsBy(10);
+
+ modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b =>
+ {
+ b.Property("EventId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("CreationTime")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("EventTypeName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("State")
+ .HasColumnType("integer");
+
+ b.Property