Merge pull request #483 from Blazam-App/v1-Dev

V1 Nightly update
Blazam-App · Aug 9, 2024 · e6e5d27 · e6e5d27
2 parents 80b542c + e7b2627
commit e6e5d27
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 108 deletions.
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
@@ -7,7 +7,7 @@ name: Build and deploy ASP.Net Core app to Azure Web App - blazam
 on:
   push:
     branches:
-      - Beta-Nightly
+      - v1-Nightly
   workflow_dispatch:
 
 jobs:
@@ -17,11 +17,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Set up .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.x
       - name: Setup .NET Core SDK 8
         uses: actions/setup-dotnet@v1
         with:

diff --git a/BLAZAM.Tests/BLAZAM.Tests.csproj b/BLAZAM.Tests/BLAZAM.Tests.csproj
@@ -15,10 +15,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.0.0</AssemblyVersion>
-		<Version>2024.08.09.0701</Version>
+		<Version>2024.08.09.1713</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -58,12 +58,8 @@
 		<PackageReference Include="Cassia" Version="2.0.0.60" />
 		<PackageReference Include="DuoUniversal" Version="1.2.5" />
 		<PackageReference Include="MailKit" Version="4.7.1.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.7" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.7" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />

diff --git a/BLAZAM/Pages/Users/ViewUser.razor b/BLAZAM/Pages/Users/ViewUser.razor
@@ -71,7 +71,7 @@
                             <LogOnToModalContent User="User" />
                         }
                     </AppModal>
