Merge branch 'CI' of https://github.com/TechnologyEnhancedLearning/LearningHub.Nhs.UserApi into CI

Swapnamol · Swapnamol · commit 601be8d14926 · 2024-02-27T10:17:58.000Z
diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml
@@ -5,7 +5,11 @@ variables:
 - name: BuildParameters.TestProjects
   value: '**/*[Tt]ests/*.csproj'
 trigger:
-  - CI
+  branches:
+    include: 
+      - CI
+    exclude:
+      - '*'
 name: $(date:yyyyMMdd)$(rev:.r)
 resources:
   repositories:
diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj
@@ -10,7 +10,7 @@
   
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj
@@ -106,7 +106,7 @@
 		<PackageReference Include="IdentityServer4" Version="4.1.1" />
 		<PackageReference Include="IdentityServer4.Contrib.RedisStore" Version="4.0.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
 		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_FooterPartial.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_FooterPartial.cshtml
@@ -1,7 +1,7 @@
 <footer role="contentinfo">
   <div class="nhsuk-footer" id="nhsuk-footer">
     <div class="nhsuk-width-container nhsuk-footer__container app-width-container">
-      <p class="nhsuk-footer__copyright">&copy; NHS England 2023</p>
+      <p class="nhsuk-footer__copyright">&copy; NHS England @DateTime.Now.Year</p>
     </div>
   </div>
 </footer>
diff --git a/Auth/LearningHub.Nhs.Auth/appsettings.json b/Auth/LearningHub.Nhs.Auth/appsettings.json
@@ -151,6 +151,21 @@
         "RequireConsent": false,
         "RequirePkce": true,
         "AllowOfflineAccess": true
+      },
+      "digitallearningsolutions": {
+        "BaseUrl": "",
+        "ClientName": "",
+        "ClientSecret": "",
+        "AllowedGrantTypes": [ "" ],
+        "RedirectUris": [ "" ],
+        "PostLogoutUris": [ "" ],
+        "AllowedScopes": [ "", "", "", "", "" ],
+        "BackChannelLogoutSessionRequired": true,
+        "BackChannelLogoutUri": "",
+        "UpdateAccessTokenClaimsOnRefresh": true,
+        "RequireConsent": false,
+        "RequirePkce": true,
+        "AllowOfflineAccess": true
       }
     },
     "IdsClients": {
@@ -311,6 +326,21 @@
         "UseSupport": false,
         "AllowRememberLogin": false,
         "LayoutPath": "/Views/Shared/LearningHub/_Layout.cshtml"
+      },
+      "digitallearningsolutions": {
+        "ClientDescription": "Learning Hub",
+        "ClientUrl": "",
+        "RedirectUris": [],
+        "PostLogoutUris": [],
+        "AuthMainTitle": "Digital Learning Solutions Authentication",
+        "ClientLogoSrc": "/images/client-logos/dls.svg",
+        "ClientLogoAltText": "Digital Learning Solutions",
+        "ClientCssClass": "learning-hub",
+        "ForgottenPasswordRelativeUrl": "forgotten-password",
+        "RegisterAccountRelativeUrl": "register",
+        "SupportUrl": "https://support.e-lfh.org.uk/",
+        "AllowRememberLogin": false,
+        "UseRegister": false
       }
     }
   }
diff --git a/Auth/LearningHub.Nhs.Auth/wwwroot/images/client-logos/dls.svg b/Auth/LearningHub.Nhs.Auth/wwwroot/images/client-logos/dls.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="135" height="94" viewBox="0 0 135 94" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <style>.a{fill:#C00A72;}.b{fill:#098FCF;}</style>
+  <g>
+    <text style="fill: rgb(51, 51, 51); font-family: Arial, sans-serif; font-size: 2.8px; white-space: pre;" x="8.292" y="38.225" dx="0 0 0.101" transform="matrix(24.145924, 0, 0, 29.486601, -199.813629, -1051.485718)">DLS</text>
+  </g>
+</svg>
diff --git a/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj b/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj b/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj b/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="MockQueryable.Core" Version="5.0.0" />
     <PackageReference Include="MockQueryable.Moq" Version="5.0.0" />
diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.22" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.25" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
