Merge pull request #330 from Resgrid/develop

ucswift · web-flow · commit 11b789e97935 · 2026-04-13T15:44:44.000-07:00
RE1-T113 Set pw on first login
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.ar.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.ar.resx
@@ -53,6 +53,12 @@
   <data name="NotificationOptionsLabel" xml:space="preserve"><value>خيارات الإشعارات</value></data>
   <data name="NotifyUser" xml:space="preserve"><value>إشعار المستخدم؟</value></data>
   <data name="NotifyWarning" xml:space="preserve"><value>أزل التحديد إذا كنت لا تريد من Resgrid إشعار المستخدم بإنشاء هذا الحساب.</value></data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Require Password Change</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>User will be required to change their password on first login.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve"><value>لا يوجد أفراد غير منتمين لمجموعة</value></data>
   <data name="PersonnelHeader" xml:space="preserve"><value>الأفراد</value></data>
   <data name="PhoneNumbers" xml:space="preserve"><value>أرقام الهاتف</value></data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.de.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.de.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Passwortaenderung erforderlich</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Der Benutzer muss sein Passwort bei der ersten Anmeldung aendern.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.en.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.en.resx
@@ -261,6 +261,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Require Password Change</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>User will be required to change their password on first login.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.es.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.es.resx
@@ -261,6 +261,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Desmarque si no desea que Resgrid notifique al usuario sobre la creación de esta cuenta.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Requerir cambio de contrasena</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>El usuario debera cambiar su contrasena en el primer inicio de sesion.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>Sin Personal Desagrupado</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.fr.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.fr.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Exiger le changement de mot de passe</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>L'utilisateur devra changer son mot de passe lors de la premiere connexion.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.it.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.it.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Richiedi cambio password</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>L'utente dovra cambiare la password al primo accesso.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.pl.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.pl.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Wymagaj zmiany hasla</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Uzytkownik bedzie musial zmienic haslo przy pierwszym logowaniu.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.sv.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.sv.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Krav pa losenordsbyte</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Anvandaren maste byta losenord vid forsta inloggningen.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Personnel/Person.uk.resx b/Core/Resgrid.Localization/Areas/User/Personnel/Person.uk.resx
@@ -212,6 +212,12 @@
   <data name="NotifyWarning" xml:space="preserve">
     <value>Uncheck if you don't want Resgrid to notify the user of this account creation.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Vymahaty zminu parolya</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Korystuvach povynen zminyty parol pid chas pershoho vkhodu.</value>
+  </data>
   <data name="NoUnGroupedPersonnel" xml:space="preserve">
     <value>No UnGrouped Personnel</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.ar.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.ar.resx
@@ -31,6 +31,12 @@
   <data name="EditStaffingScheduleHeader" xml:space="preserve"><value>تعديل جدول التأمين</value></data>
   <data name="EmailUser" xml:space="preserve"><value>إرسال بريد إلكتروني للمستخدم؟</value></data>
   <data name="EmailUserInfo" xml:space="preserve"><value>حدد هذا المربع إذا أردت إرسال بريد إلكتروني للمستخدم يحتوي على اسم المستخدم وكلمة المرور الجديدة.</value></data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Require Password Change</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>User will be required to change their password on next login.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve"><value>تنتهي في</value></data>
   <data name="ExpiresOnLabel" xml:space="preserve"><value>تنتهي في</value></data>
   <data name="IssuedByLabel" xml:space="preserve"><value>صادرة عن</value></data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.de.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.de.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Passwortaenderung erforderlich</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Der Benutzer muss sein Passwort bei der naechsten Anmeldung aendern.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.en.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.en.resx
@@ -195,6 +195,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Require Password Change</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>User will be required to change their password on next login.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.es.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.es.resx
@@ -195,6 +195,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Marque esta casilla si desea que el usuario envíe un correo electrónico con su nombre de usuario y su nueva contraseña.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Requerir cambio de contrasena</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>El usuario debera cambiar su contrasena en el proximo inicio de sesion.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expira el</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.fr.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.fr.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Exiger le changement de mot de passe</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>L'utilisateur devra changer son mot de passe lors de la prochaine connexion.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.it.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.it.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Richiedi cambio password</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>L'utente dovra cambiare la password al prossimo accesso.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.pl.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.pl.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Wymagaj zmiany hasla</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Uzytkownik bedzie musial zmienic haslo przy nastepnym logowaniu.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.sv.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.sv.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Krav pa losenordsbyte</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Anvandaren maste byta losenord vid naesta inloggning.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Localization/Areas/User/Profile/Profile.uk.resx b/Core/Resgrid.Localization/Areas/User/Profile/Profile.uk.resx
@@ -146,6 +146,12 @@
   <data name="EmailUserInfo" xml:space="preserve">
     <value>Check this box if you want the user Emailed with their UserName and new Password.</value>
   </data>