-                    <AppModal Title=@AppLocalization["Logon Hours"] @ref=@LogonHoursModal  Options=@(new DialogOptions(){CloseButton=true, FullWidth=true,MaxWidth=MaxWidth.ExtraExtraLarge})>
+                    <AppModal Title=@AppLocalization["Logon Hours"] @ref=@LogonHoursModal Options=@(new DialogOptions(){CloseButton=true, FullWidth=true,MaxWidth=MaxWidth.ExtraExtraLarge})>
                         @if (LogonHoursModal?.IsShown == true)
                         {
                             <LogonHoursModalContent User="User" />
@@ -272,8 +272,8 @@
                                                     @AppLocalization["Log On To"]
                                                 </MudButton>
 
-                                            } 
-                                            
+                                            }
+
                                             @if (User.CanReadField(ActiveDirectoryFields.LogonHours))
                                             {
                                                 <MudButton Variant="Variant.Filled"
@@ -469,7 +469,7 @@
 
 
 @code {
-    #nullable disable warnings
+#nullable disable warnings
     string password;
 
     [Parameter]
@@ -554,7 +554,7 @@
                 if (jobResults.Result == JobResult.Passed)
                 {
 
-                    foreach(var assignment in assignTo)
+                    foreach (var assignment in assignTo)
                     {
                         await AuditLogger.User.Assigned(assignment.Member, assignment.Group);
                         await AuditLogger.Group.MemberAdded(assignment.Group, assignment.Member);
@@ -570,7 +570,7 @@
                         _ = OUNotificationService.PostAsync(User, NotificationType.Modify);
                         await AuditLogger.User.Changed(User, changes.Where(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName).ToList());
                     }
-                   
+
                     EditMode = false;
                     Nav.WarnOnNavigation = false;
                     SnackBarService.Success("The changes made to this user have been saved.");

diff --git a/BLAZAM/Program.cs b/BLAZAM/Program.cs
@@ -6,12 +6,10 @@
 using Serilog;
 using BLAZAM.Common.Data;
 using BLAZAM.Server;
-using BLAZAM.Services.Background;
 using System.Net;
 using BLAZAM.Database.Context;
 using System.Diagnostics;
 using System.Security.Cryptography.X509Certificates;
-using System.Net.WebSockets;
 using BLAZAM.Database.Models;
 
 namespace BLAZAM

diff --git a/BLAZAMActiveDirectory/ActiveDirectoryContext.cs b/BLAZAMActiveDirectory/ActiveDirectoryContext.cs
@@ -2,7 +2,6 @@
 using BLAZAM.ActiveDirectory.Interfaces;
 using BLAZAM.ActiveDirectory.Searchers;
 using BLAZAM.Common.Data;
-using BLAZAM.Common.Data.Database;
 using BLAZAM.Common.Data.Services;
 using BLAZAM.Database.Context;
 using BLAZAM.Database.Models;
@@ -13,11 +12,9 @@
 using System.DirectoryServices;
 using System.DirectoryServices.Protocols;
 using System.Net;
-using System.Security.Claims;
 using BLAZAM.Helpers;
 using System.DirectoryServices.ActiveDirectory;
 using System.Security.Cryptography;
-using System.Diagnostics.Eventing.Reader;
 using System.Security.Principal;
 
 namespace BLAZAM.ActiveDirectory

diff --git a/BLAZAMActiveDirectory/ActiveDirectoryContextFactory.cs b/BLAZAMActiveDirectory/ActiveDirectoryContextFactory.cs
@@ -1,14 +1,8 @@
 using BLAZAM.ActiveDirectory.Interfaces;
-using BLAZAM.Common.Data.Database;
 using BLAZAM.Common.Data.Services;
 using BLAZAM.Database.Context;
 using BLAZAM.Notifications.Services;
 using BLAZAM.Session.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BLAZAM.ActiveDirectory
 {

diff --git a/BLAZAMActiveDirectory/Adapters/ADGroup.cs b/BLAZAMActiveDirectory/Adapters/ADGroup.cs
@@ -224,7 +224,7 @@ public List<IGroupableDirectoryAdapter> Members
             }
         }
         /// <summary>
-        /// Removes a memeber from this group
+        /// Removes a member from this group
         /// </summary>
         /// <param name="member">The user or group to remove</param>
         public void UnassignMember(IGroupableDirectoryAdapter member)
@@ -238,7 +238,7 @@ public void UnassignMember(IGroupableDirectoryAdapter member)
 
         }
         /// <summary>
-        /// Assigns a memeber to this group
+        /// Assigns a member to this group
         /// </summary>
         /// <param name="member"></param>
         public void AssignMember(IGroupableDirectoryAdapter member)

diff --git a/BLAZAMActiveDirectory/Adapters/ADUser.cs b/BLAZAMActiveDirectory/Adapters/ADUser.cs
@@ -1,19 +1,12 @@
-using BLAZAM.ActiveDirectory;
-using BLAZAM.ActiveDirectory.Data;
+using BLAZAM.ActiveDirectory.Data;
 using BLAZAM.ActiveDirectory.Interfaces;
-using BLAZAM.Common.Data;
 using BLAZAM.Database.Models;
 using BLAZAM.FileSystem;
 using BLAZAM.Helpers;
 using BLAZAM.Jobs;
 using BLAZAM.Logger;
 using Microsoft.IdentityModel.Tokens;
 using System.ComponentModel.DataAnnotations;
-using System.DirectoryServices.AccountManagement;
-using System.DirectoryServices.ActiveDirectory;
-using System.DirectoryServices.Protocols;
-using System.Net;
-using System.Security;
 using System.Security.AccessControl;
 using System.Text;
 

diff --git a/BLAZAMActiveDirectory/ScopedActiveDirectoryContext.cs b/BLAZAMActiveDirectory/ScopedActiveDirectoryContext.cs
@@ -1,5 +1,4 @@
 using BLAZAM.ActiveDirectory.Interfaces;
-using BLAZAM.Common.Data.Services;
 using BLAZAM.Session.Interfaces;
 
 namespace BLAZAM.ActiveDirectory

diff --git a/BLAZAMActiveDirectory/Searchers/ADGroupSearcher.cs b/BLAZAMActiveDirectory/Searchers/ADGroupSearcher.cs
@@ -205,9 +205,7 @@ public bool IsAMemberOf(IADGroup group, IGroupableDirectoryAdapter? userOrGroup,
                 ExactMatch = false
 
             }.Search<ADUser, IADUser>().Count>0;
-            string UserSearchFieldsQuery = "(&(memberOf:1.2.840.113556.1.4.1941:=" + group.DN + ")(distinguishedName=" + userOrGroup.DN + "))";
-            return SearchObjects(UserSearchFieldsQuery, userOrGroup.ObjectType, 50, ignoreDisabledUsers)?.Count > 0;
-
+
         }
     }
 }
diff --git a/BLAZAMActiveDirectory/Searchers/ADSearch.cs b/BLAZAMActiveDirectory/Searchers/ADSearch.cs
@@ -2,23 +2,11 @@
 using BLAZAM.ActiveDirectory.Adapters;
 using BLAZAM.ActiveDirectory.Interfaces;
 using BLAZAM.Common.Data;
