From 8e6c810b32632868d34df0b57dd235670b2a3756 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 05:47:24 +0000 Subject: [PATCH 01/21] Bump @babel/core from 7.27.3 to 7.27.4 in /Auth/LearningHub.Nhs.Auth Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.27.3 to 7.27.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.27.4/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-version: 7.27.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Auth/LearningHub.Nhs.Auth/package-lock.json | 34 ++++++++++----------- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/package-lock.json b/Auth/LearningHub.Nhs.Auth/package-lock.json index b0fd361..21f8a65 100644 --- a/Auth/LearningHub.Nhs.Auth/package-lock.json +++ b/Auth/LearningHub.Nhs.Auth/package-lock.json @@ -16,7 +16,7 @@ "node": "^22" }, "devDependencies": { - "@babel/core": "^7.27.3", + "@babel/core": "^7.27.4", "@babel/preset-env": "^7.27.2", "babel-core": "^4.7.16", "babel-loader": "^8.2.2", @@ -74,9 +74,9 @@ } }, "node_modules/@babel/core": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.3.tgz", - "integrity": "sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==", + "version": "7.27.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.4.tgz", + "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==", "dev": true, "license": "MIT", "dependencies": { @@ -85,10 +85,10 @@ "@babel/generator": "^7.27.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", - "@babel/helpers": "^7.27.3", - "@babel/parser": "^7.27.3", + "@babel/helpers": "^7.27.4", + "@babel/parser": "^7.27.4", "@babel/template": "^7.27.2", - "@babel/traverse": "^7.27.3", + "@babel/traverse": "^7.27.4", "@babel/types": "^7.27.3", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -371,9 +371,9 @@ } }, "node_modules/@babel/helpers": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.3.tgz", - "integrity": "sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==", + "version": "7.27.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.4.tgz", + "integrity": "sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==", "dev": true, "license": "MIT", "dependencies": { @@ -385,9 +385,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.3.tgz", - "integrity": "sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==", + "version": "7.27.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.4.tgz", + "integrity": "sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==", "dev": true, "license": "MIT", "dependencies": { @@ -1506,15 +1506,15 @@ } }, "node_modules/@babel/traverse": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.3.tgz", - "integrity": "sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==", + "version": "7.27.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz", + "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.3", - "@babel/parser": "^7.27.3", + "@babel/parser": "^7.27.4", "@babel/template": "^7.27.2", "@babel/types": "^7.27.3", "debug": "^4.3.1", diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 774c644..1f99ad1 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -26,7 +26,7 @@ "node": "^22" }, "devDependencies": { - "@babel/core": "^7.27.3", + "@babel/core": "^7.27.4", "@babel/preset-env": "^7.27.2", "babel-core": "^4.7.16", "babel-loader": "^8.2.2", From d82e9aa73674603803861a48396ee9d258da03c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 05:58:30 +0000 Subject: [PATCH 02/21] Bump sass from 1.89.0 to 1.89.1 in /Auth/LearningHub.Nhs.Auth (#185) Bumps [sass](https://github.com/sass/dart-sass) from 1.89.0 to 1.89.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.89.0...1.89.1) --- updated-dependencies: - dependency-name: sass dependency-version: 1.89.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Auth/LearningHub.Nhs.Auth/package-lock.json | 8 ++++---- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/package-lock.json b/Auth/LearningHub.Nhs.Auth/package-lock.json index b0fd361..04360c1 100644 --- a/Auth/LearningHub.Nhs.Auth/package-lock.json +++ b/Auth/LearningHub.Nhs.Auth/package-lock.json @@ -25,7 +25,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.89.0", + "sass": "^1.89.1", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.5.2", @@ -5997,9 +5997,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.89.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz", - "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==", + "version": "1.89.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz", + "integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==", "dev": true, "license": "MIT", "dependencies": { diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 774c644..59f156e 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -35,7 +35,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.89.0", + "sass": "^1.89.1", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.5.2", From 9d3aee13c1c99358c66c9d0eeb0d83c3ea73e882 Mon Sep 17 00:00:00 2001 From: Binon Date: Tue, 3 Jun 2025 15:56:53 +0100 Subject: [PATCH 03/21] Enabled central package management --- .../LearningHub.Nhs.Auth.Tests.csproj | 27 +- .../LearningHub.Nhs.Auth.csproj | 278 +++++++++--------- Directory.Build.props | 2 +- Directory.Packages.props | 49 +++ ...ub.Nhs.UserApi.Repository.Interface.csproj | 16 +- .../LearningHub.Nhs.UserApi.Repository.csproj | 20 +- ...gHub.Nhs.UserAPI.Services.Interface.csproj | 16 +- ...gHub.Nhs.UserApi.Services.UnitTests.csproj | 34 +-- .../LearningHub.Nhs.UserApi.Services.csproj | 21 +- .../LearningHub.Nhs.UserApi.Shared.csproj | 15 +- .../LearningHub.Nhs.UserApi.UnitTests.csproj | 27 +- .../LearningHub.Nhs.UserApi.csproj | 40 ++- 12 files changed, 273 insertions(+), 272 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj index ec6d6ad..4544d37 100644 --- a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj +++ b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj @@ -1,32 +1,27 @@ - - + net8.0 true false - x64 + x64 - - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj index 2933aee..8fe3ee6 100644 --- a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj +++ b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj @@ -1,145 +1,133 @@ - - - - net8.0 - 00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E - true - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - Never - - - - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - Always - - - Always - - - - - - - - - - - - - - + + + net8.0 + 00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E + true + x64 + + + + + + + + + + + + + + + + + + + + + + + Never + + + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + Always + + + Always + + + + + + + + + + + \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 041b430..d153dde 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ $(SolutionDir)StyleCop.ruleset - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..c94d0a7 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,49 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 index 29a3a90..60f0b5d 100644 --- a/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj +++ b/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj @@ -1,23 +1,19 @@ - - + net8.0 true false - x64 + x64 - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj index 5921669..7d254b8 100644 --- a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj +++ b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj @@ -1,25 +1,21 @@ - - + net8.0 true false - x64 + x64 - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file 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 index 29a3a90..60f0b5d 100644 --- a/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj +++ b/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj @@ -1,23 +1,19 @@ - - + net8.0 true false - x64 + x64 - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file 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 index a61a661..2bcf2e7 100644 --- a/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj @@ -1,37 +1,33 @@ - - + net8.0 - true + true enable enable - x64 + x64 false - - - - - - - - - - - + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj index 670491b..a81d32a 100644 --- a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj +++ b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj @@ -1,27 +1,24 @@ - - + net8.0 true false - x64 + x64 - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj index ecfe311..04b48b4 100644 --- a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj +++ b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj @@ -1,19 +1,16 @@ - - + net8.0 true false - x64 + x64 - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj index 5c215c5..4eb125a 100644 --- a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj @@ -1,37 +1,32 @@ - - + net8.0 - true + true enable enable - x64 + x64 false - - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + \ No newline at end of file diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj index c707f5a..f98d757 100644 --- a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj +++ b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj @@ -1,43 +1,37 @@ - - + net8.0 InProcess true - x64 + x64 - LearningHub.Nhs.UserApi.xml - - Always - - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - @@ -45,12 +39,14 @@ - Never - - + + + + + \ No newline at end of file From 03ea146cdddf4e47b7f53a6d2f47d45a8573d4bd Mon Sep 17 00:00:00 2001 From: Binon Date: Fri, 6 Jun 2025 15:25:10 +0100 Subject: [PATCH 04/21] Added nuget.config file --- LearningHub.Nhs.UserApi.sln | 2 ++ nuget.config | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nuget.config diff --git a/LearningHub.Nhs.UserApi.sln b/LearningHub.Nhs.UserApi.sln index adb65c7..9775d9c 100644 --- a/LearningHub.Nhs.UserApi.sln +++ b/LearningHub.Nhs.UserApi.sln @@ -6,6 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{683CA47A-9041-4CB9-B436-CD20BD40EB34}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props + nuget.config = nuget.config StyleCop.json = StyleCop.json StyleCop.ruleset = StyleCop.ruleset EndProjectSection diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..4b5a055 --- /dev/null +++ b/nuget.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7ab67b01ca0b908eadfea33ee630a4db0a7eae6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 04:27:30 +0000 Subject: [PATCH 05/21] Bump core-js from 3.42.0 to 3.43.0 in /Auth/LearningHub.Nhs.Auth (#187) Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.42.0 to 3.43.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.43.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-version: 3.43.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Auth/LearningHub.Nhs.Auth/package-lock.json | 8 ++++---- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/package-lock.json b/Auth/LearningHub.Nhs.Auth/package-lock.json index 04360c1..869ff97 100644 --- a/Auth/LearningHub.Nhs.Auth/package-lock.json +++ b/Auth/LearningHub.Nhs.Auth/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "babel-polyfill": "^6.26.0", "concurrently": "^7.2.0", - "core-js": "^3.42.0", + "core-js": "^3.43.0", "nhsuk-frontend": "^7.0.0", "node": "^22" }, @@ -3515,9 +3515,9 @@ "license": "MIT" }, "node_modules/core-js": { - "version": "3.42.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.42.0.tgz", - "integrity": "sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==", + "version": "3.43.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.43.0.tgz", + "integrity": "sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==", "hasInstallScript": true, "license": "MIT", "funding": { diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 59f156e..f5fe38b 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -21,7 +21,7 @@ "dependencies": { "babel-polyfill": "^6.26.0", "concurrently": "^7.2.0", - "core-js": "^3.42.0", + "core-js": "^3.43.0", "nhsuk-frontend": "^7.0.0", "node": "^22" }, From 871b86e3b8329748a668d2e76db5e2a11f1f8a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 04:27:36 +0000 Subject: [PATCH 06/21] Bump sass from 1.89.1 to 1.89.2 in /Auth/LearningHub.Nhs.Auth (#188) Bumps [sass](https://github.com/sass/dart-sass) from 1.89.1 to 1.89.2. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.89.1...1.89.2) --- updated-dependencies: - dependency-name: sass dependency-version: 1.89.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Auth/LearningHub.Nhs.Auth/package-lock.json | 8 ++++---- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/package-lock.json b/Auth/LearningHub.Nhs.Auth/package-lock.json index 869ff97..7111190 100644 --- a/Auth/LearningHub.Nhs.Auth/package-lock.json +++ b/Auth/LearningHub.Nhs.Auth/package-lock.json @@ -25,7 +25,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.89.1", + "sass": "^1.89.2", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.5.2", @@ -5997,9 +5997,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.89.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz", - "integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==", + "version": "1.89.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz", + "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index f5fe38b..ae20178 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -35,7 +35,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.89.1", + "sass": "^1.89.2", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.5.2", From 8e3adf09c4daeef5a2143b20b4ef7ee2d33e9763 Mon Sep 17 00:00:00 2001 From: binon Date: Thu, 12 Jun 2025 10:34:52 +0100 Subject: [PATCH 07/21] Update continuous-integration-workflow.yml --- .github/workflows/continuous-integration-workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index baa6759..3293c61 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -18,7 +18,9 @@ jobs: dotnet-version: 8.0.x - name: Add Azure artifact - run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text + run: | + dotnet nuget remove source LearningHubFeed || true + dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text - name: Use NuGet 5.8 uses: nuget/setup-nuget@v1 From 63a8b3e9c26679b8b59f115fbbcf91212e21f7a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 11:19:18 +0000 Subject: [PATCH 08/21] Bump AutoMapper and 19 others Bumps AutoMapper to 12.0.1, 14.0.0 Bumps AutoMapper.Extensions.Microsoft.DependencyInjection to 12.0.1 Bumps Azure.Extensions.AspNetCore.DataProtection.Blobs from 1.4.0 to 1.5.0 Bumps Azure.Extensions.AspNetCore.DataProtection.Keys from 1.3.0 to 1.6.0 Bumps Azure.Identity from 1.13.2 to 1.14.0 Bumps EntityFrameworkCore.Testing.Moq from 5.0.0 to 9.0.1 Bumps FluentValidation from 11.11.0 to 12.0.0 Bumps Microsoft.ApplicationInsights.AspNetCore from 2.22.0 to 2.23.0 Bumps Microsoft.AspNetCore.Authentication.JwtBearer from 6.0.0 to 7.0.0 Bumps Microsoft.AspNetCore.Authentication.OpenIdConnect from 6.0.0 to 7.0.0 Bumps Microsoft.AspNetCore.Mvc.NewtonsoftJson from 6.0.36 to 7.0.0 Bumps Microsoft.EntityFrameworkCore from 7.0.20 to 9.0.0 Bumps Microsoft.Extensions.Caching.StackExchangeRedis from 6.0.0 to 7.0.0 Bumps Microsoft.Extensions.Logging.Console from 6.0.0 to 7.0.0 Bumps Microsoft.NET.Test.Sdk from 17.12.0 to 17.14.1 Bumps Microsoft.TestPlatform.TestHost from 17.12.0 to 17.14.1 Bumps Microsoft.VisualStudio.Web.CodeGeneration.Design from 6.0.0 to 7.0.0 Bumps NLog.Web.AspNetCore from 4.15.0 to 5.5.0 Bumps Swashbuckle.AspNetCore from 7.2.0 to 9.0.1 Bumps xunit.runner.visualstudio from 3.0.1 to 3.1.1 --- updated-dependencies: - dependency-name: AutoMapper dependency-version: 14.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AutoMapper dependency-version: 12.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AutoMapper.Extensions.Microsoft.DependencyInjection dependency-version: 12.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: AutoMapper.Extensions.Microsoft.DependencyInjection dependency-version: 12.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Azure.Extensions.AspNetCore.DataProtection.Blobs dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Azure.Extensions.AspNetCore.DataProtection.Keys dependency-version: 1.6.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Azure.Identity dependency-version: 1.14.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: EntityFrameworkCore.Testing.Moq dependency-version: 9.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: FluentValidation dependency-version: 12.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.ApplicationInsights.AspNetCore dependency-version: 2.23.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.OpenIdConnect dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Caching.StackExchangeRedis dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Console dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.NET.Test.Sdk dependency-version: 17.14.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.TestPlatform.TestHost dependency-version: 17.14.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.VisualStudio.Web.CodeGeneration.Design dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: NLog.Web.AspNetCore dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Swashbuckle.AspNetCore dependency-version: 9.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: xunit.runner.visualstudio dependency-version: 3.1.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c94d0a7..9b09313 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,38 +12,38 @@ - - - - - + + + + + - - + + - - - - - + + + + + - - - - - + + + + + - + - + - + \ No newline at end of file From 43de1f08c7f7535f39721346a1185b89c78bf61e Mon Sep 17 00:00:00 2001 From: Binon Date: Tue, 17 Jun 2025 12:41:33 +0100 Subject: [PATCH 09/21] upgrading database proj version --- Hee.UserProfile.Database/Hee.UserProfile.Database.sqlproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hee.UserProfile.Database/Hee.UserProfile.Database.sqlproj b/Hee.UserProfile.Database/Hee.UserProfile.Database.sqlproj index b8cf3b5..df6c02e 100644 --- a/Hee.UserProfile.Database/Hee.UserProfile.Database.sqlproj +++ b/Hee.UserProfile.Database/Hee.UserProfile.Database.sqlproj @@ -16,7 +16,7 @@ 1033, CI BySchemaAndSchemaType True - v4.5.2 + v4.8 CS Properties False From 6662c0156fd42df793b0e0695808d8ab3e1e94e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:09:10 +0000 Subject: [PATCH 10/21] Bump AutoMapper and 7 others Bumps AutoMapper from 12.0.1 to 14.0.0 Bumps Microsoft.AspNetCore.Authentication.JwtBearer from 7.0.0 to 8.0.17 Bumps Microsoft.AspNetCore.Authentication.OpenIdConnect from 7.0.0 to 8.0.17 Bumps Microsoft.AspNetCore.Mvc.NewtonsoftJson from 7.0.0 to 8.0.17 Bumps Microsoft.EntityFrameworkCore.SqlServer from 7.0.0 to 9.0.0 Bumps Microsoft.Extensions.Caching.StackExchangeRedis from 7.0.0 to 9.0.0 Bumps Microsoft.Extensions.Logging.Console from 7.0.0 to 9.0.0 Bumps Microsoft.VisualStudio.Web.CodeGeneration.Design from 7.0.0 to 9.0.0 --- updated-dependencies: - dependency-name: AutoMapper dependency-version: 14.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-version: 8.0.17 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Authentication.OpenIdConnect dependency-version: 8.0.17 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson dependency-version: 8.0.17 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore.SqlServer dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Caching.StackExchangeRedis dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Console dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.VisualStudio.Web.CodeGeneration.Design dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9b09313..3aad9eb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -24,17 +24,17 @@ - - - + + + - + - - + + - + From 7de18dead7f7a359ef4fb9d42a7c93b3b34799dd Mon Sep 17 00:00:00 2001 From: Binon Date: Tue, 17 Jun 2025 15:30:18 +0100 Subject: [PATCH 11/21] Adding solution file --- LearningHub.Nhs.UserApi.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi.sln b/LearningHub.Nhs.UserApi.sln index 9775d9c..77a9165 100644 --- a/LearningHub.Nhs.UserApi.sln +++ b/LearningHub.Nhs.UserApi.sln @@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props Directory.Packages.props = Directory.Packages.props - nuget.config = nuget.config StyleCop.json = StyleCop.json StyleCop.ruleset = StyleCop.ruleset EndProjectSection From c60993318351a1a6bef70f70ac02cc1d62081944 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:39:34 +0000 Subject: [PATCH 12/21] Bump AutoMapper and 4 others Bumps AutoMapper from 12.0.1 to 14.0.0 Bumps Microsoft.EntityFrameworkCore from 9.0.0 to 9.0.6 Bumps Microsoft.EntityFrameworkCore.SqlServer from 9.0.0 to 9.0.6 Bumps Microsoft.Extensions.Caching.StackExchangeRedis from 9.0.0 to 9.0.6 Bumps Microsoft.Extensions.Logging.Console from 9.0.0 to 9.0.6 --- updated-dependencies: - dependency-name: AutoMapper dependency-version: 14.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 9.0.6 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.EntityFrameworkCore.SqlServer dependency-version: 9.0.6 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Caching.StackExchangeRedis dependency-version: 9.0.6 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Console dependency-version: 9.0.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3aad9eb..b18204b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -27,11 +27,11 @@ - - + + - - + + From 9b0e3e7d0918104da74220c85009216735883852 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Wed, 18 Jun 2025 10:07:05 +0100 Subject: [PATCH 13/21] Update Directory.Packages.props -Automapper --- Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b18204b..66aac1b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,8 +12,8 @@ - - + + @@ -46,4 +46,4 @@ - \ No newline at end of file + From f56f1bdd04f2c8ba3d8f191dbfab03b40df31623 Mon Sep 17 00:00:00 2001 From: Colin Beeby Date: Wed, 18 Jun 2025 11:50:19 +0100 Subject: [PATCH 14/21] Added client config section for moodlepgvle --- Auth/LearningHub.Nhs.Auth/appsettings.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Auth/LearningHub.Nhs.Auth/appsettings.json b/Auth/LearningHub.Nhs.Auth/appsettings.json index f4daca9..533cb08 100644 --- a/Auth/LearningHub.Nhs.Auth/appsettings.json +++ b/Auth/LearningHub.Nhs.Auth/appsettings.json @@ -203,6 +203,23 @@ "RequireConsent": false, "RequirePkce": false, "AllowOfflineAccess": true + }, + "moodlepgvle": { + "BaseUrl": "", + "ClientName": "", + "ClientSecret": "", + "AllowedGrantTypes": [ "authorization_code" ], + "RedirectUris": [ "/auth/oidc/" ], + "PostLogoutUris": [ "/login/logout.php" ], + "AllowedScopes": [ "openid", "profile", "learninghubapi", "userapi", "roles", "learningcredentialsapi" ], + "BackChannelLogoutSessionRequired": true, + "BackChannelLogoutUri": "/login/logout.php", + "FrontChannelLogoutSessionRequired": true, + "FrontChannelLogoutUri": "/login/logout.php", + "UpdateAccessTokenClaimsOnRefresh": true, + "RequireConsent": false, + "RequirePkce": false, + "AllowOfflineAccess": true } }, "IdsClients": { From d9e214f8950cfed99ad55c9014abf3ad5f76fb57 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Wed, 2 Jul 2025 10:08:42 +0100 Subject: [PATCH 15/21] Revert "Automatic version update dependabot To RC" --- Auth/LearningHub.Nhs.Auth/package-lock.json | 34 ++++++++++----------- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/package-lock.json b/Auth/LearningHub.Nhs.Auth/package-lock.json index 8b81771..7111190 100644 --- a/Auth/LearningHub.Nhs.Auth/package-lock.json +++ b/Auth/LearningHub.Nhs.Auth/package-lock.json @@ -16,7 +16,7 @@ "node": "^22" }, "devDependencies": { - "@babel/core": "^7.27.4", + "@babel/core": "^7.27.3", "@babel/preset-env": "^7.27.2", "babel-core": "^4.7.16", "babel-loader": "^8.2.2", @@ -74,9 +74,9 @@ } }, "node_modules/@babel/core": { - "version": "7.27.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.4.tgz", - "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.3.tgz", + "integrity": "sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==", "dev": true, "license": "MIT", "dependencies": { @@ -85,10 +85,10 @@ "@babel/generator": "^7.27.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", - "@babel/helpers": "^7.27.4", - "@babel/parser": "^7.27.4", + "@babel/helpers": "^7.27.3", + "@babel/parser": "^7.27.3", "@babel/template": "^7.27.2", - "@babel/traverse": "^7.27.4", + "@babel/traverse": "^7.27.3", "@babel/types": "^7.27.3", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -371,9 +371,9 @@ } }, "node_modules/@babel/helpers": { - "version": "7.27.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.4.tgz", - "integrity": "sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.3.tgz", + "integrity": "sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==", "dev": true, "license": "MIT", "dependencies": { @@ -385,9 +385,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.27.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.4.tgz", - "integrity": "sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.3.tgz", + "integrity": "sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==", "dev": true, "license": "MIT", "dependencies": { @@ -1506,15 +1506,15 @@ } }, "node_modules/@babel/traverse": { - "version": "7.27.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz", - "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.3.tgz", + "integrity": "sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.3", - "@babel/parser": "^7.27.4", + "@babel/parser": "^7.27.3", "@babel/template": "^7.27.2", "@babel/types": "^7.27.3", "debug": "^4.3.1", diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 75d6761..ae20178 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -26,7 +26,7 @@ "node": "^22" }, "devDependencies": { - "@babel/core": "^7.27.4", + "@babel/core": "^7.27.3", "@babel/preset-env": "^7.27.2", "babel-core": "^4.7.16", "babel-loader": "^8.2.2", From 0b2189b74d82ec161d373c957be12962afb023ad Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Wed, 2 Jul 2025 15:46:18 +0100 Subject: [PATCH 16/21] Fixes --- .../LearningHub.Nhs.Auth.Tests.csproj | 27 +- .../LearningHub.Nhs.Auth.csproj | 278 +++++++++--------- Directory.Build.props | 2 +- Directory.Packages.props | 2 +- ...ub.Nhs.UserApi.Repository.Interface.csproj | 16 +- .../LearningHub.Nhs.UserApi.Repository.csproj | 20 +- ...gHub.Nhs.UserAPI.Services.Interface.csproj | 16 +- ...gHub.Nhs.UserApi.Services.UnitTests.csproj | 34 ++- .../LearningHub.Nhs.UserApi.Services.csproj | 21 +- .../LearningHub.Nhs.UserApi.Shared.csproj | 15 +- .../LearningHub.Nhs.UserApi.UnitTests.csproj | 27 +- .../LearningHub.Nhs.UserApi.csproj | 40 +-- 12 files changed, 273 insertions(+), 225 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj index 4544d37..ec6d6ad 100644 --- a/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj +++ b/Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj @@ -1,27 +1,32 @@ - + + net8.0 true false - x64 + x64 + + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - \ No newline at end of file + + diff --git a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj index 8fe3ee6..2933aee 100644 --- a/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj +++ b/Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj @@ -1,133 +1,145 @@ - - - net8.0 - 00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E - true - x64 - - - - - - - - - - - - - - - - - - - - - - - Never - - - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - true - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - Always - - - Always - - - - - - - - - - - \ No newline at end of file + + + + net8.0 + 00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E + true + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + Never + + + + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + Always + + + Always + + + + + + + + + + + + + + diff --git a/Directory.Build.props b/Directory.Build.props index d153dde..041b430 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ $(SolutionDir)StyleCop.ruleset - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 66aac1b..305229f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,7 +1,7 @@ - true + false 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 index 60f0b5d..29a3a90 100644 --- a/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj +++ b/LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj @@ -1,19 +1,23 @@ - + + net8.0 true false - x64 + x64 + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - \ No newline at end of file + + diff --git a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj index 7d254b8..5921669 100644 --- a/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj +++ b/LearningHub.Nhs.UserApi.Repository/LearningHub.Nhs.UserApi.Repository.csproj @@ -1,21 +1,25 @@ - + + net8.0 true false - x64 + x64 + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - \ No newline at end of file + + 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 index 60f0b5d..29a3a90 100644 --- a/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj +++ b/LearningHub.Nhs.UserApi.Services.Interface/LearningHub.Nhs.UserAPI.Services.Interface.csproj @@ -1,19 +1,23 @@ - + + net8.0 true false - x64 + x64 + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - \ No newline at end of file + + 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 index 2bcf2e7..a61a661 100644 --- a/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.Services.UnitTests/LearningHub.Nhs.UserApi.Services.UnitTests.csproj @@ -1,33 +1,37 @@ - + + net8.0 - true + true enable enable - x64 + x64 false + - - - - - - - - - - + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all + - \ No newline at end of file + + diff --git a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj index a81d32a..670491b 100644 --- a/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj +++ b/LearningHub.Nhs.UserApi.Services/LearningHub.Nhs.UserApi.Services.csproj @@ -1,24 +1,27 @@ - + + net8.0 true false - x64 + x64 + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + - \ No newline at end of file + diff --git a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj index 04b48b4..ecfe311 100644 --- a/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj +++ b/LearningHub.Nhs.UserApi.Shared/LearningHub.Nhs.UserApi.Shared.csproj @@ -1,16 +1,19 @@ - + + net8.0 true false - x64 + x64 + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - \ No newline at end of file + + diff --git a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj index 4eb125a..5c215c5 100644 --- a/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj +++ b/LearningHub.Nhs.UserApi.UnitTests/LearningHub.Nhs.UserApi.UnitTests.csproj @@ -1,32 +1,37 @@ - + + net8.0 - true + true enable enable - x64 + x64 false + - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all + + - \ No newline at end of file + + diff --git a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj index f98d757..c707f5a 100644 --- a/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj +++ b/LearningHub.Nhs.UserApi/LearningHub.Nhs.UserApi.csproj @@ -1,37 +1,43 @@ - + + net8.0 InProcess true - x64 + x64 + LearningHub.Nhs.UserApi.xml + + Always + - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + @@ -39,14 +45,12 @@ + Never - - - - - + + \ No newline at end of file From 3193e5a9d83f6da45dd015da5d2bb60975e9fef7 Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Mon, 14 Jul 2025 16:30:07 +0100 Subject: [PATCH 17/21] TD-5752: Issue showing 'Your password has been changed' when logged out from the moodle screen --- .../LearningHub.Nhs.Auth/Controllers/HomeController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs b/Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs index aa0937f..9d1ae11 100644 --- a/Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs +++ b/Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs @@ -83,18 +83,18 @@ public async Task Error() /// /// IsPasswordUpdateMethod. /// - /// The Logout. + /// The PasswordUpdate. /// The . [HttpGet] - public IActionResult SetIsPasswordUpdate(bool isLogout) + public IActionResult SetIsPasswordUpdate(bool isPasswordUpdate) { - if (isLogout) + if (isPasswordUpdate) { - this.webSettings.IsPasswordUpdate = false; + this.webSettings.IsPasswordUpdate = true; } else { - this.webSettings.IsPasswordUpdate = true; + this.webSettings.IsPasswordUpdate = false; } var redirectUri = $"{this.webSettings.LearningHubWebClient}Home/UserLogout"; From de78ea15cea4666cfefa1f9d1448c57bae64ac90 Mon Sep 17 00:00:00 2001 From: Colin Beeby Date: Wed, 16 Jul 2025 14:52:53 +0100 Subject: [PATCH 18/21] Added moodlemooc stanza to appsettings.json --- Auth/LearningHub.Nhs.Auth/appsettings.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Auth/LearningHub.Nhs.Auth/appsettings.json b/Auth/LearningHub.Nhs.Auth/appsettings.json index 533cb08..8f45884 100644 --- a/Auth/LearningHub.Nhs.Auth/appsettings.json +++ b/Auth/LearningHub.Nhs.Auth/appsettings.json @@ -220,6 +220,23 @@ "RequireConsent": false, "RequirePkce": false, "AllowOfflineAccess": true + }, + "moodlemooc": { + "BaseUrl": "", + "ClientName": "", + "ClientSecret": "", + "AllowedGrantTypes": [ "authorization_code" ], + "RedirectUris": [ "/auth/oidc/" ], + "PostLogoutUris": [ "/login/logout.php" ], + "AllowedScopes": [ "openid", "profile", "learninghubapi", "userapi", "roles", "learningcredentialsapi" ], + "BackChannelLogoutSessionRequired": true, + "BackChannelLogoutUri": "/login/logout.php", + "FrontChannelLogoutSessionRequired": true, + "FrontChannelLogoutUri": "/login/logout.php", + "UpdateAccessTokenClaimsOnRefresh": true, + "RequireConsent": false, + "RequirePkce": false, + "AllowOfflineAccess": true } }, "IdsClients": { From 24d65226518bc8b6b7893452da25c87e1fdd631d Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Wed, 23 Jul 2025 11:17:33 +0100 Subject: [PATCH 19/21] TD-5752: # Need to revert the code # Code to test the logout issue from Moodle --- Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs b/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs index 123fe1a..3018203 100644 --- a/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs +++ b/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs @@ -277,7 +277,7 @@ public async Task Logout(LogoutInputModel model) { UserId = userId, UserHistoryTypeId = (int)UserHistoryType.Logout, - Detail = @"User logged out", + Detail = @"User logged out" + this.webSettings.IsPasswordUpdate + " " + vm.TriggerExternalSignout, }; await this.UserService.StoreUserHistoryAsync(userHistory); From b58df6a988fa0f5bb531454326dfa992c3d83be7 Mon Sep 17 00:00:00 2001 From: Frank C <115793157+frank-hee@users.noreply.github.com> Date: Thu, 31 Jul 2025 14:26:11 +0100 Subject: [PATCH 20/21] consolidate .nhsuk overrides into new scss file --- .../Styles/nhsuk/common.scss | 157 --------- .../{layout.scss => nhsuk-overrides.scss} | 299 ++++++++++++++---- .../Views/Shared/LearningHub/_Layout.cshtml | 2 +- .../Views/Shared/_SsoLayout.cshtml | 2 +- 4 files changed, 245 insertions(+), 215 deletions(-) rename Auth/LearningHub.Nhs.Auth/Styles/nhsuk/{layout.scss => nhsuk-overrides.scss} (66%) diff --git a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss index ed13eb8..c256ae6 100644 --- a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss +++ b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss @@ -1,80 +1,4 @@ @use "../abstracts/all" as *; -@use "nhsuk" as *; - -.nhsuk-u-font-style-italic { - font-style: italic; -} - -.nhsuk-button--red { - background-color: $nhsuk-red !important; - - &:hover { - background-color: $nhsuk-red-hover !important; - border-color: $nhsuk-red-hover !important; - } -} - -.nhsuk-button--beta-login { - background-color: $nhsuk-blue; - box-shadow: 0 4px 0 #002f5c; -} - -.nhsuk-button--beta-login:hover { - background-color: $nhsuk-btn-blue-hover; -} - -// By default, the text on reverse (white) buttons turns white once clicked, rendering them invisible. -.nhsuk-button--reverse:visited { - color: $nhsuk-black -} - -.nhsuk-back-link { - padding: px2rem(20) 0; - margin-bottom: 0; -} - -.nhsuk-radios__divider { - text-align: left; - width: unset; -} - -.nhsuk-radios__item label { - font-family: $font-stack; -} - -/* Conditional radio buttons - Note: The nhsuk-radios__conditional element needs to be a SIBLING of the radio button input element - otherwise the CSS selector won't work. See Views/Bookmark/Move.cshtml for a usage example. - The NHSUK component (nhsuk-radios__conditional) requires JavaScript to work. These tweaks allow it to work without. -*/ -.nhsuk-radios__conditional { - display: none; - margin-left: -22px; - margin-top: 8px; -} - -.nhsuk-radios__input:checked ~ .nhsuk-radios__conditional { - display: block !important; -} - -/* jquery unbobtrusive validation style over */ -.nhsuk-error-summary__list li { - color: $nhsuk-red; -} - -.nhsuk-form-group.input-validation-error { - @extend .nhsuk-form-group--error; -} - -.nhsuk-input.input-validation-error { - @extend .nhsuk-input--error -} - -.nhsuk-input:focus { - border: 2px solid #212b32; - box-shadow: inset 0 0 0 2px; - outline: 4px solid #ffeb3b; /* 1 */ - outline-offset: 0; -} .display--hide { display: none !important; @@ -119,81 +43,6 @@ display: block !important; } - -.nhsuk-bg-light-blue { - background-color: $nhsuk-light-blue-color; -} - -.nhsuk-bg-pale-blue { - background-color: $nhsuk-pale-blue-color; -} - -.nhsuk-bg-white { - background-color: $color_nhsuk-white; -} - -.nhsuk-width-container.search-width-container { - max-width: px2rem(752); - margin: 0 auto; - padding-left: px2rem(68); - padding-right: px2rem(68); -} - -/* One third column layout that switches to full width at the small desktop breakpoint (990px) instead of mobile. */ -.nhsuk-grid-column-one-third-small-desktop { - @extend .nhsuk-grid-column-one-third; - width: 33.3333333333% !important; - - @media (max-width: px2rem(990)) { - width: 100% !important; - } -} - - -/* Tweaks to styling for single card view. */ -@media(min-width: 768px) and (max-width: 990px) { - .nhsuk-card-group .nhsuk-grid-column-one-third-small-desktop { - max-width: 600px !important; - } - - .nhsuk-card-group--centred { - justify-content: center !important; - } -} - -.nhsuk-card-banner-container { - padding-bottom: 42.86%; - position: relative; -} - -.nhsuk-card-banner { - height: 100%; - object-fit: cover; - object-position: left; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - -.nhsuk-card-banner-empty { - background-color: $nhsuk-pale-blue-color; - border-bottom: 1px solid #d8dde0; -} - -.nhsuk-error-message.error-message--margin-bottom-1 { - margin-bottom: nhsuk-spacing(1); -} - -.nhsuk-u-margin-bottom-2point5 { - margin-bottom: 12px; - - @media(max-width: 641px) { - margin-bottom: 10px; - } -} - .word-break__break-word { word-break: break-word; } @@ -203,12 +52,6 @@ justify-content: space-between; } -.nhsuk-button--no-shrink { - white-space: nowrap; - margin-top: auto !important; - margin-bottom: auto !important; -} - .modal-footer--buttons { justify-content: space-between !important; padding-left: 16px !important; diff --git a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/layout.scss b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss similarity index 66% rename from Auth/LearningHub.Nhs.Auth/Styles/nhsuk/layout.scss rename to Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss index 50b3c2b..d97f0f3 100644 --- a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/layout.scss +++ b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss @@ -1,34 +1,175 @@ @use "../abstracts/all" as *; @use "nhsuk" as *; -.nhsuk-header { - padding: 0 px2rem(32); +// Overrides due to +// - specific element updates (listed first) +// - Highly customised header +// - Beta banner +// - Footer padding update +// +// Header customisation not needed with current frontend package +// +// - FGC 31/07/25 + +.nhsuk-u-font-style-italic { + font-style: italic; } -.nhsuk-width-container.app-width-container { - max-width: px2rem(1208); - margin: 0 auto; - padding-left: px2rem(32); - padding-right: px2rem(32); +.nhsuk-button--red { + background-color: $nhsuk-red !important; + + &:hover { + background-color: $nhsuk-red-hover !important; + border-color: $nhsuk-red-hover !important; + } } -.nhsuk-header .nhsuk-width-container.app-width-container { - max-width: px2rem(1144); - margin: 0 auto; +.nhsuk-button--beta-login { + background-color: $nhsuk-blue; + box-shadow: 0 4px 0 #002f5c; } -.nhsuk-width-container.app-width-container.beta-banner { - padding: px2rem(8) px2rem(32); - max-width: px2rem(1208); +.nhsuk-button--beta-login:hover { + background-color: $nhsuk-btn-blue-hover; +} + +// By default, the text on reverse (white) buttons turns white once clicked, rendering them invisible. +.nhsuk-button--reverse:visited { + color: $nhsuk-black +} + +.nhsuk-back-link { + padding: px2rem(20) 0; + margin-bottom: 0; +} + +.nhsuk-radios__divider { + text-align: left; + width: unset; +} + +.nhsuk-radios__item label { + font-family: $font-stack; +} + +/* Conditional radio buttons - Note: The nhsuk-radios__conditional element needs to be a SIBLING of the radio button input element + otherwise the CSS selector won't work. See Views/Bookmark/Move.cshtml for a usage example. + The NHSUK component (nhsuk-radios__conditional) requires JavaScript to work. These tweaks allow it to work without. +*/ +.nhsuk-radios__conditional { + display: none; + margin-left: -22px; + margin-top: 8px; +} + +.nhsuk-radios__input:checked ~ .nhsuk-radios__conditional { + display: block !important; +} + +/* jquery unbobtrusive validation style over */ +.nhsuk-error-summary__list li { + color: $nhsuk-red; +} + +.nhsuk-form-group.input-validation-error { + @extend .nhsuk-form-group--error; +} + +.nhsuk-input.input-validation-error { + @extend .nhsuk-input--error +} + +.nhsuk-input:focus { + border: 2px solid #212b32; + box-shadow: inset 0 0 0 2px; + outline: 4px solid #ffeb3b; /* 1 */ + outline-offset: 0; +} + +.nhsuk-bg-light-blue { + background-color: $nhsuk-light-blue-color; +} + +.nhsuk-bg-pale-blue { + background-color: $nhsuk-pale-blue-color; +} + +.nhsuk-bg-white { + background-color: $color_nhsuk-white; +} + +.nhsuk-width-container.search-width-container { + max-width: px2rem(752); margin: 0 auto; + padding-left: px2rem(68); + padding-right: px2rem(68); } -.nhsuk-header .nhsuk-header__container::after { - content: none; +/* One third column layout that switches to full width at the small desktop breakpoint (990px) instead of mobile. */ +.nhsuk-grid-column-one-third-small-desktop { + @extend .nhsuk-grid-column-one-third; + width: 33.3333333333% !important; + + @media (max-width: px2rem(990)) { + width: 100% !important; + } } -.nhsuk-header__navigation.app-width-container { - max-width: px2rem(1144); +/* Tweaks to styling for single card view. */ +@media(min-width: 768px) and (max-width: 990px) { + .nhsuk-card-group .nhsuk-grid-column-one-third-small-desktop { + max-width: 600px !important; + } + + .nhsuk-card-group--centred { + justify-content: center !important; + } +} + +.nhsuk-card-banner-container { + padding-bottom: 42.86%; + position: relative; +} + +.nhsuk-card-banner { + height: 100%; + object-fit: cover; + object-position: left; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +.nhsuk-card-banner-empty { + background-color: $nhsuk-pale-blue-color; + border-bottom: 1px solid #d8dde0; +} + +.nhsuk-error-message.error-message--margin-bottom-1 { + margin-bottom: nhsuk-spacing(1); +} + +.nhsuk-u-margin-bottom-2point5 { + margin-bottom: 12px; + + @media(max-width: 641px) { + margin-bottom: 10px; + } +} + +.nhsuk-button--no-shrink { + white-space: nowrap; + margin-top: auto !important; + margin-bottom: auto !important; +} + +.nhsuk-width-container.app-width-container { + max-width: px2rem(1208); + margin: 0 auto; + padding-left: px2rem(32); + padding-right: px2rem(32); } .app-width-container--full { @@ -40,6 +181,27 @@ padding: 0 } +// +// Header updates start here +// + +.nhsuk-header { + padding: 0 px2rem(32); +} + +.nhsuk-header .nhsuk-width-container.app-width-container { + max-width: px2rem(1144); + margin: 0 auto; +} + +.nhsuk-header .nhsuk-header__container::after { + content: none; +} + +.nhsuk-header__navigation.app-width-container { + max-width: px2rem(1144); +} + .nhsuk-header__container.app-width-container { display: flex; justify-content: space-between; @@ -58,8 +220,8 @@ flex: 1 0 0; } -.nhsuk-header__logo .nhsuk-header__link--service { - display:inline-flex; +.nhsuk-header__logo .nhsuk-header__link--service { + display: inline-flex; } .nhsuk-header__service-name { @@ -90,7 +252,7 @@ height: px2rem(18); text-align: center; border-radius: px2rem(9); - padding:px2rem(1) px2rem(3) 0; + padding: px2rem(1) px2rem(3) 0; } .nhsuk-header__menu { @@ -107,6 +269,47 @@ color: #fff; } +#header-dropdown-menu-control { + opacity: 0; + position: absolute; +} + +#header-dropdown-menu-control:checked ~ .nhsuk-header__navigation:not(.js-show) { + display: block +} + +#header-mobile-search-control { + display: none; +} + +.nhsuk-header__break { + display: none; +} + +.nhsuk-header__mobile-only-nav { + display: none; +} + +.nhsuk-header__mobile-break { + display: none; +} + +.nhsuk-header__navigation-item--current { + a { + font-weight: bold; + } +} + +.nhsuk-width-container.app-width-container.beta-banner { + padding: px2rem(8) px2rem(32); + max-width: px2rem(1208); + margin: 0 auto; +} + +// +// Beta banner updates +// + .beta-banner { background-color: $color_nhsuk-grey-5; color: $nhsuk-text-color; @@ -118,7 +321,7 @@ } .beta-banner + div { - border-top:1px solid $color_nhsuk-grey-3; + border-top: 1px solid $color_nhsuk-grey-3; } .beta-banner__beta-box { @@ -137,48 +340,28 @@ font-size: px2rem(16); } +// +// Footer updates +// + .nhsuk-footer { padding: px2rem(48) 0; } - -#header-dropdown-menu-control { - opacity: 0; - position: absolute; -} - -#header-dropdown-menu-control:checked ~ .nhsuk-header__navigation:not(.js-show) { - display: block -} - -#header-mobile-search-control { - display: none; -} - -.nhsuk-header__break { - display: none; -} - -.nhsuk-header__mobile-only-nav { - display: none; -} - -.nhsuk-header__mobile-break { - display: none; -} - -.nhsuk-header__navigation-item--current { - a { - font-weight: bold; - } -} .nhsuk-footer__copyright { float: left; text-align: left; } + +// +// Responsive updates +// + /* large desktop */ @media (min-width: px2rem(990)) { + // entirely headers + .nhsuk-header__navigation-item--current a { border-bottom: 4px solid $nhsuk-grey-lighter; font-weight: normal; @@ -196,6 +379,8 @@ /* small desktop */ @media (max-width: px2rem(989)) { + // entirely headers + .nhsuk-header__container { flex-wrap: wrap; } @@ -261,7 +446,7 @@ text-align: center; margin: 0; right: 0; - font-weight:600; + font-weight: 600; } .nhsuk-header__search-form { @@ -286,7 +471,7 @@ background: $nhsuk-error-color; color: $nhsuk-white; min-width: px2rem(18); - width:fit-content; + width: fit-content; height: px2rem(18); text-align: center; border-radius: px2rem(9); @@ -326,12 +511,14 @@ /* mobile */ @media (max-width: px2rem(640)) { + //entirely headers + .nhsuk-header__not-mobile { display: none; } .nhsuk-header__logo { - max-width:none; + max-width: none; } .nhsuk-header__mobile-only-nav { @@ -391,7 +578,7 @@ } .nhsuk-header__search .nhsuk-search__submit { - padding-top:nhsuk-spacing(1); + padding-top: nhsuk-spacing(1); } .nhsuk-header__menu { diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml index 880d880..ce37bda 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml @@ -20,7 +20,7 @@ - + diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/_SsoLayout.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/_SsoLayout.cshtml index 513a6fd..559ee2a 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/_SsoLayout.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/_SsoLayout.cshtml @@ -14,7 +14,7 @@ @ViewData["Title"] - Learning Hub Authentication - + From 98f85e4141e3e9b6da77c73785f26c67c67d67b5 Mon Sep 17 00:00:00 2001 From: Frank C <115793157+frank-hee@users.noreply.github.com> Date: Thu, 31 Jul 2025 14:33:19 +0100 Subject: [PATCH 21/21] auto formatting new code --- Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss | 3 ++- Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss index c256ae6..5b87bdf 100644 --- a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss +++ b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss @@ -60,10 +60,11 @@ margin-top: auto !important; margin-bottom: auto !important; } + .validation-summary-valid { display: none; } .field-validation-valid { display: none !important; -} \ No newline at end of file +} diff --git a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss index d97f0f3..a048c03 100644 --- a/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss +++ b/Auth/LearningHub.Nhs.Auth/Styles/nhsuk/nhsuk-overrides.scss @@ -606,4 +606,4 @@ .nhsuk-width-container.nhsuk-header__container.app-width-container { padding-bottom: 0; } -} \ No newline at end of file +}