Completed EFCore Session Store

mckaragoz · mckaragoz · commit da040c27d5ee · 2026-03-15T13:47:22.000+03:00
diff --git a/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSession.cs b/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSession.cs
@@ -4,7 +4,6 @@
 
 namespace CodeBeam.UltimateAuth.Core.Domain;
 
-// TODO: Add ISoftDeleteable
 public sealed class UAuthSession : IVersionedEntity
 {
     public AuthSessionId SessionId { get; }
@@ -13,21 +12,21 @@ public sealed class UAuthSession : IVersionedEntity
     public SessionChainId ChainId { get; }
     public DateTimeOffset CreatedAt { get; }
     public DateTimeOffset ExpiresAt { get; }
-    public bool IsRevoked { get; }
     public DateTimeOffset? RevokedAt { get; }
     public long SecurityVersionAtCreation { get; }
     public ClaimsSnapshot Claims { get; }
     public SessionMetadata Metadata { get; }
     public long Version { get; set; }
 
+    public bool IsRevoked => RevokedAt != null;
+
     private UAuthSession(
         AuthSessionId sessionId,
         TenantKey tenant,
         UserKey userKey,
         SessionChainId chainId,
         DateTimeOffset createdAt,
         DateTimeOffset expiresAt,
-        bool isRevoked,
         DateTimeOffset? revokedAt,
         long securityVersionAtCreation,
         ClaimsSnapshot claims,
@@ -40,7 +39,6 @@ private UAuthSession(
         ChainId = chainId;
         CreatedAt = createdAt;
         ExpiresAt = expiresAt;
-        IsRevoked = isRevoked;
         RevokedAt = revokedAt;
         SecurityVersionAtCreation = securityVersionAtCreation;
         Claims = claims;
@@ -66,7 +64,6 @@ public static UAuthSession Create(
             chainId,
             createdAt: now,
             expiresAt: expiresAt,
-            isRevoked: false,
             revokedAt: null,
             securityVersionAtCreation: securityVersion,
             claims: claims ?? ClaimsSnapshot.Empty,
@@ -77,7 +74,8 @@ public static UAuthSession Create(
 
     public UAuthSession Revoke(DateTimeOffset at)
     {
-        if (IsRevoked) return this;
+        if (IsRevoked)
+            return this;
 
         return new UAuthSession(
             SessionId,
@@ -86,7 +84,6 @@ public UAuthSession Revoke(DateTimeOffset at)
             ChainId,
             CreatedAt,
             ExpiresAt,
-            true,
             at,
             SecurityVersionAtCreation,
             Claims,
@@ -102,7 +99,6 @@ internal static UAuthSession FromProjection(
         SessionChainId chainId,
         DateTimeOffset createdAt,
         DateTimeOffset expiresAt,
-        bool isRevoked,
         DateTimeOffset? revokedAt,
         long securityVersionAtCreation,
         ClaimsSnapshot claims,
@@ -116,7 +112,6 @@ internal static UAuthSession FromProjection(
             chainId,
             createdAt,
             expiresAt,
-            isRevoked,
             revokedAt,
             securityVersionAtCreation,
             claims,
@@ -148,7 +143,6 @@ public UAuthSession WithChain(SessionChainId chainId)
             chainId: chainId,
             createdAt: CreatedAt,
             expiresAt: ExpiresAt,
-            isRevoked: IsRevoked,
             revokedAt: RevokedAt,
             securityVersionAtCreation: SecurityVersionAtCreation,
             claims: Claims,
diff --git a/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSessionChain.cs b/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSessionChain.cs
@@ -1,6 +1,5 @@
 ﻿using CodeBeam.UltimateAuth.Core.Abstractions;
 using CodeBeam.UltimateAuth.Core.MultiTenancy;
-using static CodeBeam.UltimateAuth.Core.Defaults.UAuthActions;
 
 namespace CodeBeam.UltimateAuth.Core.Domain;
 
diff --git a/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSessionRoot.cs b/src/CodeBeam.UltimateAuth.Core/Domain/Session/UAuthSessionRoot.cs
@@ -11,20 +11,19 @@ public sealed class UAuthSessionRoot : IVersionedEntity
 
     public DateTimeOffset CreatedAt { get; }
     public DateTimeOffset? UpdatedAt { get; }
-
-    public bool IsRevoked { get; }
     public DateTimeOffset? RevokedAt { get; }
 
     public long SecurityVersion { get; }
     public long Version { get; set; }
 
+    public bool IsRevoked => RevokedAt != null;
+
     private UAuthSessionRoot(
         SessionRootId rootId,
         TenantKey tenant,
         UserKey userKey,
         DateTimeOffset createdAt,
         DateTimeOffset? updatedAt,
-        bool isRevoked,
         DateTimeOffset? revokedAt,
         long securityVersion,
         long version)
@@ -34,7 +33,6 @@ private UAuthSessionRoot(
         UserKey = userKey;
         CreatedAt = createdAt;
         UpdatedAt = updatedAt;
-        IsRevoked = isRevoked;
         RevokedAt = revokedAt;
         SecurityVersion = securityVersion;
         Version = version;
@@ -51,7 +49,6 @@ public static UAuthSessionRoot Create(
             userKey,
             at,
             null,
-            false,
             null,
             0,
             0
@@ -66,7 +63,6 @@ public UAuthSessionRoot IncreaseSecurityVersion(DateTimeOffset at)
             UserKey,
             CreatedAt,
             at,
-            IsRevoked,
             RevokedAt,
             SecurityVersion + 1,
             Version + 1
@@ -84,7 +80,6 @@ public UAuthSessionRoot Revoke(DateTimeOffset at)
             UserKey,
             CreatedAt,
             at,
-            true,
             at,
             SecurityVersion + 1,
             Version + 1
@@ -97,7 +92,6 @@ internal static UAuthSessionRoot FromProjection(
         UserKey userKey,
         DateTimeOffset createdAt,
         DateTimeOffset? updatedAt,
-        bool isRevoked,
         DateTimeOffset? revokedAt,
         long securityVersion,
         long version)
@@ -108,7 +102,6 @@ internal static UAuthSessionRoot FromProjection(
             userKey,
             createdAt,
             updatedAt,
-            isRevoked,
             revokedAt,
             securityVersion,
             version
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Data/UAuthSessionDbContext.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Data/UAuthSessionDbContext.cs
@@ -34,8 +34,13 @@ protected override void OnModelCreating(ModelBuilder b)
             e.HasKey(x => x.Id);
 
             e.Property(x => x.Version).IsConcurrencyToken();
-
-            e.Property(x => x.UserKey)
+            e.Property(x => x.UserKey).IsRequired();
+            e.Property(x => x.CreatedAt).IsRequired();
+            e.Property(x => x.Tenant)
+                .HasConversion(
+                    v => v.Value,
+                    v => TenantKey.FromInternal(v))
+                .HasMaxLength(128)
                 .IsRequired();
 
             e.HasIndex(x => new { x.Tenant, x.UserKey }).IsUnique();
@@ -48,6 +53,7 @@ protected override void OnModelCreating(ModelBuilder b)
                 .HasConversion(
                     v => v.Value,
                     v => SessionRootId.From(v))
+                .HasMaxLength(128)
                 .IsRequired();
         });
 
@@ -56,18 +62,43 @@ protected override void OnModelCreating(ModelBuilder b)
             e.HasKey(x => x.Id);
 
             e.Property(x => x.Version).IsConcurrencyToken();
-
-            e.Property(x => x.UserKey)
+            e.Property(x => x.UserKey).IsRequired();
+            e.Property(x => x.CreatedAt).IsRequired();
+            e.Property(x => x.Tenant)
+                .HasConversion(
+                    v => v.Value,
+                    v => TenantKey.FromInternal(v))
+                .HasMaxLength(128)
                 .IsRequired();
 
             e.HasIndex(x => new { x.Tenant, x.ChainId }).IsUnique();
+            e.HasIndex(x => new { x.Tenant, x.UserKey });
+            e.HasIndex(x => new { x.Tenant, x.UserKey, x.DeviceId });
+            e.HasIndex(x => new { x.Tenant, x.RootId });
+
+            e.HasOne<SessionRootProjection>()
+                .WithMany()
+                .HasForeignKey(x => new { x.Tenant, x.RootId })
+                .HasPrincipalKey(x => new { x.Tenant, x.RootId })
+                .OnDelete(DeleteBehavior.Restrict);
 
             e.Property(x => x.ChainId)
                 .HasConversion(
                     v => v.Value,
                     v => SessionChainId.From(v))
                 .IsRequired();
 
+            e.Property(x => x.DeviceId)
+                .HasConversion(
+                    v => v.Value,
+                    v => DeviceId.Create(v))
+                .HasMaxLength(64)
+                .IsRequired();
+
+            e.Property(x => x.Device)
+                .HasConversion(new JsonValueConverter<DeviceContext>())
+                .IsRequired();
+
             e.Property(x => x.ActiveSessionId)
                 .HasConversion(new NullableAuthSessionIdConverter());
 
@@ -83,9 +114,26 @@ protected override void OnModelCreating(ModelBuilder b)
         {
             e.HasKey(x => x.Id);
             e.Property(x => x.Version).IsConcurrencyToken();
+            e.Property(x => x.CreatedAt).IsRequired();
+            e.Property(x => x.Tenant)
+                .HasConversion(
+                    v => v.Value,
+                    v => TenantKey.FromInternal(v))
+                .HasMaxLength(128)
+                .IsRequired();
 
             e.HasIndex(x => new { x.Tenant, x.SessionId }).IsUnique();
+            e.HasIndex(x => new { x.Tenant, x.ChainId });
             e.HasIndex(x => new { x.Tenant, x.ChainId, x.RevokedAt });
+            e.HasIndex(x => new { x.Tenant, x.UserKey, x.RevokedAt });
+            e.HasIndex(x => new { x.Tenant, x.ExpiresAt });
+            e.HasIndex(x => new { x.Tenant, x.RevokedAt });
+
+            e.HasOne<SessionChainProjection>()
+                .WithMany()
+                .HasForeignKey(x => new { x.Tenant, x.ChainId })
+                .HasPrincipalKey(x => new { x.Tenant, x.ChainId })
+                .OnDelete(DeleteBehavior.Restrict);
 
             e.Property(x => x.SessionId)
                 .HasConversion(new AuthSessionIdConverter())
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionChainProjection.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionChainProjection.cs
@@ -15,6 +15,7 @@ internal sealed class SessionChainProjection
     public DateTimeOffset CreatedAt { get; init; }
     public DateTimeOffset LastSeenAt { get; set; }
     public DateTimeOffset? AbsoluteExpiresAt { get; set; }
+    public DeviceId DeviceId { get; set; }
     public DeviceContext Device { get; set; }
     public ClaimsSnapshot ClaimsSnapshot { get; set; } = ClaimsSnapshot.Empty;
     public AuthSessionId? ActiveSessionId { get; set; }
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionProjection.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionProjection.cs
@@ -15,9 +15,8 @@ internal sealed class SessionProjection
 
     public DateTimeOffset CreatedAt { get; set; }
     public DateTimeOffset ExpiresAt { get; set; }
-    public DateTimeOffset? LastSeenAt { get; set; }
 
-    public bool IsRevoked { get; set; }
+    
     public DateTimeOffset? RevokedAt { get; set; }
 
     public long SecurityVersionAtCreation { get; set; }
@@ -27,4 +26,6 @@ internal sealed class SessionProjection
     public SessionMetadata Metadata { get; set; } = SessionMetadata.Empty;
 
     public long Version { get; set; }
+
+    public bool IsRevoked => RevokedAt != null;
 }
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionRootProjection.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/EntityProjections/SessionRootProjection.cs
@@ -13,9 +13,10 @@ internal sealed class SessionRootProjection
     public DateTimeOffset CreatedAt { get; set; }
     public DateTimeOffset? UpdatedAt { get; set; }
 
-    public bool IsRevoked { get; set; }
     public DateTimeOffset? RevokedAt { get; set; }
 
     public long SecurityVersion { get; set; }
     public long Version { get; set; }
+
+    public bool IsRevoked => RevokedAt != null;
 }
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Extensions/ServiceCollectionExtensions.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Extensions/ServiceCollectionExtensions.cs
@@ -1,14 +1,15 @@
-﻿using Microsoft.EntityFrameworkCore;
+﻿using CodeBeam.UltimateAuth.Core.Abstractions;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddUltimateAuthEntityFrameworkCoreSessions<TUserId>(this IServiceCollection services,Action<DbContextOptionsBuilder> configureDb)where TUserId : notnull
+    public static IServiceCollection AddUltimateAuthEntityFrameworkCoreSessions(this IServiceCollection services,Action<DbContextOptionsBuilder> configureDb)
     {
-        services.AddDbContext<UltimateAuthSessionDbContext>(configureDb);
-        services.AddScoped<EfCoreSessionStore>();
+        services.AddDbContextPool<UltimateAuthSessionDbContext>(configureDb);
+        services.AddScoped<ISessionStoreFactory, EfCoreSessionStoreFactory>();
 
         return services;
     }
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionChainProjectionMapper.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionChainProjectionMapper.cs
@@ -27,6 +27,9 @@ public static UAuthSessionChain ToDomain(this SessionChainProjection p)
 
     public static SessionChainProjection ToProjection(this UAuthSessionChain chain)
     {
+        if (chain.Device.DeviceId is not DeviceId deviceId)
+            throw new ArgumentException("Device id required.");
+
         return new SessionChainProjection
         {
             ChainId = chain.ChainId,
@@ -36,6 +39,7 @@ public static SessionChainProjection ToProjection(this UAuthSessionChain chain)
             CreatedAt = chain.CreatedAt,
             LastSeenAt = chain.LastSeenAt,
             AbsoluteExpiresAt = chain.AbsoluteExpiresAt,
+            DeviceId = deviceId,
             Device = chain.Device,
             ClaimsSnapshot = chain.ClaimsSnapshot,
             ActiveSessionId = chain.ActiveSessionId,
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionProjectionMapper.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionProjectionMapper.cs
@@ -13,7 +13,6 @@ public static UAuthSession ToDomain(this SessionProjection p)
             p.ChainId,
             p.CreatedAt,
             p.ExpiresAt,
-            p.IsRevoked,
             p.RevokedAt,
             p.SecurityVersionAtCreation,
             p.Claims,
@@ -33,8 +32,6 @@ public static SessionProjection ToProjection(this UAuthSession s)
 
             CreatedAt = s.CreatedAt,
             ExpiresAt = s.ExpiresAt,
-
-            IsRevoked = s.IsRevoked,
             RevokedAt = s.RevokedAt,
 
             SecurityVersionAtCreation = s.SecurityVersionAtCreation,
@@ -43,5 +40,4 @@ public static SessionProjection ToProjection(this UAuthSession s)
             Version = s.Version
         };
     }
-
 }
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionRootProjectionMapper.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Mappers/SessionRootProjectionMapper.cs
@@ -12,7 +12,6 @@ public static UAuthSessionRoot ToDomain(this SessionRootProjection root)
             root.UserKey,
             root.CreatedAt,
             root.UpdatedAt,
-            root.IsRevoked,
             root.RevokedAt,
             root.SecurityVersion,
             root.Version
@@ -29,8 +28,6 @@ public static SessionRootProjection ToProjection(this UAuthSessionRoot root)
 
             CreatedAt = root.CreatedAt,
             UpdatedAt = root.UpdatedAt,
-
-            IsRevoked = root.IsRevoked,
             RevokedAt = root.RevokedAt,
 
             SecurityVersion = root.SecurityVersion,
diff --git a/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Stores/EfCoreSessionStore.cs b/src/sessions/CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore/Stores/EfCoreSessionStore.cs

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`		`-using Microsoft.EntityFrameworkCore;`
	`1`	`+using CodeBeam.UltimateAuth.Core.Abstractions;`
	`2`	`+using Microsoft.EntityFrameworkCore;`
`2`	`3`	`using Microsoft.Extensions.DependencyInjection;`
`3`	`4`
`4`	`5`	`namespace CodeBeam.UltimateAuth.Sessions.EntityFrameworkCore;`
`5`	`6`
`6`	`7`	`public static class ServiceCollectionExtensions`
`7`	`8`	`{`
`8`		`- public static IServiceCollection AddUltimateAuthEntityFrameworkCoreSessions<TUserId>(this IServiceCollection services,Action<DbContextOptionsBuilder> configureDb)where TUserId : notnull`
	`9`	`+ public static IServiceCollection AddUltimateAuthEntityFrameworkCoreSessions(this IServiceCollection services,Action<DbContextOptionsBuilder> configureDb)`
`9`	`10`	`{`
`10`		`- services.AddDbContext<UltimateAuthSessionDbContext>(configureDb);`
`11`		`- services.AddScoped<EfCoreSessionStore>();`
	`11`	`+ services.AddDbContextPool<UltimateAuthSessionDbContext>(configureDb);`
	`12`	`+ services.AddScoped<ISessionStoreFactory, EfCoreSessionStoreFactory>();`
`12`	`13`
`13`	`14`	`return services;`
`14`	`15`	`}`