Bring RC changes to release/Phoenix

.gitguardian.yaml

@@ -0,0 +1,5 @@
+secret:
+  ignored-matches:
+  - match: 26841b2b92a38ec6d2dd87ccc2d4f6d3613486c21f4cf5cb4d98b4527dfc0061
+    name: Generic High Entropy Secret - LearningHub.Nhs.WebUI/Program.cs
+version: 2

.github/azure-pipeline-database-ci.yml

@@ -0,0 +1,30 @@
+trigger:
+  - CI
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/CI
+jobs:
+- job: Job_1
+  displayName: Agent job
+  pool:
+    vmImage: windows-2019
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: false
+  - task: MSBuild@1
+    displayName: Build solution **/LearningHub.Nhs.Database.sqlproj
+    inputs:
+      solution: '**/LearningHub.Nhs.Database.sqlproj'
+      msbuildArchitecture: x64
+  - task: CopyFiles@2
+    displayName: Copy SQL Dacpac File
+    inputs:
+      SourceFolder: $(agent.builddirectory)\s
+      Contents: '**\LearningHub.Nhs.Database.dacpac'
+      TargetFolder: $(build.artifactstagingdirectory)
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
+...

.github/azure-pipeline-openapi-reportapi-ci.yml

@@ -0,0 +1,85 @@
+# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
+variables:
+- name: BuildParameters.RestoreBuildProjects
+  value: '**/*.csproj'
+- name: BuildParameters.projects
+  value: '**/*.csproj'
+trigger:
+  - CI
+name: $(date:yyyyMMdd)$(rev:.r)
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/RC
+jobs:
+- job: Job_1
+  displayName: Agent job
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: false
+  - task: NuGetToolInstaller@1
+    displayName: Use NuGet 5.8
+    inputs:
+      versionSpec: 5.8
+  - task: NuGetCommand@2
+    displayName: NuGet restore
+    inputs:
+      feedRestore: d99eaf2c-ad74-4a35-876e-f7dc1e45a604
+  - task: DotNetCoreCLI@2
+    displayName: Restore
+    inputs:
+      command: restore
+      projects: $(BuildParameters.RestoreBuildProjects)
+      feedRestore: d99eaf2c-ad74-4a35-876e-f7dc1e45a604
+  - task: DotNetCoreCLI@2
+    displayName: Build
+    inputs:
+      projects: $(BuildParameters.projects)
+      arguments: --configuration $(BuildConfiguration) /p:Platform=x64
+  - task: DotNetCoreCLI@2
+    displayName: Test OpenAPI
+    inputs:
+      command: test
+      projects: '**/*LearningHub.Nhs.OpenApi.Tests.csproj'
+      arguments: --configuration Debug
+  - task: DotNetCoreCLI@2
+    displayName: Test ReportAPI
+    inputs:
+      command: test
+      projects: '**/*LearningHub.Nhs.ReportApi.Services.UnitTests.csproj'
+      arguments: --configuration Debug
+  - task: DotNetCoreCLI@2
+    displayName: Publish OpenAPI
+    inputs:
+      command: publish
+      publishWebProjects: false
+      projects: '**/*LearningHub.NHS.OpenAPI.csproj'
+      arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/OpenAPI
+      zipAfterPublish: True
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact OpenAPI
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(build.artifactstagingdirectory)/OpenAPI
+      ArtifactName: OpenAPI
+      TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)'
+  - task: DotNetCoreCLI@2
+    displayName: Publish ReportAPI
+    inputs:
+      command: publish
+      publishWebProjects: false
+      projects: '**/*LearningHub.Nhs.ReportApi.csproj'
+      arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/ReportAPI
+      zipAfterPublish: True
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact ReportAPI
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(build.artifactstagingdirectory)/ReportAPI
+      ArtifactName: ReportAPI
+      TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)'
+...

.github/azure-pipeline-webui-ci.yml

