Merge pull request #2162 from BEXIS2/rc

Rc

Author: DavidBlaa

BExIS++.sln

@@ -1582,8 +1582,8 @@ Global
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377} = {F3354AC7-CDA1-44E2-8E85-8DB532ED8C75}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True

CITATION.cff

@@ -0,0 +1,30 @@
+cff-version: 1.2.0
+message: "If you use BEXIS2 in your research, please cite it using the following metadata."
+title: "BEXIS2"
+version: 4.1.0
+date-released: 15.08.2025
+authors:
+- family-names: "Zander"
+  given-names: "Franziska"
+  orcid: "https://orcid.org/0000-0001-6892-7046"
+- family-names: "Schöne"
+  given-names: "David"
+  orcid: "https://orcid.org/0009-0009-4663-8716"
+- family-names: "Thiel"
+  given-names: "Sven"
+  orcid: "https://orcid.org/0000-0003-3093-5635"
+- family-names: "Hohmuth"
+  given-names: "Martin"
+  orcid: "https://orcid.org/0000-0001-7492-3631"
+- family-names: "König-Ries"
+  given-names: "Birgitta"
+  orcid: "https://orcid.org/0000-0002-2382-9722"
+doi: ..
+url: "https://github.com/BEXIS2/Core"
+license: "LGPL-3.0 license"
+type: software
+keywords:
+  - research data management
+  - data repository
+  - data infrastructure
+  - open source

Components/AAA/BExIS.Security.Services/Authentication/LdapAuthenticationManager.cs

@@ -10,7 +10,7 @@
 
 namespace BExIS.Security.Services.Authentication
 {
-    public class LdapAuthenticationManager
+    public class LdapAuthenticationManager : IDisposable
     {
         private readonly IUnitOfWork _guow;
         private bool _isDisposed;

Components/AAA/BExIS.Security.Services/Authentication/SignInManager.cs

@@ -8,8 +8,8 @@ namespace BExIS.Security.Services.Authentication
     public sealed class SignInManager : SignInManager<User, long>
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
-        public SignInManager(IAuthenticationManager authenticationManager)
-             : base(new IdentityUserService(), authenticationManager)
+        public SignInManager(IAuthenticationManager authenticationManager, UserManager userManager)
+             : base(new IdentityUserService(userManager), authenticationManager)
         {
         }
     }

Components/AAA/BExIS.Security.Services/Subjects/GroupManager.cs

@@ -1,4 +1,5 @@
-using BExIS.Security.Entities.Subjects;
+using BExIS.Security.Entities.Authorization;
+using BExIS.Security.Entities.Subjects;
 using BExIS.Utils.NH.Querying;
 using Microsoft.AspNet.Identity;
 using System;
@@ -116,6 +117,45 @@ public Task DeleteAsync(Group role)
             return Task.CompletedTask;
         }
 
+        public Task<bool> DeleteByIdAsync(long roleId)
+        {
+            var groupRepository = _guow.GetRepository<Group>();
+            var group = groupRepository.Get(roleId);
+
+            if (group == null)
+                //return Task.FromException(new Exception());
+                return Task.FromResult(false);
+
+
+            // Users
+            var userRepository = _guow.GetRepository<User>();
+            foreach (var user in group.Users)
+            {
+                user.Groups.Remove(group);
+                userRepository.Put(user);
+            }
+
+            // EntityPermissions
+            var entityPermissionRepository = _guow.GetRepository<EntityPermission>();
+            foreach (var entityPermission in entityPermissionRepository.Get(e => e.Subject.Id == roleId))
+            {
+                entityPermissionRepository.Delete(entityPermission);
+            }
+
+            // FeaturePermissions
+            var featurePermissionRepository = _guow.GetRepository<FeaturePermission>();
+            foreach (var featurePermission in featurePermissionRepository.Get(e => e.Subject.Id == roleId))
+            {
+                featurePermissionRepository.Delete(featurePermission);
+            }
+
+            var result = groupRepository.Delete(group);
+
+            _guow.Commit();
+
+            return Task.FromResult(result);
+        }
+
         public void Dispose()
         {
             this.Dispose(true);

Components/AAA/BExIS.Security.Services/Subjects/IdentityGroupService.cs

@@ -1,22 +1,49 @@
 using BExIS.Security.Entities.Subjects;
+using BExIS.Utils.NH.Querying;
 using Microsoft.AspNet.Identity;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace BExIS.Security.Services.Subjects
 {
     public class IdentityGroupService : RoleManager<Group, long>
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
-        public IdentityGroupService() : base(new GroupManager())
+        private readonly GroupManager _groupManager;
+        private bool _disposed;
+
+        //[System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
+        public IdentityGroupService(GroupManager groupManager) : base(groupManager)
         {
+            _groupManager = groupManager ?? throw new ArgumentNullException(nameof(groupManager));
+
             RoleValidator = new RoleValidator<Group, long>(this)
             {
             };
         }
 
+        public Task<bool> DeleteByIdAsync(long roleId)
+        {
+            return _groupManager.DeleteByIdAsync(roleId);
+        }
+
+        public List<Group> GetGroups(FilterExpression filter, OrderByExpression orderBy, int pageNumber, int pageSize, out int count)
+        {
+            return _groupManager.GetGroups(filter, orderBy, pageNumber, pageSize, out count);
+        }
         protected override void Dispose(bool disposing)
         {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    _groupManager?.Dispose();
+                }
+
+                _disposed = true;
+            }
+
             base.Dispose(disposing);
-            Store.Dispose();
         }
     }
 }

