Merge pull request #2287 from BEXIS2/rc

release 4.2.0

Author: DavidBlaa

.editorconfig

@@ -84,6 +84,9 @@ csharp_prefer_simple_using_statement = true:suggestion
 csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 
+# CS1591: Fehledes XML-Kommentar für öffentlich sichtbaren Typ oder Element
+dotnet_diagnostic.CS1591.severity = none
+
 [*.vb]
 #### Benennungsstile ####
 

.github/workflows/main.yml

@@ -11,6 +11,7 @@ jobs:
 
     steps:
       - name: Checkout repository
+
         uses: actions/checkout@v4
 
       - name: Install .NET SDK
@@ -26,7 +27,9 @@ jobs:
           upgrade-assistant analyze BExIS%2B%2B.sln --format json > upgrade-report.json
 
       - name: Upload report artifact
-        uses: actions/[email protected]
+
+        uses: actions/upload-artifact@v4
+
         with:
           name: upgrade-report
           path: upgrade-report.json

.gitignore

@@ -281,3 +281,4 @@ svelte
 /Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Scripts/svelte
 /_output
 /Console/BExIS.Web.Shell/Web.config
+/Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Properties/PublishProfiles/FolderProfile.pubxml

BExIS++.sln

@@ -230,6 +230,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Ext.Orm.NH", "Compone
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Modules.Dim.UI", "Console\BExIS.Web.Shell\Areas\DIM\BExIS.Modules.Dim.UI\BExIS.Modules.Dim.UI.csproj", "{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SMM", "SMM", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Modules.SMM.UI", "Console\BExIS.Web.Shell\Areas\SMM\BExIS.Modules.SMM.UI\BExIS.Modules.SMM.UI.csproj", "{37402CAB-EB81-4D08-8791-8653949C0FEB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1486,6 +1490,24 @@ Global
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|x86.Build.0 = Release|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Any CPU.ActiveCfg = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Any CPU.Build.0 = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Mixed Platforms.ActiveCfg = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
+		{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1580,6 +1602,8 @@ Global
 		{AF3D9C1F-968A-46DD-86FB-6B45020DF4E3} = {CD986786-CEA1-4C30-983E-169C33600BA6}
 		{C48DCFC5-DF47-4486-A682-5C648F970318} = {CD986786-CEA1-4C30-983E-169C33600BA6}
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377} = {F3354AC7-CDA1-44E2-8E85-8DB532ED8C75}
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {692AFF14-3A57-47D8-912F-093EC8F561C4}
+		{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}

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

@@ -125,6 +125,13 @@ public Task<bool> DeleteByIdAsync(long userId)
                 //return Task.FromException(new Exception());
                 return Task.FromResult(false);
 
+            // Logins
+            var loginsRepository = _guow.GetRepository<Login>();
+            foreach (var login in loginsRepository.Get(l => l.User.Id == userId))
+            {
+                loginsRepository.Delete(login);
+            }
+
             // EntityPermissions
             var entityPermissionRepository = _guow.GetRepository<EntityPermission>();
             foreach (var entityPermission in entityPermissionRepository.Get(e => e.Subject.Id == userId))

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

@@ -4,12 +4,12 @@
 using BExIS.Security.Services.Authorization;
 using BExIS.Security.Services.Objects;
 using BExIS.Security.Services.Subjects;
-using BExIS.Utils.Config;
 using System;
 using System.Linq;
 using System.Net;
 using System.Web;
 using System.Web.Mvc;
+using BExIS.Utils.Config;
 
 namespace BExIS.App.Bootstrap.Attributes
 {

…ibutes/ValidateAntiForgeryTokenOnPost.cs …ibutes/CustomValidateAntiForgeryToken.csComponents/App/BExIS.App.Bootstrap/Attributes/ValidateAntiForgeryTokenOnPost.cs renamed to Components/App/BExIS.App.Bootstrap/Attributes/CustomValidateAntiForgeryToken.cs Components/App/BExIS.App.Bootstrap/Attributes/ValidateAntiForgeryTokenOnPost.cs renamed to Components/App/BExIS.App.Bootstrap/Attributes/CustomValidateAntiForgeryToken.cs

@@ -4,7 +4,7 @@
 
 namespace BExIS.App.Bootstrap.Attributes
 {
-    public class ValidateAntiForgeryTokenOnPost: FilterAttribute, IAuthorizationFilter
+    public class CustomValidateAntiForgeryToken: FilterAttribute, IAuthorizationFilter
     {
         public void OnAuthorization(AuthorizationContext filterContext)
         {
@@ -18,12 +18,17 @@ public void OnAuthorization(AuthorizationContext filterContext)
                 var formToken = request.Form["__RequestVerificationToken"];
 
                 // check header for post from javascript
+
                 if (formToken==null)
                 {
                     formToken = request.Headers["__RequestVerificationToken"];
                 }
 
-                AntiForgery.Validate(cookieToken, formToken);
+                if (cookieToken != null)
+                {
+                    AntiForgery.Validate(cookieToken, formToken);
+                }
+
                 //AntiForgery.Validate();
             }
         }

Components/App/BExIS.App.Bootstrap/BExIS.App.Bootstrap.csproj

@@ -112,7 +112,7 @@
     <Compile Include="Attributes\MinCapacityAttribute.cs" />
     <Compile Include="Attributes\NoNullOrEmptyItemsAttribute.cs" />
     <Compile Include="Attributes\ThrottlingFilterAttribute.cs" />
-    <Compile Include="Attributes\ValidateAntiForgeryTokenOnPost.cs" />
+    <Compile Include="Attributes\CustomValidateAntiForgeryToken.cs" />
     <Compile Include="Extensions\AuthorizationContextExtensions.cs" />
     <Compile Include="Helpers\BExISAuthorizeHelper.cs" />
     <Compile Include="Helpers\JwtHelper.cs" />
@@ -132,7 +132,7 @@
       <Name>BExIS.Ext.Services</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Utils\BExIS.Utils.Config\BExIS.Utils.Config.csproj">
-      <Project>{6ead7d02-02f7-42ff-85e4-90bb892d3846}</Project>
+      <Project>{6EAD7D02-02F7-42FF-85E4-90BB892D3846}</Project>
       <Name>BExIS.Utils.Config</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Utils\BExIS.Utils.Data\BExIS.Utils.Data.csproj">

Components/App/BExIS.App.Testing/BExIS.App.Testing.csproj

@@ -103,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Utils\BExIS.Utils.Config\BExIS.Utils.Config.csproj">
-      <Project>{6ead7d02-02f7-42ff-85e4-90bb892d3846}</Project>
+      <Project>{6EAD7D02-02F7-42FF-85E4-90BB892D3846}</Project>
       <Name>BExIS.Utils.Config</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Vaiona\Vaiona.IoC\Vaiona.IoC.csproj">

Components/DLM/BExIS.Dlm.Entities/BExIS.Dlm.Entities.csproj

@@ -62,6 +62,8 @@
   <ItemGroup>
     <Compile Include="Administration\ResearchPlan.cs" />
     <Compile Include="Common\BaseUsage.cs" />
+    <Compile Include="Curation\CurationEntry.cs" />
+    <Compile Include="Curation\CurationNote.cs" />
     <Compile Include="DataStructure\AggregateFunction.cs" />
     <Compile Include="DataStructure\Classifier.cs" />
     <Compile Include="DataStructure\Constraint.cs" />