Merge pull request #624 from Blazam-App/v1-0-8

Add Require Password Change display for users
Blazam-App · Nov 1, 2024 · 1e3088b · 1e3088b
2 parents 47b084c + fb3fdd6
commit 1e3088b
Show file tree

Hide file tree

Showing 16 changed files with 6,310 additions and 326 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.0.7</AssemblyVersion>
-		<Version>2024.10.31.0016</Version>
+		<Version>2024.11.01.0042</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -58,6 +58,10 @@
 		<PackageReference Include="Cassia" Version="2.0.0.60" />
 		<PackageReference Include="DuoUniversal" Version="1.2.5" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />

diff --git a/BLAZAM/Pages/Users/ViewUser.razor b/BLAZAM/Pages/Users/ViewUser.razor
diff --git a/BLAZAMActiveDirectory/Adapters/AccountDirectoryAdapter.cs b/BLAZAMActiveDirectory/Adapters/AccountDirectoryAdapter.cs
@@ -33,7 +33,8 @@ public class AccountDirectoryAdapter : GroupableDirectoryAdapter, IAccountDirect
         public virtual bool CanDisable { get => HasActionPermission(ObjectActions.Disable); }
 
         public virtual bool CanUnlock { get => HasActionPermission(ObjectActions.Unlock); }
-
+
+
 
         public bool CanSearchDisabled
         {

diff --git a/BLAZAMActiveDirectory/Interfaces/IAccountDirectoryAdapter.cs b/BLAZAMActiveDirectory/Interfaces/IAccountDirectoryAdapter.cs
@@ -38,6 +38,11 @@ public interface IAccountDirectoryAdapter : IGroupableDirectoryAdapter
         /// </summary>
         bool Enabled { get; set; }
 
+        /// <summary>
+        /// Indicates whether the current web user can reset the password for this <see cref="IAccountDirectoryAdapter"/>
+        /// </summary>
+        bool CanSetPassword { get; }
+
         /// <summary>
         /// Indicates whether the current web user can search disabled <see cref="IAccountDirectoryAdapter"/>'s
         /// </summary>

diff --git a/BLAZAMDatabase/Context/DatabaseContextBase.cs b/BLAZAMDatabase/Context/DatabaseContextBase.cs
@@ -527,7 +527,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                   new ObjectAction() { Id = 6, Name = "Rename", Action = ActiveDirectoryObjectAction.Rename },
                   new ObjectAction() { Id = 7, Name = "Move", Action = ActiveDirectoryObjectAction.Move },
                   new ObjectAction() { Id = 8, Name = "Create", Action = ActiveDirectoryObjectAction.Create },
-                  new ObjectAction() { Id = 9, Name = "Delete", Action = ActiveDirectoryObjectAction.Delete }
+                  new ObjectAction() { Id = 9, Name = "Delete", Action = ActiveDirectoryObjectAction.Delete },
+                  new ObjectAction() { Id = 10, Name = "Set Password", Action = ActiveDirectoryObjectAction.SetPassword }
 
             );
             modelBuilder.Entity<ActionAccessMapping>(entity =>
-Original file line number
+Diff line change
@@ Expand Up @@
             public virtual bool CanDisable { get => HasActionPermission(ObjectActions.Disable); }
             public virtual bool CanUnlock { get => HasActionPermission(ObjectActions.Unlock); }
             public bool CanSearchDisabled
             {
@@ Expand Down @@