TD-5044: Implement changes for automated accessibility unit testing project to the LH web UI repository

Author: ArunimaGeorge

AdminUI/LearningHub.Nhs.AdminUI/Configuration/MediaKindSettings.cs

@@ -0,0 +1,53 @@
+namespace LearningHub.Nhs.AdminUI.Configuration
+{
+    /// <summary>
+    /// Config AzureMediaSettings.
+    /// </summary>
+    public class MediaKindSettings
+    {
+        /// <summary>
+        /// Gets or sets subscription name.
+        /// </summary>
+        public string SubscriptionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets token.
+        /// </summary>
+        public string Token { get; set; }
+
+        /// <summary>
+        /// Gets or sets storage media account name.
+        /// </summary>
+        public string StorageAccountName { get; set; }
+
+        /// <summary>
+        /// Gets or sets media kind media service issuer.
+        /// </summary>
+        public string Issuer { get; set; }
+
+        /// <summary>
+        /// Gets or sets media kind media service audience.
+        /// </summary>
+        public string Audience { get; set; }
+
+        /// <summary>
+        /// Gets or sets the contentkey policyname.
+        /// </summary>
+        public string ContentKeyPolicyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets media kind media service jwt primary key secret.
+        /// </summary>
+        public string JWTPrimaryKeySecret { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media kind media kind MKPlayer licence key.
+        /// </summary>
+        public string MKPlayerLicence { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media kind blob connection string.
+        /// </summary>
+        public string MediaKindStorageConnectionString { get; set; }
+    }
+}

AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs

@@ -77,6 +77,16 @@ public class WebSettings
         /// </summary>
         public string AzureFileStorageConnectionString { get; set; }
 
+        /// <summary>
+        /// Gets or sets the AzureSourceFileStorageConnectionString.
+        /// </summary>
+        public string AzureSourceArchiveStorageConnectionString { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AzurePurgedFileStorageConnectionString.
+        /// </summary>
+        public string AzureContentArchiveStorageConnectionString { get; set; }
+
         /// <summary>
         /// Gets or sets the azure file storage resource share name.
         /// </summary>
@@ -146,5 +156,10 @@ public class WebSettings
         /// Gets or sets the FileUploadSettings.
         /// </summary>
         public FileUploadSettingsModel FileUploadSettings { get; set; } = new FileUploadSettingsModel();
+
+        /// <summary>
+        /// Gets or sets the MediaKindSettings.
+        /// </summary>
+        public MediaKindSettings MediaKindSettings { get; set; } = new MediaKindSettings();
     }
 }

AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs

@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Extensions;
+    using LearningHub.Nhs.AdminUI.Helpers;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.AdminUI.Models;
     using LearningHub.Nhs.Models.Common;
@@ -16,6 +17,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using Microsoft.FeatureManagement;
 
     /// <summary>
     /// Defines the <see cref="ResourceController" />.
@@ -32,6 +34,11 @@ public class ResourceController : BaseController
         /// </summary>
         private readonly IOptions<WebSettings> websettings;
 
+        /// <summary>
+        /// Defines the featureManager.
+        /// </summary>
+        private readonly IFeatureManager featureManager;
+
         /// <summary>
         /// Defines the _logger.
         /// </summary>
@@ -47,37 +54,52 @@ public class ResourceController : BaseController
         /// </summary>
         private IResourceService resourceService;
 
+        /// <summary>
+        /// Defines the _fileService.
+        /// </summary>
+        private IFileService fileService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceController"/> class.
         /// </summary>
         /// <param name="hostingEnvironment">The hostingEnvironment<see cref="IWebHostEnvironment"/>.</param>
         /// <param name="config">The config<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{HomeController}"/>.</param>
         /// <param name="resourceService">The resourceService<see cref="IResourceService"/>.</param>
+        /// <param name="fileService">The fileService<see cref="IResourceService"/>.</param>
         /// /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
+        /// <param name="featureManager">The featureManager<see cref="IFeatureManager"/>.</param>
         public ResourceController(
             IWebHostEnvironment hostingEnvironment,
             IOptions<WebSettings> config,
             ILogger<HomeController> logger,
             IResourceService resourceService,
-            IOptions<WebSettings> websettings)
+            IFileService fileService,
+            IOptions<WebSettings> websettings,
+            IFeatureManager featureManager)
         : base(hostingEnvironment)
         {
             this.logger = logger;
             this.websettings = websettings;
             this.config = config.Value;
             this.resourceService = resourceService;
+            this.fileService = fileService;
+            this.featureManager = featureManager;
         }
 
         /// <summary>
         /// The Details.
         /// </summary>
         /// <param name="id">The id<see cref="int"/>.</param>