@@ -0,0 +1,112 @@
+# Variable Group 'UAT - Variable Group' was defined in the Variables tab
+variables:
+- name: BuildParameters.RestoreBuildProjects
+  value: '**/*.csproj'
+- name: BuildParameters.TestProjects
+  value: '**/*[Tt]ests/*.csproj'
+trigger:
+  - CI
+name: $(date:yyyyMMdd)$(rev:.r)
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/CI
+jobs:
+- job: Job_1
+  displayName: Agent job
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: true
+  - task: NodeTool@0
+    displayName: Use Node 12.19 (otherwise node-sass 4.13 will error - Azure build agent defaults to v14.15 which is incompatible)
+    inputs:
+      versionSpec: 12.19
+  - task: Npm@1
+    displayName: npm custom
+    inputs:
+      command: custom
+      workingDir: LearningHub.Nhs.WebUI
+      verbose: false
+      customCommand: install -f
+  - task: Npm@1
+    displayName: run webpack build
+    inputs:
+      command: custom
+      workingDir: LearningHub.Nhs.WebUI
+      verbose: false
+      customCommand: run build
+  - task: NuGetToolInstaller@1
+    displayName: Use NuGet 5.8
+    inputs:
+      versionSpec: 5.8
+  - task: NuGetCommand@2
+    displayName: NuGet restore
+    inputs:
+      feedRestore: d99eaf2c-ad74-4a35-876e-f7dc1e45a604
+  - task: DotNetCoreCLI@2
+    displayName: Restore
+    inputs:
+      command: restore
+      projects: $(BuildParameters.RestoreBuildProjects)
+  - task: DotNetCoreCLI@2
+    displayName: Build
+    inputs:
+      projects: $(BuildParameters.RestoreBuildProjects)
+      arguments: --configuration $(BuildConfiguration)
+  - task: DotNetCoreCLI@2
+    displayName: Test
+    enabled: False
+    inputs:
+      command: test
+      projects: $(BuildParameters.TestProjects)
+      arguments: --configuration $(BuildConfiguration)
+  - task: DotNetCoreCLI@2
+    displayName: Publish WebUI
+    inputs:
+      command: publish
+      publishWebProjects: false
+      projects: '**/*LearningHub.Nhs.WebUI.csproj'
+      arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/WebUI
+      zipAfterPublish: True
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact WebUI
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/WebUI
+      ArtifactName: WebUI
+      TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)'
+  - task: DotNetCoreCLI@2
+    displayName: Publish AdminUI
+    inputs:
+      command: publish
+      publishWebProjects: false
+      projects: '**/*LearningHub.Nhs.AdminUI.csproj'
+      arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/AdminUI
+      zipAfterPublish: True
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact AdminUI
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/AdminUI
+      ArtifactName: AdminUI
+      TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)'
+  - task: DotNetCoreCLI@2
+    displayName: Publish WebAPI
+    inputs:
+      command: publish
+      publishWebProjects: false
+      projects: '**/*LearningHub.Nhs.Api.csproj'
+      arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/WebAPI
+      zipAfterPublish: True
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact WebAPI '
+    condition: succeededOrFailed()
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)/WebAPI
+      ArtifactName: WebAPI
+      TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)'
+...

.gitignore

@@ -43,3 +43,7 @@ obj
 /AdminUI/LearningHub.Nhs.AdminUI/Properties/launchSettings.json
 /WebAPI/LearningHub.Nhs.API/Properties/launchSettings.json
 /WebAPI/LearningHub.Nhs.API/appsettings.Development.json
+/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.dbmdl
+/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/Controllers/Api/UserController.cs

@@ -90,6 +90,18 @@ public async Task<ActionResult> GetUserAccessType()
             return this.Ok(isGeneralUser);
         }
 
+        /// <summary>
+        /// to get user role.
+        /// </summary>
+        /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("CheckUserRole")]
+        public async Task<ActionResult> CheckUserRole()
+        {
+            var isSystemAdmin = this.User.IsInRole("Administrator");
+            return this.Ok(isSystemAdmin);
+        }
+
         /// <summary>
         /// The GetCurrentUserPersonalDetails.
         /// </summary>

LearningHub.Nhs.WebUI/Controllers/ResourceController.cs

@@ -136,7 +136,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
                 var userGroups = await this.userGroupService.GetRoleUserGroupDetailForUserAsync(this.CurrentUserId);
 
                 hasCatalogueAccess = userGroups.Any(x => x.CatalogueNodeId == resource.Catalogue.NodeId &&
-                    (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader));
+                    (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader)) || this.User.IsInRole("Administrator");
             }
             else if (!resource.Catalogue.RestrictedAccess)
             {

LearningHub.Nhs.WebUI/Program.cs

@@ -33,7 +33,7 @@
 
     var builder = WebApplication.CreateBuilder(args);
 
-    builder.Configuration.AddUserSecrets(string.Empty);
+    builder.Configuration.AddUserSecrets("a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef");
 
     builder.Logging.ClearProviders();
     builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);

LearningHub.Nhs.WebUI/Scripts/vuesrc/data/user.ts

@@ -54,6 +54,18 @@ const isGeneralUser = async function (): Promise<boolean[]> {
         });
 };
 
