Merge rc into 5490

.github/workflows/continuous-integration-workflow.yml

@@ -9,99 +9,38 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-
-      - name: Modify web.config files in all apps
-        shell: pwsh
-        run: |
-          $webConfigPaths = @(
-            "${{ github.workspace }}\AdminUI\LearningHub.Nhs.AdminUI\web.config",
-            "${{ github.workspace }}\WebAPI\LearningHub.Nhs.Api\web.config",
-            "${{ github.workspace }}\LearningHub.Nhs.WebUI\web.config"
-          )
-
-          foreach ($path in $webConfigPaths) {
-            if (Test-Path $path) {
-              Write-Host "Modifying $path"
-              [xml]$config = Get-Content $path
-
-              if (-not $config.configuration.'system.webServer') {
-                  $systemWebServer = $config.CreateElement("system.webServer")
-                  $config.configuration.AppendChild($systemWebServer) | Out-Null
-              } else {
-                  $systemWebServer = $config.configuration.'system.webServer'
-              }
-
-              if (-not $systemWebServer.httpProtocol) {
-                  $httpProtocol = $config.CreateElement("httpProtocol")
-                  $systemWebServer.AppendChild($httpProtocol) | Out-Null
-              } else {
-                  $httpProtocol = $systemWebServer.httpProtocol
-              }
-
-              if (-not $httpProtocol.customHeaders) {
-                  $customHeaders = $config.CreateElement("customHeaders")
-                  $httpProtocol.AppendChild($customHeaders) | Out-Null
-              } else {
-                  $customHeaders = $httpProtocol.customHeaders
-              }
-
-              foreach ($name in @("X-Powered-By", "Server")) {
-                  $removeNode = $config.CreateElement("remove")
-                  $removeNode.SetAttribute("name", $name)
-                  $customHeaders.AppendChild($removeNode) | Out-Null
-              }
-
-              if (-not $systemWebServer.security) {
-                  $security = $config.CreateElement("security")
-                  $systemWebServer.AppendChild($security) | Out-Null
-              } else {
-                  $security = $systemWebServer.security
-              }
-
-              if (-not $security.requestFiltering) {
-                  $requestFiltering = $config.CreateElement("requestFiltering")
-                  $requestFiltering.SetAttribute("removeServerHeader", "true")
-                  $security.AppendChild($requestFiltering) | Out-Null
-              }
-
-              $config.Save($path)
-            } else {
-              Write-Host "File not found: $path"
-            }
-          }
-
+
       - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 8.0.x     
 
       - name: Add Azure artifact
-        run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      
+        run: |
+          dotnet nuget remove source LearningHubFeed || true
+          dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      
 
-      - name: Use Node 20 with Yarn
+      - name: Use Node 14
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Upgrade npm to the latest version
-        run: npm install -g npm@6.14.8
+          node-version: '14'
+          cache: 'npm'  
 
-      - name: Typescript install WebUI
-        run: yarn install --network-timeout 600000 --frozen-lockfile
+      - name: npm install WebUI
+        run: npm install 
         working-directory: ./LearningHub.Nhs.WebUI
-
-      - name: Typescript build WebUI
-        run: yarn build:webpack
+      
+      - name: npm build WebUI
+        run: npm run build:webpack
         working-directory: ./LearningHub.Nhs.WebUI     
 
-      - name: Typescript install AdminUI
-        run: yarn install 
+      - name: npm install AdminUI
+        run: npm install 
         working-directory: ./AdminUI/LearningHub.Nhs.AdminUI
-
-      - name: Typescript build AdminUI
-        run: yarn build:webpack
-        working-directory: ./AdminUI/LearningHub.Nhs.AdminUI     
+      
+      - name: npm build AdminUI
+        run: npm run build:webpack
+        working-directory: ./AdminUI/LearningHub.Nhs.AdminUI   
 
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.0.3
@@ -181,5 +120,4 @@ jobs:
           }
 
       # - name: Test
-        # run: dotnet test ${{ env.BuildParameters.TestProjects }}       
-
+        # run: dotnet test ${{ env.BuildParameters.TestProjects }}            

.gitignore

@@ -53,3 +53,6 @@ obj
 /AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
 /WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
 /ReportAPI/LearningHub.Nhs.ReportApi/web.config
+/AdminUI/LearningHub.Nhs.AdminUI/web.config
+/LearningHub.Nhs.WebUI/web.config
+/WebAPI/LearningHub.Nhs.API/web.config

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-	<AssemblyVersion>1.0.0.0</AssemblyVersion>
-	<FileVersion>1.0.0.0</FileVersion>
-	<Version>1.0.0</Version>
-    <UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
-    <ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
+		<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
+		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="Views\Notification\**" />
 		<Content Remove="Views\Notification\**" />

Directory.Build.props

@@ -4,7 +4,7 @@
     <CodeAnalysisRuleSet>$(SolutionDir)StyleCop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
+	<!--<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />-->
 	<AdditionalFiles Include="$(SolutionDir)StyleCop.json" Link="StyleCop.json" />
   </ItemGroup>
 </Project>

Directory.Packages.props