+  <data name="RequirePasswordChange" xml:space="preserve">
+    <value>Vymahaty zminu parolya</value>
+  </data>
+  <data name="RequirePasswordChangeHelp" xml:space="preserve">
+    <value>Korystuvach povynen zminyty parol pid chas nastupnoho vkhodu.</value>
+  </data>
   <data name="ExpiresOn" xml:space="preserve">
     <value>Expires On</value>
   </data>
diff --git a/Core/Resgrid.Model/DepartmentMember.cs b/Core/Resgrid.Model/DepartmentMember.cs
@@ -80,6 +80,14 @@ public class DepartmentMember : IEntity
 		/// </summary>
 		public DateTime? PasswordLastSetOn { get; set; }
 
+		/// <summary>
+		/// When true the user must change their password on next login.
+		/// Set by admins when creating accounts or resetting passwords.
+		/// Cleared automatically after the user completes the forced password change.
+		/// </summary>
+		[ProtoMember(13)]
+		public bool MustChangePassword { get; set; }
+
 		[NotMapped]
 		public string TableName => "DepartmentMembers";
 
diff --git a/Core/Resgrid.Services/DepartmentsService.cs b/Core/Resgrid.Services/DepartmentsService.cs
@@ -289,7 +289,7 @@ public async Task<string> GetUserIdForDeletedUserInDepartmentAsync(int departmen
 			if (member != null)
 			{
 				member.IsDeleted = true;
-				var savedMember = _departmentMembersRepository.SaveOrUpdateAsync(member, cancellationToken);
+				await _departmentMembersRepository.SaveOrUpdateAsync(member, cancellationToken);
 
 				var member2 = await _departmentMembersRepository.GetDepartmentMemberByDepartmentIdAndUserIdAsync(departmentId, userIdToDelete);
 
diff --git a/Core/Resgrid.Services/UsersService.cs b/Core/Resgrid.Services/UsersService.cs
@@ -97,7 +97,7 @@ public async Task<bool> DoesUserHaveAnyActiveDepartments(string userName)
 			var user = await GetUserByNameAsync(userName);
 			var memberships = await _departmentMembersRepository.GetAllByUserIdAsync(user.UserId);
 
-			return memberships.Any(x => x.IsDeleted == false);
+			return memberships.Any(x => x.IsDeleted == false && (x.IsDisabled == null || x.IsDisabled == false));
 		}
 
 		public IdentityUser GetUserById(string userId, bool bypassCache = true)
diff --git a/Providers/Resgrid.Providers.Migrations/Migrations/M0064_AddingMustChangePassword.cs b/Providers/Resgrid.Providers.Migrations/Migrations/M0064_AddingMustChangePassword.cs
@@ -0,0 +1,19 @@
+using FluentMigrator;
+
+namespace Resgrid.Providers.Migrations.Migrations
+{
+	[Migration(64)]
+	public class M0064_AddingMustChangePassword : Migration
+	{
+		public override void Up()
+		{
+			Alter.Table("DepartmentMembers")
+				.AddColumn("MustChangePassword").AsBoolean().NotNullable().WithDefaultValue(false);
+		}
+
+		public override void Down()
+		{
+			Delete.Column("MustChangePassword").FromTable("DepartmentMembers");
+		}
+	}
+}
diff --git a/Providers/Resgrid.Providers.MigrationsPg/Migrations/M0064_AddingMustChangePasswordPg.cs b/Providers/Resgrid.Providers.MigrationsPg/Migrations/M0064_AddingMustChangePasswordPg.cs
@@ -0,0 +1,19 @@
+using FluentMigrator;
+
+namespace Resgrid.Providers.MigrationsPg.Migrations
+{
+	[Migration(64)]
+	public class M0064_AddingMustChangePasswordPg : Migration
+	{
+		public override void Up()
+		{
+			Alter.Table("DepartmentMembers".ToLower())
+				.AddColumn("MustChangePassword".ToLower()).AsBoolean().NotNullable().WithDefaultValue(false);
+		}
+
+		public override void Down()
+		{
+			Delete.Column("MustChangePassword".ToLower()).FromTable("DepartmentMembers".ToLower());
+		}
+	}
+}
diff --git a/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs b/Web/Resgrid.Web/Areas/User/Controllers/PersonnelController.cs
@@ -547,6 +547,16 @@ public async Task<IActionResult> AddPerson(AddPersonModel model, IFormCollection
 
 					await _departmentsService.AddUserToDepartmentAsync(DepartmentId, user.UserId, false, cancellationToken);
 
+					if (model.MustChangePasswordOnLogin)
+					{
+						var member = await _departmentsService.GetDepartmentMemberAsync(user.UserId, DepartmentId);
+						if (member != null)
+						{
+							member.MustChangePassword = true;
+							await _departmentsService.SaveDepartmentMemberAsync(member, cancellationToken);
+						}
+					}
+
 					var userObject = _usersService.GetUserById(user.UserId);
 
 					_eventAggregator.SendMessage<UserCreatedEvent>(new UserCreatedEvent() { DepartmentId = DepartmentId, Name = string.Format("{0} {1}", model.FirstName, model.LastName), User = userObject });
diff --git a/Web/Resgrid.Web/Areas/User/Controllers/ProfileController.cs b/Web/Resgrid.Web/Areas/User/Controllers/ProfileController.cs
@@ -962,6 +962,7 @@ public async Task<IActionResult>  ResetPasswordForUser(string userId)
 			model.Email = user.Email;
 			model.Username = user.UserName;
 			model.MinPasswordLength = await _departmentSsoService.GetEffectiveMinPasswordLengthAsync(DepartmentId);
+			model.MustChangePasswordOnLogin = true;
 
 			return View(model);
 		}
@@ -1000,6 +1001,13 @@ public async Task<IActionResult>  ResetPasswordForUser(ResetPasswordForUserView
 			{
 				await _departmentSsoService.RecordPasswordChangedAsync(DepartmentId, model.UserId);
 
+				var member = await _departmentsService.GetDepartmentMemberAsync(model.UserId, DepartmentId);
+				if (member != null)
+				{
+					member.MustChangePassword = model.MustChangePasswordOnLogin;
+					await _departmentsService.SaveDepartmentMemberAsync(member);
+				}
+
 				if (model.EmailUser)
 					await _emailService.SendPasswordResetEmail(model.Email, model.Name, user.UserName, model.Password, userDepartment.Name);
 
diff --git a/Web/Resgrid.Web/Areas/User/Models/AddPersonModel.cs b/Web/Resgrid.Web/Areas/User/Models/AddPersonModel.cs
@@ -63,5 +63,7 @@ public class AddPersonModel: BaseUserModel
 		public string ConfirmPassword { get; set; }
 
 		public bool SendAccountCreationNotification { get; set; }
+
+		public bool MustChangePasswordOnLogin { get; set; }
 	}
 }
diff --git a/Web/Resgrid.Web/Areas/User/Models/Profile/ResetPasswordForUserView.cs b/Web/Resgrid.Web/Areas/User/Models/Profile/ResetPasswordForUserView.cs
@@ -25,5 +25,7 @@ public class ResetPasswordForUserView
 		[Display(Name = "Confirm password")]
 		[System.ComponentModel.DataAnnotations.Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
 		public string ConfirmPassword { get; set; }
+
+		public bool MustChangePasswordOnLogin { get; set; }
 	}
 }
