Dev v3

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "Console/Workspace"]
 	path = Console/Workspace
 	url = https://github.com/BEXIS2/Workspace.git
+	branch = .
 [submodule "Components/Vaiona"]
 	path = Components/Vaiona
 	url = https://github.com/BEXIS2/VWF.Mvc.git

Components/AAA/BExIS.Security.Services.Tests/BExIS.Security.Services.Tests.csproj

@@ -53,9 +53,6 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=5.10.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FluentAssertions.5.10.3\lib\net47\FluentAssertions.dll</HintPath>
-    </Reference>
     <Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
     </Reference>
@@ -91,7 +88,7 @@
       <HintPath>..\..\..\packages\Moq.4.8.1\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=5.4.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\NHibernate.5.4.9\lib\net48\NHibernate.dll</HintPath>

Components/AAA/BExIS.Security.Services.Tests/Subjects/GroupManagerTests.cs

@@ -6,6 +6,10 @@ namespace BExIS.Security.Services.Tests.Subjects
     [TestFixture]
     public class GroupManagerTests
     {
+        private readonly GroupManager _groupManager;
+
+
+
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
@@ -28,15 +32,11 @@ public void OneTimeTearDown()
 
         public void CreateAsync_GroupIsNull_ReturnZero()
         {
-            //Arrange
-            using (var a = new GroupManager())
-            {
-                //Act
-                var result = a.CreateAsync(null);
-
-                //Assert
-                Assert.That(result, Is.EqualTo(0));
-            }
+            //Act
+            var result = _groupManager.CreateAsync(null);
+
+            //Assert
+            Assert.That(result, Is.EqualTo(0));
         }
     }
 }

Components/AAA/BExIS.Security.Services.Tests/packages.config

@@ -2,7 +2,6 @@
 <packages>
   <package id="Antlr3.Runtime" version="3.5.1" targetFramework="net48" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net48" />
-  <package id="FluentAssertions" version="5.10.3" targetFramework="net48" />
   <package id="Iesi.Collections" version="4.0.4" targetFramework="net48" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.4" targetFramework="net48" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.4" targetFramework="net48" />
@@ -14,7 +13,7 @@
   <package id="Microsoft.Owin.Security.Cookies" version="4.2.2" targetFramework="net48" />
   <package id="Microsoft.Owin.Security.OAuth" version="4.2.2" targetFramework="net48" />
   <package id="Moq" version="4.8.1" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
   <package id="NHibernate" version="5.4.9" targetFramework="net48" />
   <package id="Npgsql" version="4.0.17" targetFramework="net48" />
   <package id="NUnit" version="3.14.0" targetFramework="net48" />

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

@@ -10,28 +10,10 @@
 
 namespace BExIS.Security.Services.Authentication
 {
-    public class LdapAuthenticationManager : IDisposable
+    public class LdapAuthenticationManager
     {
-        private readonly IUnitOfWork _guow;
-        private bool _isDisposed;
-
         private readonly List<LdapConfiguration> _ldapConfigurations;
 
-        public LdapAuthenticationManager()
-        {
-            _guow = this.GetIsolatedUnitOfWork();
-            _ldapConfigurations = GeneralSettings.LdapConfigurations;
-        }
-
-        ~LdapAuthenticationManager()
-        {
-            Dispose(true);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
 
         public User GetUser(string name, string username, string password)
         {
@@ -88,18 +70,5 @@ public SignInStatus ValidateUser(string name, string username, string password)
 
             return SignInStatus.Failure;
         }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    if (_guow != null)
-                        _guow.Dispose();
-                    _isDisposed = true;
-                }
-            }
-        }
     }
 }

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

@@ -1,16 +1,27 @@
 using BExIS.Security.Entities.Subjects;
 using BExIS.Security.Services.Subjects;
 using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
 using Microsoft.Owin.Security;
+using Org.BouncyCastle.Crypto;
+using Vaiona.IoC;
 
 namespace BExIS.Security.Services.Authentication
 {
-    public sealed class SignInManager : SignInManager<User, long>
+    public class SignInManager : SignInManager<User, long>
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Justification = "<Ausstehend>")]
-        public SignInManager(IAuthenticationManager authenticationManager, UserManager userManager)
-             : base(new IdentityUserService(userManager), authenticationManager)
+        // Konstruktor bleibt gleich
+        public SignInManager(
+            UserManager userManager,
+            IAuthenticationManager authenticationManager)
+            : base(userManager, authenticationManager)
+        { }
+
+        public static SignInManager Create(IdentityFactoryOptions<SignInManager> options, IOwinContext context)
         {
+            var userManager = IoCFactory.Container.Resolve<UserManager>();   // ← aus Unity!
+            var authManager = context.Authentication;
+            return new SignInManager(userManager, authManager);
         }
     }
 }

Components/AAA/BExIS.Security.Services/Authorization/EntityPermissionManager.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Vaiona.Persistence.Api;
 using Vaiona.Utils.Cfg;
