Skip to content

Merge LH Scorpius changes to master #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 2, 2024
Merged

Merge LH Scorpius changes to master #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f4cebe3
remove spaces
AnjuJose011 May 20, 2024
a2e66ea
Merge pull request #34 from TechnologyEnhancedLearning/Develop/TD-3399
AnjuJose011 May 20, 2024
9f84105
Merge pull request #41 from TechnologyEnhancedLearning/releases/LHSco…
AnjuJose011 Jul 11, 2024
4fd4bb2
Added userprofileclient config and learningcredentialsapi scope
ColinBeebyHEE Jul 23, 2024
fbe8413
Merge pull request #45 from TechnologyEnhancedLearning/Develop/Fearur…
AnjuJose011 Aug 7, 2024
530101b
Model Version Update
AnjuJose011 Aug 7, 2024
431a780
Merge pull request #46 from TechnologyEnhancedLearning/ModelVersionUp…
AnjuJose011 Aug 7, 2024
01892d4
Revert "Model Version Update"
AnjuJose011 Aug 7, 2024
838332f
Merge pull request #47 from TechnologyEnhancedLearning/revert-46-Mode…
AnjuJose011 Aug 7, 2024
ca58885
model version update-RC
AnjuJose011 Aug 7, 2024
b3d73b0
Merge pull request #48 from TechnologyEnhancedLearning/ModelVersionUp…
AnjuJose011 Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions Auth/LearningHub.Nhs.Auth/Configuration/LearningHubResourceStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace LearningHub.Nhs.Auth.Configuration

Check warning on line 1 in Auth/LearningHub.Nhs.Auth/Configuration/LearningHubResourceStore.cs

View workflow job for this annotation

GitHub Actions / Build and test 

The file header is missing or not located at the top of the file. (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1633.md)
{
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -26,12 +26,14 @@
{
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[]
Expand Down
2 changes: 1 addition & 1 deletion Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
15 changes: 15 additions & 0 deletions Auth/LearningHub.Nhs.Auth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
2 changes: 1 addition & 1 deletion ...gHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.UserApi.Services/ElfhUserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading