Merge pull request #268 from TechnologyEnhancedLearning/RC

AnjuJose011 · web-flow · commit f94bd28c8b14 · 2025-11-26T10:59:24.000Z
Merge RC changes to master
diff --git a/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj b/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj b/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj b/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="5.0.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 	  <PackageReference Include="MockQueryable.Core" Version="7.0.3" />
 	  <PackageReference Include="MockQueryable.Moq" Version="5.0.0" />
diff --git a/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs
@@ -231,21 +231,22 @@ public async Task RecordSuccessfulSigninAsync(int id, CancellationToken token =
         {
             var user = await this.elfhUserRepository.GetByIdAsync(id);
 
-            user.LoginTimes++;
-            user.PasswordLifeCounter = 0;
-            user.SecurityLifeCounter = 0;
+            if (user.PasswordLifeCounter != 0 || user.SecurityLifeCounter != 0)
+            {
+                user.PasswordLifeCounter = 0;
+                user.SecurityLifeCounter = 0;
 
-            await this.elfhUserRepository.UpdateAsync(id, user);
+                await this.elfhUserRepository.UpdateAsync(id, user);
 
-            await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);
+                await this.InvalidateElfhUserCacheAsync(user.Id, user.UserName, token);
+            }
         }
 
         /// <inheritdoc/>
         public async Task RecordUnsuccessfulSigninAsync(int id, CancellationToken token = default)
         {
             var user = await this.elfhUserRepository.GetByIdAsync(id);
 
-            user.LoginTimes++;
             user.PasswordLifeCounter++;
 
             await this.elfhUserRepository.UpdateAsync(id, user);
@@ -958,14 +959,14 @@ public async Task<bool> ValidateUserRoleUpgrade(string currentPrimaryEmail, stri
         /// <inheritdoc/>
         public async Task<bool> CheckSamePrimaryemailIsPendingToValidate(string secondaryEmail, int currentUserId)
         {
-          var userRoleUpgrades = this.userRoleUpgradeRepository.GetByEmailAddressAsync(secondaryEmail, currentUserId);
+            var userRoleUpgrades = this.userRoleUpgradeRepository.GetByEmailAddressAsync(secondaryEmail, currentUserId);
 
-          if (userRoleUpgrades.Count() > 0)
-          {
+            if (userRoleUpgrades.Count() > 0)
+            {
                 return true;
-          }
+            }
 
-          return false;
+            return false;
         }
 
         /// <summary>
diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.4" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