+        /// <param name="activeTab">The activeTab<see cref="string"/>.</param>
+        /// <param name="status">The status<see cref="string"/>.</param>
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpGet]
-        public async Task<IActionResult> Details(int id)
+        public async Task<IActionResult> Details(int id, string activeTab = "details", string status = "")
         {
             var resource = await this.resourceService.GetResourceVersionExtendedViewModelAsync(id);
+            this.ViewBag.ActiveTab = activeTab;
+            this.ViewBag.Status = status;
             return this.View(resource);
         }
 
@@ -120,6 +142,41 @@ public async Task<IActionResult> GetValidationResults(int resourceVersionId)
             return this.PartialView("_ValidationResults", vm);
         }
 
+        /// <summary>
+        /// The GetDevIdDetails.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> GetDevIdDetails(int resourceVersionId)
+        {
+            var vm = await this.resourceService.GetResourceVersionDevIdDetailsAsync(resourceVersionId);
+
+            return this.PartialView("_DevIdDetails", vm);
+        }
+
+        /// <summary>
+        /// The update the dev Id details.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> UpdateDevIdDetails(ResourceVersionDevIdViewModel model)
+        {
+            var message = string.Empty;
+            if (await this.resourceService.DoesDevIdExistsAsync(model.DevId))
+            {
+                message = "Duplicate";
+            }
+            else
+            {
+                await this.resourceService.UpdateDevIdDetailsAsync(model);
+                message = "Success";
+            }
+
+            return this.RedirectToAction("Details", new { id = model.ResourceVersionId, activeTab = "devId", status = message });
+        }
+
         /// <summary>
         /// The Index.
         /// </summary>
