byte/imprink
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inject roles on token validation

Browse Source
This commit is contained in:
lumijiez
2025-06-08 00:17:01 +03:00
parent 87c4f27de5
commit ab9b80b74f
12 changed files with 137 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Imprink.Infrastructure/Database/ApplicationDbContext.cs
View File

@@ -21,7 +21,7 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
public DbSet<OrderStatus> OrderStatuses { get; set; }
public DbSet<ShippingStatus> ShippingStatuses { get; set; }
public DbSet<User> Users { get; set; }
public DbSet<UserRole> UserRoles { get; set; }
public DbSet<UserRole> UserRole { get; set; }
public DbSet<Role> Roles { get; set; }
public DbSet<Category> Categories { get; set; }

4
src/Imprink.Infrastructure/Migrations/20250606173957_InitialSetup.Designer.cs → src/Imprink.Infrastructure/Migrations/20250607211109_InitialSetup.Designer.cs generated
View File

@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Imprink.Infrastructure.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20250606173957_InitialSetup")]
[Migration("20250607211109_InitialSetup")]
partial class InitialSetup
{
/// <inheritdoc />
@@ -825,7 +825,7 @@ namespace Imprink.Infrastructure.Migrations
b.HasIndex("UserId")
.HasDatabaseName("IX_UserRole_UserId");
b.ToTable("UserRoles");
b.ToTable("UserRole");
});
modelBuilder.Entity("Imprink.Domain.Entities.Orders.Order", b =>

14
src/Imprink.Infrastructure/Migrations/20250606173957_InitialSetup.cs → src/Imprink.Infrastructure/Migrations/20250607211109_InitialSetup.cs
View File

@@ -193,7 +193,7 @@ namespace Imprink.Infrastructure.Migrations
});
migrationBuilder.CreateTable(
name: "UserRoles",
name: "UserRole",
columns: table => new
{
UserId = table.Column<string>(type: "nvarchar(450)", maxLength: 450, nullable: false),
@@ -201,15 +201,15 @@ namespace Imprink.Infrastructure.Migrations
},
constraints: table =>
{
table.PrimaryKey("PK_UserRoles", x => new { x.UserId, x.RoleId });
table.PrimaryKey("PK_UserRole", x => new { x.UserId, x.RoleId });
table.ForeignKey(
name: "FK_UserRoles_Roles_RoleId",
name: "FK_UserRole_Roles_RoleId",
column: x => x.RoleId,
principalTable: "Roles",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_UserRoles_Users_UserId",
name: "FK_UserRole_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id",
@@ -630,12 +630,12 @@ namespace Imprink.Infrastructure.Migrations
migrationBuilder.CreateIndex(
name: "IX_UserRole_RoleId",
table: "UserRoles",
table: "UserRole",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "IX_UserRole_UserId",
table: "UserRoles",
table: "UserRole",
column: "UserId");
migrationBuilder.CreateIndex(
@@ -663,7 +663,7 @@ namespace Imprink.Infrastructure.Migrations
name: "OrderItems");
migrationBuilder.DropTable(
name: "UserRoles");
name: "UserRole");
migrationBuilder.DropTable(
name: "Orders");

2
src/Imprink.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@@ -822,7 +822,7 @@ namespace Imprink.Infrastructure.Migrations
b.HasIndex("UserId")
.HasDatabaseName("IX_UserRole_UserId");
b.ToTable("UserRoles");
b.ToTable("UserRole");
});
modelBuilder.Entity("Imprink.Domain.Entities.Orders.Order", b =>

14
src/Imprink.Infrastructure/Repositories/UserRoleRepository.cs
View File

@@ -9,7 +9,7 @@ public class UserRoleRepository(ApplicationDbContext context) : IUserRoleReposit
{
public async Task<IEnumerable<Role>> GetUserRolesAsync(string userId, CancellationToken cancellationToken = default)
{
return await context.UserRoles
return await context.UserRole
.AsNoTracking()
.Where(ur => ur.UserId == userId)
.Select(ur => ur.Role)
@@ -18,7 +18,7 @@ public class UserRoleRepository(ApplicationDbContext context) : IUserRoleReposit
public async Task<IEnumerable<User>> GetUsersInRoleAsync(Guid roleId, CancellationToken cancellationToken = default)
{
return await context.UserRoles
return await context.UserRole
.AsNoTracking()
.Where(ur => ur.RoleId == roleId)
.Select(ur => ur.User)
@@ -27,32 +27,32 @@ public class UserRoleRepository(ApplicationDbContext context) : IUserRoleReposit
public async Task<bool> IsUserInRoleAsync(string userId, Guid roleId, CancellationToken cancellationToken = default)
{
return await context.UserRoles
return await context.UserRole
.AnyAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
}
public async Task<UserRole?> GetUserRoleAsync(string userId, Guid roleId, CancellationToken cancellationToken = default)
{
return await context.UserRoles
return await context.UserRole
.AsNoTracking()
.FirstOrDefaultAsync(ur => ur.UserId == userId && ur.RoleId == roleId, cancellationToken);
}
public async Task AddUserRoleAsync(UserRole userRole, CancellationToken cancellationToken = default)
{
context.UserRoles.Add(userRole);
context.UserRole.Add(userRole);
await context.SaveChangesAsync(cancellationToken);
}
public async Task RemoveUserRoleAsync(UserRole userRole, CancellationToken cancellationToken = default)
{
context.UserRoles.Remove(userRole);
context.UserRole.Remove(userRole);
await context.SaveChangesAsync(cancellationToken);
}
public async Task<IEnumerable<UserRole>> GetUserRolesByUserIdAsync(string userId, CancellationToken cancellationToken = default)
{
return await context.UserRoles
return await context.UserRole
.AsNoTracking()
.Where(ur => ur.UserId == userId)
.ToListAsync(cancellationToken);