DotBased.AspNet.Authority/AuthorityProviderExtensions.cs

@@ -1,16 +1,12 @@
 using DotBased.AspNet.Authority.Interfaces;
-using DotBased.AspNet.Authority.Models.Options;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DotBased.AspNet.Authority;
 
 public static class AuthorityProviderExtensions
 {
-    public static AuthorityBuilder AddAuthorityProvider<TModel>(this IServiceCollection services, Action<AuthorityOptions> optionsAction) where TModel : class
+    public static AuthorityBuilder AddAuthorityProvider<TModel>(this IServiceCollection services) where TModel : class
     {
-        services.AddOptions();
-        // Configure required classes, services, etc.
-        services.Configure<AuthorityOptions>(optionsAction);
         return new AuthorityBuilder(services);
     }
 

DotBased.AspNet.Authority/DotBased.AspNet.Authority.csproj

@@ -21,8 +21,4 @@
       <Folder Include="Models\Security\" />
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
-    </ItemGroup>
-
 </Project>

DotBased.AspNet.Authority/Interfaces/ISecurityVersionRepository.cs

@@ -0,0 +1,7 @@
+namespace DotBased.AspNet.Authority.Interfaces;
+
+public interface ISecurityVersionRepository<in TRepositoryObject>
+{
+    public Task<long> GetSecurityVersionAsync(TRepositoryObject obj);
+    
+}

DotBased.AspNet.Authority/Interfaces/IUserRepository.cs

@@ -1,9 +1,8 @@
 namespace DotBased.AspNet.Authority.Interfaces;
 
-public interface IUserRepository<TUser, TId> where TUser : class where TId : IEquatable<TId>
+public interface IUserRepository<TUser, TId> : IVersionRepository<TUser>, ISecurityVersionRepository<TUser> where TUser : class where TId : IEquatable<TId>
 {
     public Task<TUser?> GetUserByIdAsync(TId id);
+
     public Task<TId> GetUserIdAsync(TUser user);
-    public Task SetVersion(TUser user, long version);
-    public Task SetSecurityVersion(TUser user, long version);
 }

DotBased.AspNet.Authority/Interfaces/IVersionRepository.cs

@@ -0,0 +1,6 @@
+namespace DotBased.AspNet.Authority.Interfaces;
+
+public interface IVersionRepository<in TRepositoryObject>
+{
+    public Task<long> GetVersionAsync(TRepositoryObject obj);
+}

DotBased.AspNet.Authority/Models/Authority/AuthorityAttribute.cs

@@ -2,7 +2,7 @@ namespace DotBased.AspNet.Authority.Models.Authority;
 
 public class AuthorityAttribute
 {
-    public AuthorityAttribute(string attributeKey, string bound)
+    public AuthorityAttribute(string attributeKey, string bound) : this()
     {
         AttributeKey = attributeKey;
         BoundId = bound;
@@ -10,15 +10,14 @@ public class AuthorityAttribute
 
     public AuthorityAttribute()
     {
-        AttributeKey = string.Empty;
-        BoundId = string.Empty;
+        
     }
 
     public string AttributeKey { get; set; } // ClaimType/Authority.attribute.enabled
     
     public string BoundId { get; set; } // Bound to User, Group, Role id
 
-    public object? AttributeValue { get; set; }
+    public string? AttributeValue { get; set; }
     
     public string? Type { get; set; } // AspNet.Claim.Role/Property/Data.JSON, Data.Raw, Data.Base64 etc.
 

DotBased.AspNet.Authority/Models/Authority/AuthorityUser.cs

@@ -22,8 +22,6 @@ public abstract class AuthorityUser<TKey> where TKey : IEquatable<TKey>
     
     public bool Enabled { get; set; }
     
-    public bool Confirmed { get; set; }
-    
     public bool Locked { get; set; }
 
     public DateTime LockedDate { get; set; }

DotBased.AspNet.Authority/Models/Options/AuthorityOptions.cs

@@ -1,10 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class AuthorityOptions
-{
-    public LockdownOptions Lockdown { get; set; } = new();
-    public LockoutOptions Lockout { get; set; } = new();
-    public PasswordOptions Password { get; set; } = new();
-    public ProviderOptions Provider { get; set; } = new();
-    public UserOptions User { get; set; } = new();
-}

DotBased.AspNet.Authority/Models/Options/LockdownOptions.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class LockdownOptions
-{
-    public bool EnableLockout { get; set; }
-}

DotBased.AspNet.Authority/Models/Options/LockoutOptions.cs

@@ -1,8 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class LockoutOptions
-{
-    public bool EnableLockout { get; set; } = true;
-    public int FailedAttempts { get; set; } = 3;
-    public TimeSpan LockoutTimeout { get; set; } = TimeSpan.FromMinutes(30);
-}

DotBased.AspNet.Authority/Models/Options/PasswordOptions.cs

@@ -1,14 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class PasswordOptions
-{
-    public int RequiredLength { get; set; } = 10;
-    public int MinimalUniqueChars { get; set; } = 1;
-    public bool RequireLowercase { get; set; }
-    public bool RequireUppercase { get; set; }
-    public bool RequireDigit { get; set; }
-    public bool RequireNonAlphanumeric { get; set; }
-
-    public List<string> PasswordBlackList { get; set; } = ["password", "1234"];
-    public StringComparer PasswordBlackListComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
-}

DotBased.AspNet.Authority/Models/Options/ProviderOptions.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class ProviderOptions
-{
-    
-}

DotBased.AspNet.Authority/Models/Options/SignInOptions.cs

@@ -1,8 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class SignInOptions
-{
-    public bool RequireVerifiedEmail { get; set; }
-    public bool RequireVerifiedPhoneNumber { get; set; }
-    public bool RequireConfirmedAccount { get; set; }
-}

DotBased.AspNet.Authority/Models/Options/UserOptions.cs

@@ -1,11 +0,0 @@
-namespace DotBased.AspNet.Authority.Models.Options;
-
-public class UserOptions
-{
-    public bool EnableRegister { get; set; }
-    public bool RequireUniqueEmail { get; set; }
-    public string AllowedCharacters { get; set; } = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@";
-
-    public List<string> UserNameBlackList { get; set; } = ["admin", "administrator", "dev", "developer"];
-    public StringComparer UserNameBlackListComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
-}

DotBased.AspNet.Authority/Services/AuthorityService.cs

@@ -1,6 +1,6 @@
 namespace DotBased.AspNet.Authority.Services;
 
-public class AuthorityManager<TData>
+public class AuthorityService
 {
     public long GenerateVersion() => DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
 }

DotBased.AspNet.Authority/Validators/IPasswordValidator.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Validators;
-
-public interface IPasswordValidator<TUser>
-{
-    
-}

DotBased.AspNet.Authority/Validators/IUserValidator.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Validators;
-
-public interface IUserValidator
-{
-    
-}

DotBased.AspNet.Authority/Validators/PasswordValidator.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Validators;
-
-public class PasswordValidator
-{
-    
-}

DotBased.AspNet.Authority/Validators/UserValidator.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Validators;
-
-public class UserValidator
-{
-    
-}

DotBased.AspNet.Authority/Verifiers/IEmailVerifier.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Verifiers;
-
-public interface IEmailVerifier
-{
-    
-}

DotBased.AspNet.Authority/Verifiers/IPhoneNumberVerifier.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Verifiers;
-
-public interface IPhoneNumberVerifier
-{
-    
-}

DotBased.AspNet.Authority/Verifiers/IUserVerifier.cs

@@ -1,6 +0,0 @@
-namespace DotBased.AspNet.Authority.Verifiers;
-
-public class IUserVerifier
-{
-    
-}