Develop/fixes/td 3734 con current sessions allowed

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/Views/Shared/_Layout.cshtml

@@ -79,6 +79,25 @@
     @*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
     <partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
     @RenderSection("Scripts", required: false)
+    <script type="text/javascript">
+        // This function will be called when the browser window is closed or unloaded
+        function tellServerBrowserClosed() {
+            // Send an asynchronous request to the server when the browser is closed
+            fetch('/api/user/browser-close', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ message: 'Browser closed' })
+            })
+                .then(response => response.json())
+                .catch(error => console.error('Error sending data to server:', error));
+        }
+
+        // Bind the function to the unload event
+        window.onunload = tellServerBrowserClosed;
+
+    </script>
 </body>
 </html>
 <!-- Build number: @settings.Value.BuildNumber -->

LearningHub.Nhs.WebUI/Configuration/Settings.cs

@@ -196,6 +196,11 @@ public Settings()
         /// </summary>
         public int PasswordRequestLimit { get; set; }
 
+        /// <summary>
+        /// Gets or sets the ConcurrentId.
+        /// </summary>
+        public int ConcurrentId { get; set; }
+
         /// <summary>
         /// Gets or sets the SupportUrls.
         /// </summary>

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

@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using elfhHub.Nhs.Models.Common;
+    using elfhHub.Nhs.Models.Enums;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.AspNetCore.Authorization;
@@ -62,6 +63,26 @@ public async Task<IActionResult> CurrentProfile()
             return this.Ok(await this.userService.GetCurrentUserProfileAsync());
         }
 
+        /// <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);
+        }
+
         /// <summary>
         /// Get current user's basic details.
         /// </summary>

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

@@ -6,6 +6,8 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using System.Linq;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using elfhHub.Nhs.Models.Common;
+    using elfhHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Content;
     using LearningHub.Nhs.Models.Enums.Content;
     using LearningHub.Nhs.Models.Extensions;
@@ -20,6 +22,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using Microsoft.AspNetCore.Diagnostics;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Microsoft.FeatureManagement;
@@ -52,6 +55,7 @@ public class HomeController : BaseController
         /// <param name="dashboardService">Dashboard service.</param>
         /// <param name="contentService">Content service.</param>
         /// <param name="featureManager"> featureManager.</param>
+        /// <param name="configuration"> config.</param>
         public HomeController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -62,7 +66,8 @@ public HomeController(
             LearningHubAuthServiceConfig authConfig,
             IDashboardService dashboardService,
             IContentService contentService,
-            IFeatureManager featureManager)
+            IFeatureManager featureManager,
+            Microsoft.Extensions.Configuration.IConfiguration configuration)
         : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
         {
             this.authConfig = authConfig;
@@ -71,6 +76,7 @@ public HomeController(
             this.dashboardService = dashboardService;
             this.contentService = contentService;
             this.featureManager = featureManager;
+            this.configuration = configuration;
         }
 
         /// <summary>
@@ -200,6 +206,7 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
         {
             if (this.User?.Identity.IsAuthenticated == true)
             {
+                this.Settings.ConcurrentId = this.CurrentUserId;
                 this.Logger.LogInformation("User is authenticated: User is {fullname} and userId is: {lhuserid}", this.User.Identity.GetCurrentName(), this.User.Identity.GetCurrentUserId());
                 if (this.User.IsInRole("Administrator") || this.User.IsInRole("BlueUser") || this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser"))
                 {
@@ -369,11 +376,41 @@ public IActionResult SessionTimeout(string returnUrl = "/")
                 return this.Redirect(returnUrl);
             }
 
+            // Add successful logout to the UserHistory
+            UserHistoryViewModel userHistory = new UserHistoryViewModel()
+            {
+                UserId = this.Settings.ConcurrentId,
+                UserHistoryTypeId = (int)UserHistoryType.Logout,
+                Detail = @"User session time out",
+            };
+
+            this.userService.StoreUserHistory(userHistory);
+
             this.ViewBag.AuthTimeout = this.authConfig.AuthTimeout;
             this.ViewBag.ReturnUrl = returnUrl;
+
             return this.View();
         }
 
+        /// <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);
+        }
+
         /// <summary>
         /// The SitemapXml.
         /// </summary>

LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml

@@ -133,19 +133,19 @@
         @if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
         {
             <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.5/jquery.validate.min.js"
-            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
-            asp-fallback-test="window.jQuery && window.jQuery.validator"
-            asp-suppress-fallback-integrity="true"
-            crossorigin="anonymous"
-            integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
+                    asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+                    asp-fallback-test="window.jQuery && window.jQuery.validator"
+                    asp-suppress-fallback-integrity="true"
+                    crossorigin="anonymous"
+                    integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
             </script>
             <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
-            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
-                asp-suppress-fallback-integrity="true"
-                crossorigin="anonymous"
-                integrity="sha512-xq+Vm8jC94ynOikewaQXMEkJIOBp7iArs3IhFWSWdRT3Pq8wFz46p+ZDFAR7kHnSFf+zUv52B3prRYnbDRdgog==">
-        </script>
+                    asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+                    asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+                    asp-suppress-fallback-integrity="true"
+                    crossorigin="anonymous"
+                    integrity="sha512-xq+Vm8jC94ynOikewaQXMEkJIOBp7iArs3IhFWSWdRT3Pq8wFz46p+ZDFAR7kHnSFf+zUv52B3prRYnbDRdgog==">
+            </script>
         }
         <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/jquery.matchHeight.min.js" asp-append-version="true"></script>
@@ -162,6 +162,26 @@
 
     <script type="text/javascript" src="~/js/mkplayer-ui-custom.js" asp-append-version="true"></script>
 
+    <script type="text/javascript">
+        // This function will be called when the browser window is closed or unloaded
+        function tellServerBrowserClosed() {
+            // Send an asynchronous request to the server when the browser is closed
+            fetch('/api/user/browser-close', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ message: 'Browser closed' })
+            })
+                .then(response => response.json())
+                .catch(error => console.error('Error sending data to server:', error));
+        }
+
+        // Bind the function to the unload event
+        window.onunload = tellServerBrowserClosed;
+
+    </script>
+
 </body>
 </html>
 <!-- Build number: @settings.Value.BuildNumber -->

WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj

@@ -537,6 +537,7 @@
     <None Include="Scripts\Post-Deploy\Scripts\AddDigitalLearningSolutionsExternalSystem.sql" />
     <Build Include="Stored Procedures\Activity\GetAssessmentActivityCompletionPercentage.sql" />
     <Build Include="Tables\Hub\PasswordResetRequests.sql" />
+    <None Include="Scripts\ELFH Database Scripts\ConCurrentUserSessionsTablesandSP.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />