VIA-172 AJ Added functionality to distinguish timeout vs logout

Author: ankur-jain-nhs

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

@@ -87,7 +87,7 @@ describe("InactivityDialog", () => {
 
       render(<InactivityDialog />);
 
-      expect(userLogout).toHaveBeenCalledTimes(1);
+      expect(userLogout).toHaveBeenCalledWith(true);
     });
 
     it("should not show warning when user activity has timed out after warning", async () => {
@@ -101,7 +101,7 @@ describe("InactivityDialog", () => {
         hidden: true,
       });
       expect(inactivityWarningModal).not.toBeVisible();
-      expect(userLogout).toHaveBeenCalledTimes(1);
+      expect(userLogout).toHaveBeenCalledWith(true);
     });
 
     it("should close the dialog when user clicks the stay logged in button", async () => {
@@ -122,7 +122,7 @@ describe("InactivityDialog", () => {
       render(<InactivityDialog />);
       screen.getByRole("button", { name: "Log out" }).click();
 
-      expect(userLogout).toHaveBeenCalledTimes(1);
+      expect(userLogout).toHaveBeenCalledWith();
     });
   });
 

src/app/_components/inactivity/InactivityDialog.tsx

@@ -18,7 +18,7 @@ const InactivityDialog = (): JSX.Element => {
     if (status === "authenticated") {
       if (isTimedOut) {
         dialogRef.current?.close();
-        userLogout();
+        userLogout(true);
       } else if (isIdle) {
         dialogRef.current?.showModal();
       }

src/utils/auth/user-logout.test.ts

@@ -1,4 +1,5 @@
 import { SESSION_LOGOUT_ROUTE } from "@src/app/session-logout/constants";
+import { SESSION_TIMEOUT_ROUTE } from "@src/app/session-timeout/constants";
 import { userLogout } from "@src/utils/auth/user-logout";
 import { signOut } from "next-auth/react";
 
@@ -7,12 +8,21 @@ jest.mock("next-auth/react", () => ({
 }));
 
 describe("user-logout", () => {
-  it("should call signOut with correct parameters", async () => {
+  it("should call signOut to be redirected to logout page by default", async () => {
     userLogout();
 
     expect(signOut).toHaveBeenCalledWith({
       redirect: true,
       redirectTo: SESSION_LOGOUT_ROUTE,
     });
   });
+
+  it("should call signOut to be redirected to timeout page given reason", async () => {
+    userLogout(true);
+
+    expect(signOut).toHaveBeenCalledWith({
+      redirect: true,
+      redirectTo: SESSION_TIMEOUT_ROUTE,
+    });
+  });
 });

src/utils/auth/user-logout.ts

@@ -1,12 +1,13 @@
 "use client";
 
 import { SESSION_LOGOUT_ROUTE } from "@src/app/session-logout/constants";
+import { SESSION_TIMEOUT_ROUTE } from "@src/app/session-timeout/constants";
 import { signOut } from "next-auth/react";
 
-const userLogout = () => {
+const userLogout = (reasonTimeout: boolean = false) => {
   signOut({
     redirect: true,
-    redirectTo: SESSION_LOGOUT_ROUTE,
+    redirectTo: reasonTimeout ? SESSION_TIMEOUT_ROUTE : SESSION_LOGOUT_ROUTE,
   });
 };