Merge branch 'RC' into Develop/Fixes/TD-3727-Unrestricted-File-Upload-Vulnerability

Author: swapnamol-abraham

.gitignore

@@ -52,3 +52,4 @@ obj
 /OpenAPI/LearningHub.Nhs.OpenApi/web.config
 /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/Controllers/api/UserController.cs

@@ -0,0 +1,60 @@
+namespace LearningHub.Nhs.AdminUI.Controllers.Api
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using elfhHub.Nhs.Models.Common;
+    using elfhHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.AdminUI.Interfaces;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Options;
+
+    /// <summary>
+    /// The UserController class.
+    /// </summary>
+    [Authorize]
+    [Route("api/[controller]")]
+    [ApiController]
+    public class UserController : BaseApiController
+    {
+        /// <summary>
+        /// The elfh user service..
+        /// </summary>
+        private IUserService userService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserController"/> class.
+        /// </summary>
+        /// <param name="userService">The userService<see cref="IUserService"/>.</param>
+        /// <param name="loginWizardService">loginWizardService.</param>
+        /// <param name="logger">logger.</param>
+        /// <param name="settings">Settings.</param>
+        public UserController(IUserService userService, ILogger<UserController> logger)
+            : base(logger)
+        {
+            this.userService = userService;
+        }
+
+        /// <summary>
+        /// The SessionTimeout.
+        /// </summary>
+        /// <returns>The <see cref="IActionResult"/>.</returns>
+        [HttpPost("browser-close")]
+        public IActionResult BrowserClose()
+        {
+            // Add browser close to the UserHistory
+            UserHistoryViewModel userHistory = new UserHistoryViewModel()
+            {
+                UserId = this.CurrentUserId,
+                UserHistoryTypeId = (int)UserHistoryType.Logout,
+                Detail = @"User browser closed",
+            };
+
+            this.userService.StoreUserHistory(userHistory);
+
+            return this.Ok(true);
+        }
+    }
+}

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

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.47" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/mkiomediaplayer.ts

@@ -22,6 +22,7 @@ interface PlayerConfig {
 }
 
 interface SourceConfig {
+    enableLowLatency: boolean; 
     hls: string;
     drm: {
         clearkey: ClearKeyConfig;
@@ -57,6 +58,7 @@ function getSourceConfig(
     authenticationToken: string
 ): SourceConfig {
     return {
+        enableLowLatency: true,
         hls: locatorUri,
         drm: {
             clearkey: {
@@ -81,6 +83,7 @@ function initializePlayer(videoContainer: HTMLElement, playerConfig: MKPlayerCon
     };
 
     const sourceConfig: SourceConfig = {
+        enableLowLatency: true,
         hls: playBackUrl,
         drm: {
             clearkey: clearKeyConfig