Merge pull request #183 from crupest/auth

Refactor auth module to enable more flexiable permission control.

3 files changed, 24 insertions, 22 deletions

diff --git a/BackEnd/Timeline/Models/Http/Common.cs b/BackEnd/Timeline/Models/Http/Common.cs
index 5fa22c9e..2101a1bb 100644
--- a/BackEnd/Timeline/Models/Http/Common.cs
+++ b/BackEnd/Timeline/Models/Http/Common.cs
@@ -94,13 +94,13 @@ namespace Timeline.Models.Http
             public bool Delete { get; set; }

         }

 

-            /// <summary></summary>

+        /// <summary></summary>

         public CommonDeleteResponse()

         {

 

         }

 

-            /// <summary></summary>

+        /// <summary></summary>

         public CommonDeleteResponse(int code, string message, bool delete)

             : base(code, message, new ResponseData(delete))

         {

diff --git a/BackEnd/Timeline/Models/Http/UserController.cs b/BackEnd/Timeline/Models/Http/UserController.cs
index 6bc5a66e..92a63874 100644
--- a/BackEnd/Timeline/Models/Http/UserController.cs
+++ b/BackEnd/Timeline/Models/Http/UserController.cs
@@ -2,6 +2,7 @@ using AutoMapper;
 using System.ComponentModel.DataAnnotations;

 using Timeline.Controllers;

 using Timeline.Models.Validation;

+using Timeline.Services;

 

 namespace Timeline.Models.Http

 {

@@ -27,11 +28,6 @@ namespace Timeline.Models.Http
         /// </summary>

         [Nickname]

         public string? Nickname { get; set; }

-

-        /// <summary>

-        /// Whether to be administrator. Null if not change. Need to be administrator.

-        /// </summary>

-        public bool? Administrator { get; set; }

     }

 

     /// <summary>

@@ -50,18 +46,6 @@ namespace Timeline.Models.Http
         /// </summary>

         [Required, MinLength(1)]

         public string Password { get; set; } = default!;

-

-        /// <summary>

-        /// Whether the new user is administrator.

-        /// </summary>

-        [Required]

-        public bool? Administrator { get; set; }

-

-        /// <summary>

-        /// Nickname of the new user.

-        /// </summary>

-        [Nickname]

-        public string? Nickname { get; set; }

     }

 

     /// <summary>

@@ -86,8 +70,7 @@ namespace Timeline.Models.Http
     {

         public UserControllerAutoMapperProfile()

         {

-            CreateMap<UserPatchRequest, User>(MemberList.Source);

-            CreateMap<CreateUserRequest, User>(MemberList.Source);

+            CreateMap<UserPatchRequest, ModifyUserParams>();

         }

     }

 }

diff --git a/BackEnd/Timeline/Models/Http/UserInfo.cs b/BackEnd/Timeline/Models/Http/UserInfo.cs
index d92a12c4..26b04e90 100644
--- a/BackEnd/Timeline/Models/Http/UserInfo.cs
+++ b/BackEnd/Timeline/Models/Http/UserInfo.cs
@@ -2,7 +2,9 @@
 using Microsoft.AspNetCore.Mvc;

 using Microsoft.AspNetCore.Mvc.Infrastructure;

 using Microsoft.AspNetCore.Mvc.Routing;

+using System.Collections.Generic;

 using Timeline.Controllers;

+using Timeline.Services;

 

 namespace Timeline.Models.Http

 {

@@ -27,6 +29,12 @@ namespace Timeline.Models.Http
         /// True if the user is a administrator.

         /// </summary>

         public bool? Administrator { get; set; } = default!;

+#pragma warning disable CA2227 // Collection properties should be read only

+        /// <summary>

+        /// The permissions of the user.

+        /// </summary>

+        public List<string> Permissions { get; set; } = default!;

+#pragma warning restore CA2227 // Collection properties should be read only

 #pragma warning disable CA1707 // Identifiers should not contain underscores

         /// <summary>

         /// Related links.

@@ -54,6 +62,14 @@ namespace Timeline.Models.Http
         public string Timeline { get; set; } = default!;

     }

 

+    public class UserPermissionsValueConverter : ITypeConverter<UserPermissions, List<string>>

+    {

+        public List<string> Convert(UserPermissions source, List<string> destination, ResolutionContext context)

+        {

+            return source.ToStringList();

+        }

+    }

+

     public class UserInfoLinksValueResolver : IValueResolver<User, UserInfo, UserInfoLinks>

     {

         private readonly IActionContextAccessor _actionContextAccessor;

@@ -84,7 +100,10 @@ namespace Timeline.Models.Http
     {

         public UserInfoAutoMapperProfile()

         {

-            CreateMap<User, UserInfo>().ForMember(u => u._links, opt => opt.MapFrom<UserInfoLinksValueResolver>());

+            CreateMap<UserPermissions, List<string>>()

+                .ConvertUsing<UserPermissionsValueConverter>();

+            CreateMap<User, UserInfo>()

+                .ForMember(u => u._links, opt => opt.MapFrom<UserInfoLinksValueResolver>());

         }

     }

 }