+const IsSystemAdmin = async function (): Promise<boolean[]> {
+    var IsSystemAdmin = `/api/User/CheckUserRole`;
+    return await AxiosWrapper.axios.get<boolean[]>(IsSystemAdmin)
+        .then(response => {
+            return response.data;
+        })
+        .catch(e => {
+            console.log('IsSystemAdmin:' + e);
+            throw e;
+        });
+};
+
 const getCurrentUserBasicDetails = async function (): Promise<UserBasicModel> {
     return await AxiosWrapper.axios.get<UserBasicModel>('/api/User/GetCurrentUserBasicDetails')
         .then(response => {
@@ -160,5 +172,6 @@ export const userData = {
     updateSecurityQuestionAnswers,
     keepUserSessionAlive,
     getkeepUserSessionAliveInterval,
-    isGeneralUser
+    isGeneralUser,
+    IsSystemAdmin
 }

LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue

@@ -8,7 +8,7 @@
 
                     <!--Video-->
                     <div id="mediacontainer" class="resource-item nhsuk-u-margin-bottom-7" v-if="hasMediaAccess && (resourceItem.resourceTypeEnum === ResourceType.VIDEO)">
-                        
+
                         <video id="resourceAzureMediaPlayer" data-setup='{"logo": { "enabled": false }, "techOrder": ["azureHtml5JS", "flashSS",  "silverlightSS", "html5"], "nativeControlsForTouch": false}' controls class="azuremediaplayer amp-default-skin amp-big-play-centered resource-video nhsuk-u-margin-bottom-4">
                             <source :src="resourceItem.videoDetails.resourceAzureMediaAsset.locatorUri" type="application/vnd.ms-sstr+xml" :data-setup='getAESProtection(resourceItem.videoDetails.resourceAzureMediaAsset.authenticationToken)' />
                             <source :src="getMediaAssetProxyUrl(resourceItem.videoDetails.resourceAzureMediaAsset)" type="application/vnd.apple.mpegurl" disableUrlRewriter="true" />
@@ -73,7 +73,7 @@
     import '../filters';
     import { resourceData } from '../data/resource';
     import { userData } from '../data/user';
-    import { VersionStatus, ResourceType, ResourceAccessibility,ActivityStatus, MediaResourceActivityType, AzureMediaPlayerOptions, RoleEnum } from '../constants';
+    import { VersionStatus, ResourceType, ResourceAccessibility, ActivityStatus, MediaResourceActivityType, AzureMediaPlayerOptions, RoleEnum } from '../constants';
     import { ResourceItemModel } from '../models/resourceItemModel';
     import { ScormContentDetailsModel } from '../models/scormModel';
     import { RoleUserGroupModel } from '../models/roleUserGroupModel';
@@ -119,19 +119,20 @@
                 interactionQueue: new Array<InteractionQueueModel>(),
                 scormContentDetailsModel: new ScormContentDetailsModel(),
                 assessmentProgress: null as AssessmentProgressModel,
-                isGeneralUser: false
+                isGeneralUser: false,
+                isSystemAdmin: false
             }
         },
         computed: {
             hasCatalogueAccess(): boolean {
-                return (!this.resourceItem.catalogue.restrictedAccess
+                return (!this.resourceItem.catalogue.restrictedAccess || this.IsSystemAdmin
                     ||
                     (this.roleUserGroups.filter((rug: any) => rug.catalogueNodeId == this.resourceItem.catalogue.nodeId
                         && (rug.roleEnum == RoleEnum.LocalAdmin || rug.roleEnum == RoleEnum.Editor || rug.roleEnum == RoleEnum.Reader)).length > 0)
                 );
             },
             hasMediaAccess(): boolean {
-                return this.userAuthenticated && (this.resourceItem.resourceTypeEnum == this.ResourceType.AUDIO || this.resourceItem.resourceTypeEnum == this.ResourceType.VIDEO ) && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
+                return this.userAuthenticated && (this.resourceItem.resourceTypeEnum == this.ResourceType.AUDIO || this.resourceItem.resourceTypeEnum == this.ResourceType.VIDEO) && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
             },
             hasScormAccess(): boolean {
                 return this.userAuthenticated && this.resourceItem.resourceTypeEnum == this.ResourceType.SCORM && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
@@ -146,12 +147,13 @@
                 this.mediaStartTime = parseInt(this.$route.query.mediaStartTime as string);
             }
             await this.getGeneralUser();
+            await this.getUserRole();
             await this.loadResourceItem(Number(this.$route.params.resId));
 
             if (this.userAuthenticated && this.resourceItem.catalogue.restrictedAccess) {
                 await this.loadRoleUserGroups();
             }
-            
+
 
             if (this.userAuthenticated && (this.resourceItem.resourceTypeEnum == ResourceType.VIDEO || this.resourceItem.resourceTypeEnum == ResourceType.AUDIO) && this.hasResourceAccess()) {
                 this.addMediaEventListeners();
@@ -236,6 +238,9 @@
             async getGeneralUser(): Promise<void> {
                 this.isGeneralUser = await userData.isGeneralUser();
             },
+            async getUserRole(): Promise<void> {
+                this.IsSystemAdmin = await userData.IsSystemAdmin();
+            },
 
             hasResourceAccess(): boolean {
                 return this.userAuthenticated && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
@@ -550,7 +555,7 @@
     .resource-item-row {
         margin-top: 32px;
     }
-    
+
     .border-bottom {
         border-bottom: 1px solid $nhsuk-grey-lighter;
         padding-bottom: 20px;
@@ -628,7 +633,6 @@
         color: #ffffff;
         background-color: transparent;
     }
-
 </style>
 
 <style lang="scss">