diff --git a/Web/Resgrid.Web/Areas/User/Views/Personnel/AddPerson.cshtml b/Web/Resgrid.Web/Areas/User/Views/Personnel/AddPerson.cshtml
@@ -185,6 +185,17 @@
               </div>
             </div>
 
+            <div class="form-group">
+              <label class="col-sm-2 control-label">@localizer["RequirePasswordChange"]</label>
+              <div class="col-sm-10">
+                <div class="checkbox checkbox-primary">
+                  <input type="checkbox" class="checkbox checkbox-primary" asp-for="MustChangePasswordOnLogin">
+                  <label></label>
+                </div>
+                <p class="help-block">@localizer["RequirePasswordChangeHelp"]</p>
+              </div>
+            </div>
+
             @if (!string.IsNullOrEmpty(Model.UdfFormHtml))
             {
               <div class="hr-line-dashed"></div>
diff --git a/Web/Resgrid.Web/Areas/User/Views/Profile/ResetPasswordForUser.cshtml b/Web/Resgrid.Web/Areas/User/Views/Profile/ResetPasswordForUser.cshtml
@@ -96,6 +96,16 @@
                                 <span class="help-block m-b-none">@localizer["EmailUserInfo"]</span>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">@localizer["RequirePasswordChange"]</label>
+                            <div class="col-sm-10">
+                                <div class="checkbox checkbox-primary">
+                                    <input type="checkbox" class="checkbox checkbox-primary" asp-for="MustChangePasswordOnLogin">
+                                    <label></label>
+                                </div>
+                                <span class="help-block m-b-none">@localizer["RequirePasswordChangeHelp"]</span>
+                            </div>
+                        </div>
                         <div class="hr-line-dashed"></div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-2">
diff --git a/Web/Resgrid.Web/Controllers/AccountController.cs b/Web/Resgrid.Web/Controllers/AccountController.cs
