Ref: Urgent Link change to Gateway Hostname, for reset password

gigabooksite · Jan 22, 2024 · aa18788 · aa18788
1 parent e682f13
commit aa18788
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/WebApp/backend/QuizMaster.API.Account/Configuration/ApplicationSettings.cs b/WebApp/backend/QuizMaster.API.Account/Configuration/ApplicationSettings.cs
@@ -8,5 +8,6 @@ public class ApplicationSettings
         public string RabbitMq_Hostname { get; set; }
         public string SMTP_EMAIL { get; set; }
         public string SMTP_PASSWORD { get; set; }
+        public string GatewayHost { get; set; }
     }
 }
diff --git a/WebApp/backend/QuizMaster.API.Account/Service/EmailSenderService.cs b/WebApp/backend/QuizMaster.API.Account/Service/EmailSenderService.cs
@@ -52,7 +52,7 @@ password. Click the button below to reset your password.
             cursor: pointer;
             text-decoration: none;
           ""
-          href='https://localhost:7081/gateway/api/account/update_password/{token}'
+          href='{_settings.GatewayHost}/gateway/api/account/update_password/{token}'
         >
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Confirm Reset
           Password&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

diff --git a/WebApp/backend/QuizMaster.API.Account/appsettings.json b/WebApp/backend/QuizMaster.API.Account/appsettings.json
@@ -14,6 +14,7 @@
     "RabbitMq_Account_RequestQueueName": "QuizMasterRequestQueue",
     "RabbitMq_Account_ResponseQueueName": "QuizMasterResponseQueue",
     "RabbitMq_Hostname": "localhost",
+    "GatewayHost": "https://localhost:7081",
     "Service_MonitoringGRPC": "https://localhost:7065",
     "SMTP_EMAIL": "jabejar@fullscale.io", /* TEMP, WILL DELETE THE CRED IN FUTURE */
     "SMTP_PASSWORD": "dzsw pzja rmzu axyq" /* TEMP, WILL DELETE THE CRED IN FUTURE */

diff --git a/WebApp/backend/QuizMaster.API.Gatewway/Controllers/AccountGatewayController.cs b/WebApp/backend/QuizMaster.API.Gatewway/Controllers/AccountGatewayController.cs
@@ -389,9 +389,11 @@ public async Task<IActionResult> ConfirmUpdatePassword(string token)
 
             if (response.Code != 200)
             {
-                return BadRequest(new ResponseDto { Type = "Error", Message = response.Message });
+                //return BadRequest(new ResponseDto { Type = "Error", Message = response.Message });
+                return BadRequest("<html><body><h1>Failed to update password, either token has expired or this link has already been consumed.</h1><p>TODO: UI design</p></body></html>");
             }
-            return Ok(new ResponseDto { Type = "Success", Message = response.Message });
+            //return Ok(new ResponseDto { Type = "Success", Message = response.Message });
+            return Ok("<html><body><h1>Password was successfully updated</h1><p>TODO: UI design</p></body></html>");
         }
 
         [QuizMasterAdminAuthorization]