Merge pull request TechnologyEnhancedLearning#1137 from TechnologyEnhancedLearning/RC

Merge RC  Changes to master

Author: AnjuJose011

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

@@ -10,6 +10,66 @@ jobs:
     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:

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/Scripts/vuesrc/ckeditorwithhint.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <ckeditor v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
+        <ckeditor class="nhsuk-textarea" v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
         <div :class="[`pt-2 footer-text${this.valid ? '' : ' text-danger'}`]">{{ hint }}</div>
     </div>
 </template>

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/CatalogueOwner.cshtml

@@ -47,14 +47,14 @@
             <div class="row mt-5">
                 <div class="col-12">
                     <label>Catalogue owner email address</label>
-                    <input asp-for="OwnerEmailAddress" class="form-control" maxlength="250" />
+                    <input asp-for="OwnerEmailAddress" class="form-control nhsuk-input" maxlength="250" />
                     <span asp-validation-for="OwnerEmailAddress"></span>
                 </div>
             </div>
             <div class="row mt-5">
                 <div class="col-12">
                     <label>Notes</label>
-                    <textarea asp-for="Notes" class="form-control"></textarea>
+                    <textarea asp-for="Notes" class="form-control nhsuk-input"></textarea>
                     <span asp-validation-for="Notes"></span>
                 </div>
             </div>

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml

@@ -137,7 +137,7 @@
         <div class="row mt-5">
             <div class="col-12">
                 <label for="Description">Description</label>
-                <textarea asp-for="Description" class="form-control"></textarea>
+                <textarea asp-for="Description" class="form-control nhsuk-input"></textarea>
                 <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
                 <span asp-validation-for="Description"></span>
             </div>

AdminUI/LearningHub.Nhs.AdminUI/Views/Notifications/CreateEdit.cshtml

@@ -73,7 +73,7 @@
                 </div>
                 <div class="form-group col-12">
                     <label asp-for="Message" class="control-label"></label>
-                    <textarea asp-for="Message" class="form-control" rows="10" required></textarea>
+                    <textarea asp-for="Message" class="form-control nhsuk-input" rows="10" required></textarea>
                     <span asp-validation-for="Message" class="text-danger"></span>
                 </div>
                 <div class="form-group col-lg-3 col-md-6">