[CHANGE] Building data structure

DotBased.AspNet.Authority/Managers/AuthorityGroupManager.cs

@@ -2,5 +2,9 @@ namespace DotBased.AspNet.Authority.Managers;
 
 public partial class AuthorityManager
 {
-    
+    /*
+     * - Validate User & Group
+     * - Check if user is already in group (if already in group return)
+     * - Add to UsersGroups table
+     */
 }

DotBased.AspNet.Authority/Managers/AuthorityManager.cs

@@ -9,36 +9,25 @@ using Microsoft.Extensions.Options;
 
 namespace DotBased.AspNet.Authority.Managers;
 
-public partial class AuthorityManager
+public partial class AuthorityManager(
+    IOptions<AuthorityOptions> options,
+    IServiceProvider services,
+    ICryptographer cryptographer,
+    IUserRepository userRepository,
+    IRoleRepository roleRepository,
+    IPasswordHasher passwordHasher)
 {
-    public AuthorityManager(
+    private readonly ILogger _logger = LogService.RegisterLogger<AuthorityManager>();
-        IOptions<AuthorityOptions> options,
-        IServiceProvider services,
-        ICryptographer cryptographer,
-        IUserRepository userRepository,
-        IRoleRepository roleRepository,
-        IPasswordHasher passwordHasher)
-    {
-        _logger = LogService.RegisterLogger<AuthorityManager>();
-        Options = options.Value;
-        Services = services;
-        Cryptographer = cryptographer;
-        UserRepository = userRepository;
-        RoleRepository = roleRepository;
-        PasswordHasher = passwordHasher;
-    }
 
-    private readonly ILogger _logger;
+    public IServiceProvider Services { get; } = services;
+    public AuthorityOptions Options { get; } = options.Value;
+    public ICryptographer Cryptographer { get; } = cryptographer;
+
+    public IUserRepository UserRepository { get; } = userRepository;
+    public IRoleRepository RoleRepository { get; } = roleRepository;
+
+    public IPasswordHasher PasswordHasher { get; } = passwordHasher;
 
-    public IServiceProvider Services { get; }
-    public AuthorityOptions Options { get; }
-    public ICryptographer Cryptographer { get; }
-    
-    public IUserRepository UserRepository { get; }
-    public IRoleRepository RoleRepository { get; }
-    
-    public IPasswordHasher PasswordHasher { get; }
-    
     public IEnumerable<IPasswordValidator> PasswordValidators { get; } = [];
     public IEnumerable<IUserValidator> UserValidators { get; } = [];
 

DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs

@@ -19,9 +19,22 @@ public partial class AuthorityManager
         return Result<AuthorityRole>.Failed("Not implemented!");
     }
 
+    public async Task<ListResult<AuthorityRole>> GetRolesAsync(int limit = 20, int offset = 0, string search = "", CancellationToken? cancellationToken = null)
+    {
+        /*
+         * Search by role name & id
+         * Order by name, created date, creator? (paging)
+         */
+        return ListResult<AuthorityRole>.Failed("Not implemented!");
+    }
+
     public async Task AddRoleToUserAsync(AuthorityUser user, AuthorityRole role, CancellationToken? cancellationToken = null)
     {
-        
+        /*
+            - Validate User & Role
+            - Check if role is already in linked to user (if user already has the role, return)
+            - Add to UsersRoles table
+        */
     }
 
     public async Task RemoveRoleFromUserAsync(AuthorityRole role, AuthorityUser user, CancellationToken? cancellationToken = null)
@@ -31,4 +44,22 @@ public partial class AuthorityManager
     public async Task AddRoleToGroupAsync(AuthorityRole role, AuthorityGroup group, CancellationToken? cancellationToken = null)
     {
     }
+
+    /// <summary>
+    /// Get all roles (including group roles) that the user has.
+    /// </summary>
+    /// <param name="user">The user to get the roles from</param>
+    /// <param name="cancellationToken"></param>
+    public async Task<ListResult<AuthorityRole>> GetUserRolesAsync(AuthorityUser user, CancellationToken? cancellationToken = null)
+    {
+        /*
+         * - Validate user
+         * - Get user groups (id)
+         * - Get roles contained from user
+         * - Get roles contained from groups (if any)
+         * - Order by (for paging)
+         */
+        
+        return ListResult<AuthorityRole>.Failed("Not implemented!");
+    }
 }

DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs

@@ -1,25 +1,19 @@
 namespace DotBased.AspNet.Authority.Models.Authority;
 
-public abstract class AuthorityRole
+public abstract class AuthorityRole()
 {
     public AuthorityRole(string name) : this()
     {
         Name = name;
     }
-    
+
-    public AuthorityRole()
+    public Guid Id { get; set; } = Guid.NewGuid();
-    {
+
-        Id = Guid.NewGuid();
-        CreatedDate = DateTime.Now;
-    }
-    
-    public Guid Id { get; set; }
-    
     public string? Name { get; set; }
 
     public long Version { get; set; }
 
-    public DateTime CreatedDate { get; set; }
+    public DateTime CreatedDate { get; set; } = DateTime.Now;
 
     public override string ToString() => Name ?? string.Empty;
 }

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

@@ -2,21 +2,15 @@ using DotBased.AspNet.Authority.Attributes;
 
 namespace DotBased.AspNet.Authority.Models.Authority;
 
-public class AuthorityUser
+public class AuthorityUser()
 {
     public AuthorityUser(string userName) : this()
     {
         UserName = userName;
     }
-    
+
-    public AuthorityUser()
+    public Guid Id { get; set; } = Guid.NewGuid();
-    {
+
-        Id = Guid.NewGuid();
-        CreatedDate = DateTime.Now;
-    }
-    
-    public Guid Id { get; set; }
-    
     public bool Enabled { get; set; }
     
     public bool Confirmed { get; set; }
@@ -29,7 +23,7 @@ public class AuthorityUser
 
     public string? PasswordHash { get; set; }
     
-    public DateTime CreatedDate { get; set; }
+    public DateTime CreatedDate { get; set; } = DateTime.Now;
 
     public bool TwoFactorEnabled { get; set; }
 

DotBased.Data/DotBased.Data.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\DotBased\DotBased.csproj" />
+    </ItemGroup>
+
+</Project>

DotBased.sln

@@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{624E7B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotBased.AspNet.Authority", "DotBased.AspNet.Authority\DotBased.AspNet.Authority.csproj", "{A3ADC9AF-39B7-4EC4-8022-946118A8C322}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotBased.Data", "DotBased.Data\DotBased.Data.csproj", "{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -60,6 +62,10 @@ Global
 		{A3ADC9AF-39B7-4EC4-8022-946118A8C322}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3ADC9AF-39B7-4EC4-8022-946118A8C322}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3ADC9AF-39B7-4EC4-8022-946118A8C322}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{EBBDAF9A-BFC7-4BDC-8C51-0501B59A1DDC} = {2156FB93-C252-4B33-8A0C-73C82FABB163}
@@ -69,5 +75,6 @@ Global
 		{AC8343A5-7953-4E1D-A926-406BE4D7E819} = {DBDB4538-85D4-45AC-9E0A-A684467AEABA}
 		{624E7B11-8A18-46E5-AB1F-6AF6097F9D4D} = {2156FB93-C252-4B33-8A0C-73C82FABB163}
 		{A3ADC9AF-39B7-4EC4-8022-946118A8C322} = {624E7B11-8A18-46E5-AB1F-6AF6097F9D4D}
+		{2DF9FEEF-5A60-4B41-9B5F-F883DCE33EF4} = {2156FB93-C252-4B33-8A0C-73C82FABB163}
 	EndGlobalSection
 EndGlobal