From d733c7d4011e47a50fe7f0f2e91d0831ef3c2316 Mon Sep 17 00:00:00 2001 From: Leon Hoppe Date: Thu, 26 Sep 2024 12:17:46 +0200 Subject: [PATCH 1/3] Reverted some changes for not breaking release --- .../Controller/SecurityController.cs | 2 +- src/HopFrame.Web/AdminPermissions.cs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/HopFrame.Web/AdminPermissions.cs diff --git a/src/HopFrame.Api/Controller/SecurityController.cs b/src/HopFrame.Api/Controller/SecurityController.cs index d9c1128..fcbed7f 100644 --- a/src/HopFrame.Api/Controller/SecurityController.cs +++ b/src/HopFrame.Api/Controller/SecurityController.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc; namespace HopFrame.Api.Controller; [ApiController] -[Route("api/v1/authentication")] +[Route("authentication")] public class SecurityController(IAuthLogic auth) : ControllerBase { [HttpPut("login")] diff --git a/src/HopFrame.Web/AdminPermissions.cs b/src/HopFrame.Web/AdminPermissions.cs new file mode 100644 index 0000000..e1146ca --- /dev/null +++ b/src/HopFrame.Web/AdminPermissions.cs @@ -0,0 +1,16 @@ +namespace HopFrame.Web; + +[Obsolete("Use HopFrame.Security.AdminPermissions instead")] +public static class AdminPermissions { + public const string IsAdmin = Security.AdminPermissions.IsAdmin; + + public const string ViewUsers = Security.AdminPermissions.ViewUsers; + public const string EditUser = Security.AdminPermissions.EditUser; + public const string DeleteUser = Security.AdminPermissions.DeleteUser; + public const string AddUser = Security.AdminPermissions.AddUser; + + public const string ViewGroups = Security.AdminPermissions.ViewGroups; + public const string EditGroup = Security.AdminPermissions.EditGroup; + public const string DeleteGroup = Security.AdminPermissions.DeleteGroup; + public const string AddGroup = Security.AdminPermissions.AddGroup; +} From e8eb5bd260c1eb49469d18769d092a6ea00903b9 Mon Sep 17 00:00:00 2001 From: Leon Hoppe Date: Thu, 26 Sep 2024 12:33:30 +0200 Subject: [PATCH 2/3] Updated project versions --- src/HopFrame.Api/HopFrame.Api.csproj | 4 ++++ src/HopFrame.Database/HopFrame.Database.csproj | 4 ++++ src/HopFrame.Security/HopFrame.Security.csproj | 4 ++++ src/HopFrame.Web/HopFrame.Web.csproj | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/HopFrame.Api/HopFrame.Api.csproj b/src/HopFrame.Api/HopFrame.Api.csproj index fa215ac..614e37a 100644 --- a/src/HopFrame.Api/HopFrame.Api.csproj +++ b/src/HopFrame.Api/HopFrame.Api.csproj @@ -5,8 +5,12 @@ latest enable disable + + HopFrame.Api + 1.1.0 README.md MIT + true diff --git a/src/HopFrame.Database/HopFrame.Database.csproj b/src/HopFrame.Database/HopFrame.Database.csproj index 870f818..d88b757 100644 --- a/src/HopFrame.Database/HopFrame.Database.csproj +++ b/src/HopFrame.Database/HopFrame.Database.csproj @@ -5,8 +5,12 @@ latest enable disable + + HopFrame.Database + 1.1.0 README.md MIT + true diff --git a/src/HopFrame.Security/HopFrame.Security.csproj b/src/HopFrame.Security/HopFrame.Security.csproj index 8437d1d..b8a814b 100644 --- a/src/HopFrame.Security/HopFrame.Security.csproj +++ b/src/HopFrame.Security/HopFrame.Security.csproj @@ -6,8 +6,12 @@ enable disable HopFrame.Security + + HopFrame.Security + 1.1.0 README.md MIT + true diff --git a/src/HopFrame.Web/HopFrame.Web.csproj b/src/HopFrame.Web/HopFrame.Web.csproj index 88fe5c7..ab3c31a 100644 --- a/src/HopFrame.Web/HopFrame.Web.csproj +++ b/src/HopFrame.Web/HopFrame.Web.csproj @@ -5,8 +5,12 @@ disable enable true + + HopFrame.Web + 1.1.0 README.md MIT + true From c3f8615eba085667911686c473ff1a22c79c15ed Mon Sep 17 00:00:00 2001 From: Leon Hoppe Date: Thu, 26 Sep 2024 12:35:53 +0200 Subject: [PATCH 3/3] Reverted to breaking changes --- .../Controller/SecurityController.cs | 2 +- src/HopFrame.Web/AdminPermissions.cs | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 src/HopFrame.Web/AdminPermissions.cs diff --git a/src/HopFrame.Api/Controller/SecurityController.cs b/src/HopFrame.Api/Controller/SecurityController.cs index fcbed7f..d9c1128 100644 --- a/src/HopFrame.Api/Controller/SecurityController.cs +++ b/src/HopFrame.Api/Controller/SecurityController.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc; namespace HopFrame.Api.Controller; [ApiController] -[Route("authentication")] +[Route("api/v1/authentication")] public class SecurityController(IAuthLogic auth) : ControllerBase { [HttpPut("login")] diff --git a/src/HopFrame.Web/AdminPermissions.cs b/src/HopFrame.Web/AdminPermissions.cs deleted file mode 100644 index e1146ca..0000000 --- a/src/HopFrame.Web/AdminPermissions.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace HopFrame.Web; - -[Obsolete("Use HopFrame.Security.AdminPermissions instead")] -public static class AdminPermissions { - public const string IsAdmin = Security.AdminPermissions.IsAdmin; - - public const string ViewUsers = Security.AdminPermissions.ViewUsers; - public const string EditUser = Security.AdminPermissions.EditUser; - public const string DeleteUser = Security.AdminPermissions.DeleteUser; - public const string AddUser = Security.AdminPermissions.AddUser; - - public const string ViewGroups = Security.AdminPermissions.ViewGroups; - public const string EditGroup = Security.AdminPermissions.EditGroup; - public const string DeleteGroup = Security.AdminPermissions.DeleteGroup; - public const string AddGroup = Security.AdminPermissions.AddGroup; -}