@@ -288,11 +345,17 @@ public async Task<IActionResult> TransferResourceOwnership(int resourceId, strin
         [HttpPost]
         public async Task<IActionResult> Unpublish(int resourceVersionId, string details)
         {
+            var associatedFile = await this.resourceService.GetResourceVersionExtendedViewModelAsync(resourceVersionId);
             var vr = await this.resourceService.UnpublishResourceVersionAsync(resourceVersionId, details);
             await this.resourceService.CreateResourceVersionEvent(resourceVersionId, Nhs.Models.Enums.ResourceVersionEventTypeEnum.UnpublishedByAdmin, "Unpublish using Admin UI", 0);
 
             if (vr.IsValid)
             {
+                if (associatedFile.ScormDetails != null || associatedFile.HtmlDetails != null)
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
+                }
+
                 return this.Json(new
                 {
                     success = true,
@@ -309,6 +372,41 @@ public async Task<IActionResult> Unpublish(int resourceVersionId, string details
             }
         }
 
+        /// <summary>
+        /// The GetAVUnavailableView.
+        /// </summary>
+        /// <returns> partial view.  </returns>
+        [Route("Resource/GetAVUnavailableView")]
+        [HttpGet("GetAVUnavailableView")]
+        public IActionResult GetAVUnavailableView()
+        {
+            return this.PartialView("_AudioVideoUnavailable");
+        }
+
+        /// <summary>
+        /// The GetAddAVFlag.
+        /// </summary>
+        /// <returns> Return AV Flag.</returns>
+        [Route("Resource/GetAddAVFlag")]
+        [HttpGet("GetAddAVFlag")]
+        public bool GetAddAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.AddAudioVideo).Result;
+
+        /// <summary>
+        /// The GetDisplayAVFlag.
+        /// </summary>
+        /// <returns> Return display AV flag.</returns>
+        [Route("Resource/GetDisplayAVFlag")]
+        [HttpGet("GetDisplayAVFlag")]
+        public bool GetDisplayAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.DisplayAudioVideo).Result;
+
+        /// <summary>
+        /// The GetMKPlayerKey.
+        /// </summary>
+        /// <returns>Mediakind MK Player Key.</returns>
+        [Route("Resource/GetMKPlayerKey")]
+        [HttpGet("GetMKPlayerKey")]
+        public string GetMKPlayerKey() => this.websettings.Value.MediaKindSettings.MKPlayerLicence;
+
         private static List<PagingOptionPair> FilterOptions()
         {
             List<PagingOptionPair> options = new List<PagingOptionPair>();

AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs

@@ -257,6 +257,7 @@ public async Task<IActionResult> AddUsersToUserGroup(int userGroupId, string use
             var vr = await this.userGroupService.AddUsersToUserGroup(userGroupId, userIdList);
             if (vr.IsValid)
             {
+                this.ClearUserCachedPermissions(userIdList);
                 return this.Json(new
                 {
                     success = true,
@@ -527,5 +528,16 @@ public async Task<IActionResult> UserGroupCatalogues(int id)
 
             return this.PartialView("_UserGroupCatalogues", catalogues);
         }
+
+        private void ClearUserCachedPermissions(string userIdList)
+        {
+            if (!string.IsNullOrWhiteSpace(userIdList))
+            {
+                foreach (var userId in userIdList.Split(","))
+                {
+                    _ = Task.Run(async () => { await this.userService.ClearUserCachedPermissions(int.Parse(userId)); });
+                }
+            }
+        }
     }
 }

AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/MediaManifestProxyController.cs

@@ -51,16 +51,27 @@ public string Get(string playBackUrl, string token)
                 {
                     using (var reader = new StreamReader(stream))
                     {
-                        const string qualityLevelRegex = @"(QualityLevels\(\d+\))";
+                        const string qualityLevelRegex = @"(|)([^""\s]+\.m3u8\(encryption=cbc\))";
                         const string fragmentsRegex = @"(Fragments\([\w\d=-]+,[\w\d=-]+\))";
-                        const string urlRegex = @"("")(https?:\/\/[\da-z\.-]+\.[a-z\.]{2,6}[\/\w \.-]*\/?[\?&][^&=]+=[^&=#]*)("")";
+                        const string urlRegex = @"(https?:\/\/[\da-z\.-]+\.[a-z\.]{2,6}[\/\w \.-]*\?[^,\s""]*)";
 
                         var baseUrl = playBackUrl.Substring(0, playBackUrl.IndexOf(".ism", System.StringComparison.OrdinalIgnoreCase)) + ".ism";
                         this.logger.LogDebug($"baseUrl={baseUrl}");
 
                         var content = reader.ReadToEnd();
 
-                        var newContent = Regex.Replace(content, urlRegex, string.Format(CultureInfo.InvariantCulture, "$1$2&token={0}$3", token));
+                        content = ReplaceUrisWithProxy(content, baseUrl);
+                        var newContent = Regex.Replace(content, urlRegex, match =>
+                        {
+                            string baseUrlWithQuery = match.Groups[1].Value;  // URL including the query string
+
+                            // Append the token correctly without modifying surrounding characters
+                            string newUrl = baseUrlWithQuery.Contains("?") ?
+                                            $"{baseUrlWithQuery}&token={token}" :
+                                            $"{baseUrlWithQuery}?token={token}";
+
+                            return newUrl;
+                        });
                         this.logger.LogDebug($"newContent={newContent}");
 
                         var match = Regex.Match(playBackUrl, qualityLevelRegex);
@@ -87,5 +98,33 @@ public string Get(string playBackUrl, string token)
 
             return null;
         }
+
+        private static string ReplaceUrisWithProxy(string playlistContent, string proxyUrl)
+        {
+            // Split the playlist content into lines
+            var lines = playlistContent.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+
+            // Process each line to replace media or map URIs
+            for (int i = 0; i < lines.Length; i++)
+            {
+                if (lines[i].StartsWith("#EXT-X-MAP:URI=", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Extract the URI from the current line for EXT-X-MAP
+                    var existingUri = lines[i].Substring(lines[i].IndexOf('=') + 1).Trim('"');
+                    var newUri = $"{proxyUrl}/{existingUri}";
+                    lines[i] = lines[i].Replace(existingUri, newUri);
+                }
+                else if (lines[i].StartsWith("#EXTINF:", StringComparison.OrdinalIgnoreCase) && i + 1 < lines.Length)
+                {
+                    // Get the URI from the next line for EXTINF
+                    var existingUri = lines[i + 1].Trim();
+                    var newUri = $"{proxyUrl}/{existingUri}";
+                    lines[i + 1] = newUri;
+                }
+            }
+
+            // Join the modified lines back into a single string
+            return string.Join("\r\n", lines);
+        }
     }
 }

AdminUI/LearningHub.Nhs.AdminUI/Helpers/FeatureFlags.cs

@@ -0,0 +1,18 @@
+namespace LearningHub.Nhs.AdminUI.Helpers
+{
+    /// <summary>
+    /// <see cref="FeatureFlags"/>.
+    /// </summary>
+    public static class FeatureFlags
+    {
+        /// <summary>
+        /// The AddAudioVideo.
+        /// </summary>
+        public const string AddAudioVideo = "AddAudioVideo";
+
+        /// <summary>
+        /// The DisplayAudioVideo.
+        /// </summary>
+        public const string DisplayAudioVideo = "DisplayAudioVideo";
+    }
+}

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -116,6 +116,12 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }