Merge branch 'main' into thulasizwe/bug/3259

Author: czwe-01

shesha-core/src/Shesha.Application/Authorization/TokenAuthController.cs

@@ -135,6 +135,7 @@ private async Task<AuthenticateResultModel> GetAuthenticateResultAsync(ShaLoginR
                 ExpireInSeconds = expireInSeconds,
                 ExpireOn = expiresOn,
                 UserId = loginResult.User?.Id,
+                RequiredChangePassword = loginResult.User?.RequireChangePassword ?? false,
                 PersonId = personId,
                 DeviceName = device?.Name,
                 ResultType = AuthenticateResultType.Success

shesha-core/src/Shesha.Application/ConfigMigrations/package20260409_1436.shaconfig

@@ -272,12 +272,17 @@ public async Task RestoreItemRevisionAsync(RestoreItemRevisionRequest request)
             item.Module?.EnsureEditable();
 
             var revision = await RevisionRepo.GetAsync(request.RevisionId);
-            if (revision.ConfigurationItem != item)
-                throw new AbpValidationException("Selected revision doesn't belong to the item");
+            if (revision.ConfigurationItem != item) 
+            {
+                var closestParent = item.Closest(e => e.ExposedFrom, e => e == revision.ConfigurationItem);
+                if (closestParent == null)
+                    throw new AbpValidationException("Selected revision doesn't belong to the item hierarchy");
+            }
+                
 
             var manager = CiHelper.GetManagerByDiscriminator(item.ItemType);
 
-            await manager.RestoreRevisionAsync(revision);
+            await manager.RestoreRevisionAsync(item, revision);
         }
 
         /// <summary>

shesha-core/src/Shesha.Application/ConfigMigrations/package20260413_1715.shaconfig

@@ -23,5 +23,6 @@ public class UserLoginInfoDto : EntityDto<long>
         public string? HomeUrl { get; set; }
         public bool IsSelfServiceUser { get; set; }
         public List<GrantedPermissionDto> GrantedPermissions { get; set; } = new List<GrantedPermissionDto>();
+        public bool RequireChangePassword { get; set; }
     }
 }

shesha-core/src/Shesha.Application/ConfigMigrations/package20260414_0821.shaconfig

@@ -63,7 +63,8 @@ public async Task<GetCurrentLoginInfoOutput> GetCurrentLoginInfoAsync()
                     MobileNumber = user.PhoneNumber,
                     GrantedPermissions = await GetGrantedPermissionsAsync(),
                     PersonId = person.Id,
-                    HomeUrl = homeUrl
+                    HomeUrl = homeUrl,
+                    RequireChangePassword = user.RequireChangePassword
                 };
 
                 // Send initialization errors only for Application Configurators

shesha-core/src/Shesha.Application/ConfigMigrations/package20260414_1015.shaconfig

@@ -131,6 +131,11 @@
         <None Remove="ConfigMigrations\package20260323_1136.shaconfig" />
         <None Remove="ConfigMigrations\package20260324_1606.shaconfig" />
         <None Remove="ConfigMigrations\package20260402_1531.shaconfig" />
+        <None Remove="ConfigMigrations\package20260409_1436.shaconfig" />
+        <None Remove="ConfigMigrations\package20260413_1715.shaconfig" />
+        <None Remove="ConfigMigrations\package20260414_0821.shaconfig" />
+        <None Remove="ConfigMigrations\package20260414_1015.shaconfig" />
+        <None Remove="ConfigMigrations\package20260415_1614.shaconfig" />
         <None Remove="Excel\template.xlsx" />
         <None Remove="ConfigMigrations\package20230324_1835.shaconfig" />
         <None Remove="ConfigMigrations\package20230411_1238.shaconfig" />
@@ -161,6 +166,11 @@
         </EmbeddedResource>
         <EmbeddedResource Include="ConfigMigrations\package20260324_1606.shaconfig" />
         <EmbeddedResource Include="ConfigMigrations\package20260402_1531.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20260409_1436.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20260413_1715.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20260414_0821.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20260414_1015.shaconfig" />
+        <EmbeddedResource Include="ConfigMigrations\package20260415_1614.shaconfig" />
         <EmbeddedResource Include="Excel\template.xlsx" />
     </ItemGroup>
     <ItemGroup>