Merge branch 'release/7.0.0'

Author: workcontrolgit

Apiresources.Application/Enums/Roles.cs

@@ -3,7 +3,7 @@
     public enum Roles
     {
         SuperAdmin,
-        HRAdmin,
+        Admin,
         Manager,
         Employee
     }

Apiresources.WebApi/Apiresources.WebApi.csproj

@@ -25,7 +25,6 @@
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.3.1" />

Apiresources.WebApi/Extensions/AuthorizationConsts.cs

@@ -3,7 +3,7 @@ namespace $safeprojectname$.Extensions
 {
     public class AuthorizationConsts
     {
-        public const string HrAdminPolicy = "HrAdminPolicy";
+        public const string AdminPolicy = "AdminPolicy";
         public const string ManagerPolicy = "ManagerPolicy";
         public const string EmployeePolicy = "EmployeePolicy";
     }

Apiresources.WebApi/Extensions/ServiceExtensions.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.OpenApi.Models;
 using System;
 using System.Collections.Generic;
@@ -124,14 +123,14 @@ public static void AddJWTAuthentication(this IServiceCollection services, IConfi
         }
         public static void AddAuthorizationPolicies(this IServiceCollection services, IConfiguration configuration)
         {
-            string hradmin = configuration["ApiRoles:HRAdminRole"],
+            string admin = configuration["ApiRoles:AdminRole"],
                     manager = configuration["ApiRoles:ManagerRole"], employee = configuration["ApiRoles:EmployeeRole"];
 
             services.AddAuthorization(options =>
             {
-                options.AddPolicy(AuthorizationConsts.HrAdminPolicy, policy => policy.RequireAssertion(context => HasRole(context.User, hradmin)));
-                options.AddPolicy(AuthorizationConsts.ManagerPolicy, policy => policy.RequireAssertion(context => HasRole(context.User, manager) || HasRole(context.User, hradmin)));
-                options.AddPolicy(AuthorizationConsts.EmployeePolicy, policy => policy.RequireAssertion(context => HasRole(context.User, employee) || HasRole(context.User, manager) || HasRole(context.User, hradmin)));
+                options.AddPolicy(AuthorizationConsts.AdminPolicy, policy => policy.RequireAssertion(context => HasRole(context.User, admin)));
+                options.AddPolicy(AuthorizationConsts.ManagerPolicy, policy => policy.RequireAssertion(context => HasRole(context.User, manager) || HasRole(context.User, admin)));
+                options.AddPolicy(AuthorizationConsts.EmployeePolicy, policy => policy.RequireAssertion(context => HasRole(context.User, employee) || HasRole(context.User, manager) || HasRole(context.User, admin)));
             });
         }
         public static bool HasRole(ClaimsPrincipal user, string role)

Apiresources.WebApi/appsettings.json

@@ -99,7 +99,7 @@
   "ApiRoles": {
     "EmployeeRole": "Employee",
     "ManagerRole": "Manager",
-    "HRAdminRole": "HRAdmin"
+    "AdminRole": "Admin"
   },
   "AllowedHosts": "*"
 }

README.md

@@ -11,7 +11,7 @@ Developers can use the Visual Studio template OnionAPI to scaffold a clean archi
 
 The underline tech stack provides loosely-coupled and inverted-dependency architecture with good design patterns and practices.
 
-1. ASP.NET CORE 6 — a framework for creating RESTful services, also known as web APIs, using C#
+1. ASP.NET CORE 7 — a framework for creating RESTful services, also known as web APIs, using C#
 2. Repository Pattern — abstraction layer between the data access layer and the controller
 3. CQRS (Command and Query Responsibility Segregation) Pattern — separating read and update operations for a data store to maximize performance, scalability, and security based on MediatR and AutoMapper
 4. Entity Framework Core — a lightweight, extensible, open-source, and cross-platform version of the popular Entity Framework data access technology