Components/AAA/BExIS.Security.Services/Subjects/IdentityUserService.cs

@@ -9,9 +9,14 @@ namespace BExIS.Security.Services.Subjects
 {
     public class IdentityUserService : UserManager<User, long>
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
-        public IdentityUserService() : base(new UserManager())
+        private readonly UserManager _userManager;
+        private bool _disposed;
+
+        //[System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
+        public IdentityUserService(UserManager userManager) : base(userManager)
         {
+            _userManager = userManager;
+
             // Configure validation logic for usernames
             UserValidator = new UserValidator<User, long>(this)
             {
@@ -54,8 +59,17 @@ public IdentityUserService() : base(new UserManager())
 
         protected override void Dispose(bool disposing)
         {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    _userManager?.Dispose();
+                }
+
+                _disposed = true;
+            }
+
             base.Dispose(disposing);
-            Store.Dispose();
         }
     }
 }

Components/AAA/BExIS.Security.Services/Subjects/UserManager.cs

@@ -1,4 +1,5 @@
 using BExIS.Security.Entities.Authentication;
+using BExIS.Security.Entities.Authorization;
 using BExIS.Security.Entities.Subjects;
 using BExIS.Utils.NH.Querying;
 using Microsoft.AspNet.Identity;
@@ -115,12 +116,34 @@ public Task DeleteAsync(User user)
             return Task.CompletedTask;
         }
 
-        public Task DeleteByIdAsync(long userId)
+        public Task<bool> DeleteByIdAsync(long userId)
         {
-            _guow.GetRepository<User>().Delete(userId);
+            var userRepository = _guow.GetRepository<User>();
+            var user = userRepository.Get(userId);
+
+            if(user == null)
+                //return Task.FromException(new Exception());
+                return Task.FromResult(false);
+
+            // EntityPermissions
+            var entityPermissionRepository = _guow.GetRepository<EntityPermission>();
+            foreach (var entityPermission in entityPermissionRepository.Get(e => e.Subject.Id == userId))
+            {
+                entityPermissionRepository.Delete(entityPermission);
+            }
+
+            // FeaturePermissions
+            var featurePermissionRepository = _guow.GetRepository<FeaturePermission>();
+            foreach (var featurePermission in featurePermissionRepository.Get(e => e.Subject.Id == userId))
+            {
+                featurePermissionRepository.Delete(featurePermission);
+            }
+
+            var result = userRepository.Delete(user);
+
             _guow.Commit();
 
-            return Task.CompletedTask;
+            return Task.FromResult(result);
         }
 
         public void Dispose()

Components/AAA/BExIS.Security.Services/Utilities/MessageHelper.cs

@@ -38,6 +38,22 @@ public static string GetDeleteDatasetMessage(long datasetid, string userName, st
             return message + ".";
         }
 
+        public static string GetUndoDeleteDatasetHeader(long datasetid, string entityname)
+        {
+            return $"{entityname}: Restore (ID {datasetid})";
+        }
+
+        public static string GetUndoDeleteDatasetMessage(long datasetid, string userName, string entityname)
+        {
+            string message = $"{entityname} with ID <b>{datasetid}</b> was restored";
+
+            if (!string.IsNullOrEmpty(userName))
+
+                return message += $" by <b>{userName}</b>";
+
+            return message + ".";
+        }
+
         public static string GetTryToDeleteDatasetHeader(long datasetid, string entityname)
         {
             return $"{entityname}: Try to delete ID {datasetid}";

Components/App/BExIS.App.Bootstrap/Attributes/BExISApiAuthorizeAttribute.cs

@@ -26,7 +26,7 @@ public override void OnAuthorization(HttpActionContext actionContext)
                 using (var featurePermissionManager = new FeaturePermissionManager())
                 using (var operationManager = new OperationManager())
                 using (var userManager = new UserManager())
-                using (var identityUserService = new IdentityUserService())
+                using (var identityUserService = new IdentityUserService(userManager))
                 {
                     var areaName = "Api";
                     var controllerName = actionContext.ActionDescriptor.ControllerDescriptor.ControllerName;