Merge pull request #518 from aranaravi/develop

[MOSIP-27977]Handled browser back button messages in uinservice dashboard
mosip · Oct 12, 2023 · 7fc192b · 7fc192b
2 parents 3701488 + 2d10269
commit 7fc192b
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts
@@ -89,17 +89,21 @@ export class DashboardComponent implements OnInit, OnDestroy {
   @HostListener('window:popstate', ['$event'])
   PopState(event) {
     if (window.location.hash.includes("uinservices")) {
-      console.log("Testing2")
-    } else {
-      console.log("Testing3")
-      if (confirm("Are you sure want to leave the page. you will be logged out automatically if you press OK?")) {
-        this.auditService.audit('RP-002', 'Logout', 'RP-Logout', 'Logout', 'User clicks on "logout" button after logging in to UIN services');
-        this.logoutService.logout();
-      } else {
-        history.pushState(null, null, window.location.href);
-        //this.router.navigate([this.router.url]);
-        return false;
+      if(window.location.hash.split("#")[1] === "/uinservices/dashboard"){
+        this.showRedirectPopup();
       }
+    } else {
+      this.showRedirectPopup();
+    }
+  }
+
+  showRedirectPopup(){
+    if (confirm("Are you sure want to leave the page. you will be logged out automatically if you press OK?")) {
+      this.auditService.audit('RP-002', 'Logout', 'RP-Logout', 'Logout', 'User clicks on "logout" button after logging in to UIN services');
+      this.logoutService.logout();
+    } else {
+      history.pushState(null, null, window.location.href);
+      return false;
     }
   }