Merge latest RC changes to Messaging Service

.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  

Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj

@@ -9,8 +9,8 @@
 
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.13" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />

Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs

@@ -277,7 +277,7 @@ public async Task<IActionResult> 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);

Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs

@@ -83,18 +83,18 @@ public async Task<IActionResult> Error()
         /// <summary>
         /// IsPasswordUpdateMethod.
         /// </summary>
-        /// <param name="isLogout">The Logout.</param>
+        /// <param name="isPasswordUpdate">The PasswordUpdate.</param>
         /// <returns>The <see cref="ActionResult"/>.</returns>
         [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";

Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj

@@ -101,12 +101,12 @@
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.4.0" />
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.3.0" />
 		<PackageReference Include="Azure.Identity" Version="1.13.2" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="IdentityServer4" Version="4.1.2" />
 		<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.49" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.13" />
 		<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" />

Auth/LearningHub.Nhs.Auth/Program.cs

@@ -34,6 +34,21 @@
         .AllowAnyHeader());
 });
 
+string moodleInstanceBridgeOrigin = builder.Configuration.GetValue<string>("LearningHubAuthConfig:AuthClients:moodleinstancebridge:BaseUrl");
+
+builder.Services.AddCors(options =>
+{
+    options.AddPolicy("CorsPolicy", policy =>
+    {
+        policy.WithOrigins(
+                corsOriginUrl,
+                moodleInstanceBridgeOrigin)
+            .AllowAnyHeader()
+            .AllowAnyMethod()
+            .AllowCredentials();
+    });
+});
+
 builder.Services.ConfigureServices(builder.Configuration, builder.Environment);
 
 GlobalDiagnosticsContext.Set("connectionString", builder.Configuration.GetSection("ASPNETCORE_ConnectionStrings")["NLogDb"]);

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;
@@ -217,10 +60,11 @@
     margin-top: auto !important;
     margin-bottom: auto !important;
 }
+
 .validation-summary-valid {
     display: none;
 }
 
 .field-validation-valid {
     display: none !important;
-}
+}