diff --git a/.gitignore b/.gitignore index 0afa44753..4119589ad 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ obj /WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.jfm /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.dbmdl /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.jfm +/LearningHub.Nhs.WebUI.AutomatedUiTests/appsettings.Development.json diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/MediaKindSettings.cs b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/MediaKindSettings.cs new file mode 100644 index 000000000..82609fc07 --- /dev/null +++ b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/MediaKindSettings.cs @@ -0,0 +1,53 @@ +namespace LearningHub.Nhs.AdminUI.Configuration +{ + /// + /// Config AzureMediaSettings. + /// + public class MediaKindSettings + { + /// + /// Gets or sets subscription name. + /// + public string SubscriptionName { get; set; } + + /// + /// Gets or sets token. + /// + public string Token { get; set; } + + /// + /// Gets or sets storage media account name. + /// + public string StorageAccountName { get; set; } + + /// + /// Gets or sets media kind media service issuer. + /// + public string Issuer { get; set; } + + /// + /// Gets or sets media kind media service audience. + /// + public string Audience { get; set; } + + /// + /// Gets or sets the contentkey policyname. + /// + public string ContentKeyPolicyName { get; set; } + + /// + /// Gets or sets media kind media service jwt primary key secret. + /// + public string JWTPrimaryKeySecret { get; set; } + + /// + /// Gets or sets the media kind media kind MKPlayer licence key. + /// + public string MKPlayerLicence { get; set; } + + /// + /// Gets or sets the media kind blob connection string. + /// + public string MediaKindStorageConnectionString { get; set; } + } +} diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs index ace067941..508e85497 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs @@ -146,5 +146,10 @@ public class WebSettings /// Gets or sets the FileUploadSettings. /// public FileUploadSettingsModel FileUploadSettings { get; set; } = new FileUploadSettingsModel(); + + /// + /// Gets or sets the MediaKindSettings. + /// + public MediaKindSettings MediaKindSettings { get; set; } = new MediaKindSettings(); } } \ No newline at end of file diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs index e2c191f11..31f53b2a4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs @@ -346,6 +346,14 @@ public IActionResult GetAVUnavailableView() [HttpGet("GetDisplayAVFlag")] public bool GetDisplayAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.DisplayAudioVideo).Result; + /// + /// The GetMKPlayerKey. + /// + /// Mediakind MK Player Key. + [Route("Resource/GetMKPlayerKey")] + [HttpGet("GetMKPlayerKey")] + public string GetMKPlayerKey() => this.websettings.Value.MediaKindSettings.MKPlayerLicence; + private static List FilterOptions() { List options = new List(); diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj index a6109a60f..7bef84029 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj +++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj @@ -105,7 +105,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + + diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/cmsPageRow.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/cmsPageRow.vue index 79769cdf3..d6e16e769 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/cmsPageRow.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/cmsPageRow.vue @@ -10,7 +10,6 @@

{{pageSectionDetail.sectionTitle}}

-
@@ -19,13 +18,15 @@
- + --> +
+