VIA-172 AJ Removed the unused stay-logged-in button handler as it is supposed to just reset the inactivity. Also refactored for better readability

Author: ankur-jain-nhs

src/app/_components/inactivity/InactivityDialog.test.tsx

@@ -1,6 +1,5 @@
 import { InactivityDialog } from "@src/app/_components/inactivity/InactivityDialog";
 import { SESSION_LOGOUT_ROUTE } from "@src/app/session-logout/constants";
-import { userExtendSession } from "@src/utils/auth/user-extend-session";
 import { render, screen } from "@testing-library/react";
 import { userLogout } from "@src/utils/auth/user-logout";
 import useInactivityTimer from "@src/utils/auth/inactivity-timer";
@@ -18,7 +17,6 @@ jest.mock("next-auth/react", () => ({
 
 jest.mock("@src/utils/auth/inactivity-timer");
 jest.mock("@src/utils/auth/user-logout");
-jest.mock("@src/utils/auth/user-extend-session");
 
 const mockRouterPush = jest.fn();
 jest.mock("next/navigation", () => ({
@@ -106,13 +104,16 @@ describe("InactivityDialog", () => {
       expect(userLogout).toHaveBeenCalledTimes(1);
     });
 
-    it("should call extend session when user clicks the button", async () => {
+    it("should close the dialog when user clicks the stay logged in button", async () => {
       idleSession = true;
 
       render(<InactivityDialog />);
       screen.getByRole("button", { name: "Stay logged in" }).click();
 
-      expect(userExtendSession).toHaveBeenCalledTimes(1);
+      const inactivityWarningModal: HTMLElement = screen.getByRole("dialog", {
+        hidden: true,
+      });
+      expect(inactivityWarningModal).not.toBeVisible();
     });
 
     it("should call logout when user clicks the button", async () => {

src/app/_components/inactivity/InactivityDialog.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { SESSION_LOGOUT_ROUTE } from "@src/app/session-logout/constants";
-import { userExtendSession } from "@src/utils/auth/user-extend-session";
 import { createRef, JSX, useEffect } from "react";
 import styles from "./styles.module.css";
 import { userLogout } from "@src/utils/auth/user-logout";
@@ -16,18 +15,16 @@ const InactivityDialog = (): JSX.Element => {
   const dialogRef = createRef<HTMLDialogElement>();
 
   useEffect(() => {
-    if (status === "unauthenticated") {
+    if (status === "authenticated") {
+      if (isTimedOut) {
+        dialogRef.current?.close();
+        userLogout();
+      } else if (isIdle) {
+        dialogRef.current?.showModal();
+      }
+    } else if (status === "unauthenticated") {
       dialogRef.current?.close();
       router.push(SESSION_LOGOUT_ROUTE);
-      return;
-    }
-
-    const isAuthenticated = status === "authenticated";
-    if (isAuthenticated && isTimedOut) {
-      dialogRef.current?.close();
-      userLogout();
-    } else if (isAuthenticated && isIdle) {
-      dialogRef.current?.showModal();
     }
   }, [dialogRef, isIdle, isTimedOut, router, status]);
 
@@ -40,7 +37,6 @@ const InactivityDialog = (): JSX.Element => {
           className={"nhsuk-button nhsapp-button"}
           onClick={() => {
             dialogRef.current?.close();
-            userExtendSession();
           }}
         >
           Stay logged in