-using BLAZAM.Common.Data.Database;
 using BLAZAM.Database.Context;
 using BLAZAM.Helpers;
 using BLAZAM.Logger;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.DirectoryServices;
-using System.DirectoryServices.Protocols;
-using System.Drawing.Printing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BLAZAM.ActiveDirectory.Searchers
 {
@@ -61,7 +49,7 @@ public class ADSearch : SearchBase
         /// <summary>
         /// Indicates whether the search is single level or recursive default is recursive
         /// </summary>
-        public System.DirectoryServices.SearchScope SearchScope { get; set; } = System.DirectoryServices.SearchScope.Subtree;
+        public SearchScope SearchScope { get; set; } = SearchScope.Subtree;
 
         /// <summary>
         /// The realtime results of this search. 

diff --git a/BLAZAMCommon.Tests/BLAZAMCommon.Tests.csproj b/BLAZAMCommon.Tests/BLAZAMCommon.Tests.csproj
@@ -10,7 +10,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
@@ -21,10 +20,6 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.2">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/BLAZAMCommon/BLAZAMCommon.csproj b/BLAZAMCommon/BLAZAMCommon.csproj
@@ -22,7 +22,6 @@
 	  <PackageReference Include="Cassia" Version="2.0.0.60" />
 	  <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />

diff --git a/BLAZAMCommon/Data/ApplicationVersion.cs b/BLAZAMCommon/Data/ApplicationVersion.cs
@@ -144,7 +144,7 @@ public override int GetHashCode()
             return Version.GetHashCode();
         }
 
-        public override string? ToString()
+        public override string ToString()
         {
             return Version;
         }

diff --git a/BLAZAMCommon/Data/Encryption.cs b/BLAZAMCommon/Data/Encryption.cs
@@ -1,7 +1,5 @@
 using BLAZAM.Helpers;
 using Newtonsoft.Json;
-using System;
-using System.ComponentModel;
 using System.Security.Cryptography;
 using System.Text;
 

diff --git a/BLAZAMDatabase/BLAZAMDatabase.csproj b/BLAZAMDatabase/BLAZAMDatabase.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
 	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />

diff --git a/BLAZAMFileSystem/SystemDirectory.cs b/BLAZAMFileSystem/SystemDirectory.cs
@@ -1,14 +1,11 @@
 
 
 using Serilog;
-using System.IO;
-using System.Security.Permissions;
-using System.Security;
 
 namespace BLAZAM.FileSystem
 {
     /// <summary>
-    /// Represents a diretory in the filesystem
+    /// Represents a directory in the filesystem
     /// </summary>
     public class SystemDirectory : FileSystemBase
     {

diff --git a/BLAZAMGui/BLAZAMGui.csproj b/BLAZAMGui/BLAZAMGui.csproj
@@ -25,7 +25,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.7" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.7" />
 		<PackageReference Include="MudBlazor" Version="7.6.0" />
 		<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />

diff --git a/BLAZAMJobs/Job.cs b/BLAZAMJobs/Job.cs
@@ -2,17 +2,18 @@
 
 namespace BLAZAM.Jobs
 {
+
     /// <summary>
-    /// 
+    /// A flexible multi step Job that can have actions as trackable steps.
     /// </summary>
-    public class Job : JobStepBase, IJob, IJobStep
+    public class Job : JobStepBase, IJob, IJobStep, IEquatable<IJob?>
     {
         private DateTime scheduledRunTime = DateTime.Now;
         private Timer? runScheduler;
 
         public string? User { get; set; } = "System";
 
-        private IList<IJobStep> _steps = new List<IJobStep>();
+        private IList<IJobStep> _steps = [];
 
         public IList<IJobStep> Steps => _steps;
 
@@ -172,13 +173,26 @@ public override void Cancel()
             }
         }
 
-        public override bool Equals(object? obj)
+
+        public bool Equals(IJob? other)
         {
-            if(obj is IJob job)
-            {
-                return job.Id.Equals(Id);
-            }
-            return false;
+            return other is not null &&
+                   Id.Equals(other.Id);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Id);
+        }
+
+        public static bool operator ==(Job? left, IJob? right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(Job? left, IJob? right)
+        {
+            return !(left == right);
         }
     }
 

diff --git a/BLAZAMNav/AppNavigationManager.cs b/BLAZAMNav/AppNavigationManager.cs
@@ -6,11 +6,6 @@
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.Extensions.Localization;
 using Microsoft.JSInterop;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BLAZAM.Nav
 {