@@ -15,30 +16,42 @@
 
 namespace BExIS.Security.Services.Authorization
 {
-    public class EntityPermissionManager : IDisposable
+    public class EntityPermissionManager
     {
-        private readonly IUnitOfWork _guow;
-        private bool _isDisposed;
-
-        public EntityPermissionManager()
+        public int Count()
         {
-            _guow = this.GetIsolatedUnitOfWork();
-            EntityPermissionRepository = _guow.GetReadOnlyRepository<EntityPermission>();
+            using (var uow = this.GetUnitOfWork())
+            {
+                var entityPermissionRepository = uow.GetReadOnlyRepository<EntityPermission>();
+                return entityPermissionRepository.Query().Count();
+            }
         }
 
-        ~EntityPermissionManager()
+        public int Count(Expression<Func<Group, bool>> predicate)
         {
-            Dispose(true);
+            using (var uow = this.GetUnitOfWork())
+            {
+                var entityPermissionRepository = uow.GetReadOnlyRepository<EntityPermission>();
+                return entityPermissionRepository.Query(predicate).Count();
+            }
         }
 
-        public IReadOnlyRepository<EntityPermission> EntityPermissionRepository { get; }
-        public IQueryable<EntityPermission> EntityPermissions => EntityPermissionRepository.Query();
+        public IList<EntityPermission> Get()
+        {
+            using (var uow = this.GetUnitOfWork())
+            {
+                var entityPermissionRepository = uow.GetReadOnlyRepository<EntityPermission>();
+
+                var entityPermissions = entityPermissionRepository.Get();
+                return entityPermissions;
+            }
+        }
 
         public async Task<bool> CreateAsync(EntityPermission entityPermission)
         {
             using (var uow = this.GetUnitOfWork())
             {
-                var entityPermissionRepository = _guow.GetRepository<EntityPermission>();
+                var entityPermissionRepository = uow.GetRepository<EntityPermission>();
                 var result = entityPermissionRepository.Put(entityPermission);
                 uow.Commit();
 
@@ -175,11 +188,6 @@ public async Task<bool> DeleteAsync(long entityPermissionId)
             }
         }
 
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
         public async Task<bool> ExistsAsync(long entityId, long key)
         {
             using (var uow = this.GetUnitOfWork())
@@ -232,6 +240,16 @@ public async Task<bool> ExistsAsync(Subject subject, Entity entity, long key)
             }
         }
 
+        public IList<EntityPermission> Find(Expression<Func<EntityPermission, bool>> predicate)
+        {
+            using (var uow = this.GetUnitOfWork())
+            {
+                var entityPermissionRepository = uow.GetReadOnlyRepository<EntityPermission>();
+                var entityPermissions = entityPermissionRepository.Query(predicate).ToList();
+                return entityPermissions;
+            }
+        }
+
         public async Task<EntityPermission> FindAsync(long entityId, long instanceId)
         {
             using (var uow = this.GetUnitOfWork())
@@ -578,12 +596,5 @@ public async Task UpdateAsync(EntityPermission entity)
 
             await Task.CompletedTask;
         }
-
-        protected void Dispose(bool disposing)
-        {
-            if (_isDisposed || !disposing) return;
-            _guow?.Dispose();
-            _isDisposed = true;
-        }
     }
 }

Components/AAA/BExIS.Security.Services/Authorization/FeaturePermissionManager.cs

@@ -266,7 +266,7 @@ public async Task<bool> HasAccessAsync<T>(string subjectName, string module, str
             if (operation == null) return false;
 
             var feature = operation?.Feature;
-            var subject = SubjectRepository.Query(s => s.Name.ToUpperInvariant() == subjectName.ToUpperInvariant() && s is T).FirstOrDefault();
+            var subject = !string.IsNullOrEmpty(subjectName) ? SubjectRepository.Query(s => s.Name.ToUpperInvariant() == subjectName.ToUpperInvariant() && s is T).FirstOrDefault() : null;
 
             //both exits
             if (feature != null)

Components/AAA/BExIS.Security.Services/BExIS.Security.Services.csproj

@@ -52,12 +52,18 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
+    <Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
+    </Reference>
     <Reference Include="MailKit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MailKit.3.1.1\lib\net48\MailKit.dll</HintPath>
     </Reference>
@@ -67,6 +73,7 @@
     <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.AspNet.Identity.Owin.2.2.4\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
     </Reference>
@@ -104,14 +111,23 @@
       <HintPath>..\..\..\packages\MimeKit.4.8.0\lib\net48\MimeKit.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=5.4.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NHibernate.5.4.9\lib\net48\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
     <Reference Include="Owin.Security.Providers.Orcid, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1328b8c16b108c43, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Owin.Security.Providers.Orcid.2.26.0\lib\net45\Owin.Security.Providers.Orcid.dll</HintPath>
     </Reference>
+    <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="Remotion.Linq.EagerFetching, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -138,9 +154,12 @@
       <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="Vaiona.Entities">
       <HintPath>..\..\Vaiona\Vaiona.Entities\bin\Release\Vaiona.Entities.dll</HintPath>
@@ -166,11 +185,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Requests\DecisionManager.cs" />
     <Compile Include="Requests\RequestManager.cs" />
-    <Compile Include="Subjects\IdentityGroupService.cs" />
-    <Compile Include="Subjects\IdentityUserService.cs" />
+    <Compile Include="Subjects\GroupStore.cs" />
+    <Compile Include="Subjects\UserManager.cs" />
     <Compile Include="Subjects\GroupManager.cs" />
     <Compile Include="Subjects\SubjectManager.cs" />
-    <Compile Include="Subjects\UserManager.cs" />
+    <Compile Include="Subjects\UserStore.cs" />
     <Compile Include="Utilities\Auth.cs" />
     <Compile Include="Utilities\EmailService.cs" />
     <Compile Include="Utilities\MessageHelper.cs" />
@@ -194,6 +213,10 @@
       <Project>{0815d220-3625-4e23-bbbc-8152345637fe}</Project>
       <Name>Vaiona.Entities</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Vaiona\Vaiona.IoC\Vaiona.IoC.csproj">
+      <Project>{29A7BE0F-A17C-4AE8-8CA1-15FE4DD74129}</Project>
+      <Name>Vaiona.IoC</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Vaiona\Vaiona.Persistence.Api\Vaiona.Persistence.Api.csproj">
       <Project>{640bf81d-354a-4bf0-85fc-f0ad587cf8a2}</Project>
       <Name>Vaiona.Persistence.Api</Name>