Merge pull request #1101 from Crown-Commercial-Service/p3sprint5

4448-issues-fixed (#1100)
Crown-Commercial-Service · Feb 3, 2023 · 0edee16 · 0edee16
2 parents 69a65b6 + 90543ca
commit 0edee16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Auth0Templates/ResetPassword.html b/Auth0Templates/ResetPassword.html
@@ -563,10 +563,11 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
         });
 
         var handleSuccess = function (res) {
-            debugger;
+            if(res.success === false){
+              window.location.replace(res.result_url);
+            } else {
             var field = "initial";
             var _status = window.location.href.indexOf('&' + field);
-
             if (_status != -1) {
                 $('title').html("Success - Set Password - CCS");
                 document.getElementById("longin-success-message").innerHTML = "Your password has been setup";
@@ -577,9 +578,10 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
             }
             $("#success-view").show();
             $("#reset-view").hide();
-            // window.location.replace(result_url);
+           // window.location.replace(result_url);
             var errorSummary = document.getElementById('error-summary');
             errorSummary.style.display = 'none';
+            }
         };
 
         var handleError = function (res) {

diff --git a/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts b/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts
@@ -119,7 +119,7 @@ export class DelegatedUserStatusComponent implements OnInit {
   }
 
   public BackToDelegated():void {
-    this.router.navigateByUrl('find-delegated-user');
+    window.history.back();
   }
   public BackToDashboard():void {
     this.router.navigateByUrl('home');