Merge pull request #50 from TechnologyEnhancedLearning/RC

AnjuJose011 · web-flow · commit 64aceba7fcaa · 2024-09-02T09:30:23.000+01:00
Merge LH Scorpius changes to master
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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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/Configuration/LearningHubResourceStore.cs b/Auth/LearningHub.Nhs.Auth/Configuration/LearningHubResourceStore.cs
@@ -26,12 +26,14 @@ public LearningHubResourceStore()
             {
                 new ApiResource("learninghubapi", "Learning Hub API") { Scopes = new List<string> { "learninghubapi", }, },
                 new ApiResource("userapi", "User API") { Scopes = new List<string> { "userapi" } },
+                new ApiResource("learningcredentialsapi", "Learning Credentials API") { Scopes = new List<string> { "learningcredentialsapi" } },
             };
 
             this.apiScopes = new[]
             {
                 new ApiScope("learninghubapi", "Access Learning Hub API"),
                 new ApiScope("userapi", "Access User API"),
+                new ApiScope("learningcredentialsapi", "Learning Credentials API"),
             };
 
             this.identityResources = new[]
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.25" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 		<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/appsettings.json b/Auth/LearningHub.Nhs.Auth/appsettings.json
@@ -137,6 +137,21 @@
         "RequirePkce": false,
         "AllowOfflineAccess": false
       },
+      "userprofileclient": {
+        "BaseUrl": "",
+        "ClientName": "",
+        "ClientSecret": "",
+        "AllowedGrantTypes": [ "" ],
+        "RedirectUris": [ "" ],
+        "PostLogoutUris": [ "" ],
+        "AllowedScopes": [ "", "", "", "", "", "" ],
+        "BackChannelLogoutSessionRequired": true,
+        "BackChannelLogoutUri": "",
+        "UpdateAccessTokenClaimsOnRefresh": true,
+        "RequireConsent": false,
+        "RequirePkce": true,
+        "AllowOfflineAccess": true
+      },
       "learninghubopenapi": {
         "BaseUrl": "",
         "ClientName": "",
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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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/ElfhUserService.cs b/LearningHub.Nhs.UserApi.Services/ElfhUserService.cs
@@ -317,6 +317,7 @@ public async Task<string> CreateUserNameAsync(int medicalCouncilId, string medic
             if (medicalCouncilId == 0 || string.IsNullOrEmpty(medicalCouncilNumber))
             {
                 // Generate random username using Lastname
+                lastName = string.Concat(lastName.Where(c => !char.IsWhiteSpace(c)));
                 string usernameStart = lastName.StripUnicodeCharactersFromString().Trim();
                 if (usernameStart.Length > 5)
                 {
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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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.25" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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" />

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,14 @@ public LearningHubResourceStore()`
`26`	`26`	`{`
`27`	`27`	`new ApiResource("learninghubapi", "Learning Hub API") { Scopes = new List<string> { "learninghubapi", }, },`
`28`	`28`	`new ApiResource("userapi", "User API") { Scopes = new List<string> { "userapi" } },`
	`29`	`+ new ApiResource("learningcredentialsapi", "Learning Credentials API") { Scopes = new List<string> { "learningcredentialsapi" } },`
`29`	`30`	`};`
`30`	`31`
`31`	`32`	`this.apiScopes = new[]`
`32`	`33`	`{`
`33`	`34`	`new ApiScope("learninghubapi", "Access Learning Hub API"),`
`34`	`35`	`new ApiScope("userapi", "Access User API"),`
	`36`	`+ new ApiScope("learningcredentialsapi", "Learning Credentials API"),`
`35`	`37`	`};`
`36`	`38`
`37`	`39`	`this.identityResources = new[]`
Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,7 @@ public async Task<string> CreateUserNameAsync(int medicalCouncilId, string medic`
`317`	`317`	`if (medicalCouncilId == 0 \|\| string.IsNullOrEmpty(medicalCouncilNumber))`
`318`	`318`	`{`
`319`	`319`	`// Generate random username using Lastname`
	`320`	`+ lastName = string.Concat(lastName.Where(c => !char.IsWhiteSpace(c)));`
`320`	`321`	`string usernameStart = lastName.StripUnicodeCharactersFromString().Trim();`
`321`	`322`	`if (usernameStart.Length > 5)`
`322`	`323`	`{`