@@ -0,0 +1,93 @@
+<Project>
+
+	<PropertyGroup>
+		<!-- Enable centralised version control for packages -->
+		<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+
+		<PackageVersion Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageVersion Include="GDS.MultiPageFormData" Version="1.0.6" />
+		<PackageVersion Include="LearningHub.Nhs.Caching" Version="2.0.2" />
+		<PackageVersion Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageVersion Include="UK.NHS.CookieBanner" Version="2.0.7" />
+
+		<PackageVersion Include="AngleSharp" Version="0.16.1" />
+		<PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="9.0.0" />
+		<PackageVersion Include="AspNetCoreRateLimit" Version="5.0.0" />
+		<PackageVersion Include="AutoFixture" Version="4.18.1" />
+		<PackageVersion Include="AutoMapper" Version="10.1.1" />
+		<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
+		<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.1" />
+		<PackageVersion Include="Azure.Storage.Files.Shares" Version="12.11.0" />
+		<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
+		<PackageVersion Include="BuildWebCompiler" Version="1.12.405" />
+		<PackageVersion Include="coverlet.collector" Version="6.0.4" />
+		<PackageVersion Include="EntityFrameworkCore.Testing.Moq" Version="9.0.1" />
+		<PackageVersion Include="FluentAssertions" Version="6.12.0" />
+		<PackageVersion Include="FluentValidation" Version="12.0.0" />
+		<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.1" />
+		<PackageVersion Include="HtmlAgilityPack" Version="1.12.1" />
+		<PackageVersion Include="HtmlSanitizer" Version="6.0.453" />
+		<PackageVersion Include="IdentityModel" Version="4.6.0" />
+		<PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+		<PackageVersion Include="linqtotwitter" Version="6.9.0" />
+		<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
+		<PackageVersion Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.23.0" />
+		<PackageVersion Include="Microsoft.ApplicationInsights.NLogTarget" Version="2.23.0" />
+		<PackageVersion Include="Microsoft.AspNetCore" Version="2.3.0" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.17" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.17" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.17" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.17" />
+		<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.17" />
+		<PackageVersion Include="Microsoft.Azure.Management.DataFactory" Version="9.3.0" />
+		<PackageVersion Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
+		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.6" />
+		<PackageVersion Include="Microsoft.FeatureManagement" Version="4.1.0" />
+		<PackageVersion Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
+		<PackageVersion Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
+		<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.12.0" />
+		<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+		<PackageVersion Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
+		<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.8.3" />
+		<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+		<PackageVersion Include="MK.IO" Version="2.1.3" />
+		<PackageVersion Include="Moq" Version="4.20.72" />
+		<PackageVersion Include="NBuilder" Version="6.1.0" />
+		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageVersion Include="NHSUKViewComponents.Web" Version="1.0.29" />
+		<PackageVersion Include="NLog.Schema" Version="5.5.0" />
+		<PackageVersion Include="NLog.Web.AspNetCore" Version="5.5.0" />
+		<PackageVersion Include="Selenium.Axe" Version="4.0.21" />
+		<PackageVersion Include="Selenium.Support" Version="4.33.0" />
+		<PackageVersion Include="Selenium.WebDriver" Version="4.33.0" />
+		<PackageVersion Include="Selenium.WebDriver.ChromeDriver" Version="133.0.6943.5300" />
+		<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+		<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
+		<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.1" />
+		<PackageVersion Include="System.Collections" Version="4.3.0" />
+		<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
+		<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
+		<PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
+		<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.12.0" />
+		<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
+		<PackageVersion Include="tusdotnet" Version="2.10.0" />
+		<PackageVersion Include="UAParser" Version="3.1.47" />
+		<PackageVersion Include="xunit" Version="2.4.1" />
+		<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
+	</ItemGroup>
+</Project>

LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj

@@ -1,37 +1,37 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 
-    <IsPackable>false</IsPackable>
+		<IsPackable>false</IsPackable>
 
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-  </PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="Selenium.Axe" Version="4.0.19" />
-    <PackageReference Include="Selenium.Support" Version="4.19.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="133.0.6943.5300" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+		<PackageReference Include="Selenium.Axe" Version="4.0.19" />
+		<PackageReference Include="Selenium.Support" Version="4.19.0" />
+		<PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
+		<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="133.0.6943.5300" />
+		<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="1.3.0">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj" />
+	</ItemGroup>
 
 </Project>

LearningHub.Nhs.WebUI.sln

@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B5D48B6A-D4A7-494E-89C0-64428232D242}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		StyleCop.ruleset = StyleCop.ruleset
 	EndProjectSection
 EndProject

LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs

@@ -102,13 +102,13 @@ public async Task<ActionResult> CheckUserRole()
         /// <summary>
         /// to check user password is correct.
         /// </summary>
-        /// <param name="currentPassword">The currentPassword.</param>
+        /// <param name="password">The currentPassword.</param>
         /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
-        [HttpGet]
-        [Route("ConfirmPassword/{currentPassword}")]
-        public async Task<ActionResult> ConfirmPassword(string currentPassword)
+        [HttpPost]
+        [Route("ConfirmPassword")]
+        public async Task<ActionResult> ConfirmPassword([FromBody] PasswordUpdateModel password)
         {
-            string passwordHash = this.userService.Base64MD5HashDigest(currentPassword);
+            string passwordHash = this.userService.Base64MD5HashDigest(password.PasswordHash);
             var userPersonalDetails = await this.userService.GetCurrentUserPersonalDetailsAsync();
             if (userPersonalDetails != null && userPersonalDetails.PasswordHash == passwordHash)
             {