TD-3730: error Screen modified

Author: Swapnamol

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

@@ -15,13 +15,13 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models;
-    using Microsoft.ApplicationInsights.AspNetCore;
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Authentication.Cookies;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Diagnostics;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Microsoft.FeatureManagement;
@@ -39,6 +39,7 @@ public class HomeController : BaseController
         private readonly IDashboardService dashboardService;
         private readonly IContentService contentService;
         private readonly IFeatureManager featureManager;
+        private readonly Microsoft.Extensions.Configuration.IConfiguration configuration;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HomeController"/> class.
@@ -53,6 +54,7 @@ public class HomeController : BaseController
         /// <param name="dashboardService">Dashboard service.</param>
         /// <param name="contentService">Content service.</param>
         /// <param name="featureManager"> featureManager.</param>
+        /// <param name="configuration"> config.</param>
         public HomeController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -63,7 +65,8 @@ public HomeController(
             LearningHubAuthServiceConfig authConfig,
             IDashboardService dashboardService,
             IContentService contentService,
-            IFeatureManager featureManager)
+            IFeatureManager featureManager,
+            Microsoft.Extensions.Configuration.IConfiguration configuration)
         : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
         {
             this.authConfig = authConfig;
@@ -72,6 +75,7 @@ public HomeController(
             this.dashboardService = dashboardService;
             this.contentService = contentService;
             this.featureManager = featureManager;
+            this.configuration = configuration;
         }
 
         /// <summary>
@@ -168,6 +172,9 @@ public IActionResult Error(int? httpStatusCode)
             {
                 if (originalPath == "/TooManyRequests")
                 {
+                    this.ViewBag.Period = this.configuration["IpRateLimiting:GeneralRules:0:Period"];
+                    this.ViewBag.Limit = this.configuration["IpRateLimiting:GeneralRules:0:Limit"];
+
                     return this.View("TooManyRequests");
                 }
                 else

LearningHub.Nhs.WebUI/Views/Shared/TooManyRequests.cshtml

@@ -1,13 +1,20 @@
 @{
-    ViewData["Title"] = "Too many requests";
+    ViewData["Title"] = "Reset limit reached";
+    // Get the value from ViewBag
+    var period = ViewBag.Period.ToString();
+    
+    // Remove the last character (if the string is not empty)
+    if (!string.IsNullOrEmpty(period) && period.Length > 0)
+    {
+        period = period.Substring(0, period.Length - 1);
+    }
 }
 <div class="bg-white">
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-full nhsuk-u-padding-top-9 nhsuk-u-padding-bottom-7">
                 <h1 class="nhsuk-heading-xl"> @ViewData["Title"]</h1>
-                <p>Too many requests have been made.</p>
-                <p>If you need help, please contact the <a href="@ViewBag.SupportFormUrl" target="_blank">support team</a>.</p>
+                <p>You've requested the maximum number of password resets (@ViewBag.Limit). Please wait @period minutes before trying again or contact the <a href="@ViewBag.SupportFormUrl" target="_blank">support team</a>.</p>
                 <p>@DateTimeOffset.Now.ToString("d MMMM yyyy HH:mm:ss")</p>
             </div>
         </div>