VIA-172 AJ/AS Moved types to separate file

Author: ankur-jain-nhs

auth.ts

@@ -1,48 +1,15 @@
 import NHSLoginAuthProvider from "@src/app/api/auth/[...nextauth]/provider";
 import { SESSION_LOGOUT_ROUTE } from "@src/app/session-logout/constants";
 import { SSO_FAILURE_ROUTE } from "@src/app/sso-failure/constants";
+import type { DecodedToken } from "@src/utils/auth/types";
 import { AppConfig, configProvider } from "@src/utils/config";
 import { logger } from "@src/utils/logger";
-import NextAuth, { type DefaultSession } from "next-auth";
+import NextAuth from "next-auth";
 import "next-auth/jwt";
 import { jwtDecode } from "jwt-decode";
 import { Logger } from "pino";
 import { generateClientAssertion } from "@src/utils/auth/generate-refresh-client-assertion";
 
-export interface DecodedToken {
-  iss: string;
-  aud: string;
-  identity_proofing_level: string;
-}
-
-// Augmenting types. Ref https://authjs.dev/getting-started/typescript#module-augmentation
-declare module "next-auth" {
-  interface Session {
-    user: {
-      nhs_number: string,
-      birthdate: string,
-      access_token: string,
-    } & DefaultSession["user"],
-  }
-
-  interface Profile {
-    nhs_number: string,
-  }
-}
-
-declare module "next-auth/jwt" {
-  interface JWT {
-    user: {
-      nhs_number: string,
-      birthdate: string,
-    },
-    expires_at: number,
-    refresh_token: string,
-    access_token: string,
-    fixedExpiry: number;
-  }
-}
-
 const log: Logger = logger.child({ module: "auth" });
 
 const MAX_SESSION_AGE_SECONDS: number = 12 * 60 * 60; // 12 hours of continuous usage
@@ -85,6 +52,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth(async () => {
         }
         return isValidToken;
       },
+
       async jwt({ token, account, profile}) {
         if (!token) {
           log.error("No token available in jwt callback.");

src/utils/auth/types.d.ts

@@ -0,0 +1,35 @@
+import type { DefaultSession } from "next-auth";
+
+export interface DecodedToken {
+  iss: string;
+  aud: string;
+  identity_proofing_level: string;
+}
+
+// Augmenting types. Ref https://authjs.dev/getting-started/typescript#module-augmentation
+declare module "next-auth" {
+  interface Session {
+    user: {
+      nhs_number: string;
+      birthdate: string;
+      access_token: string;
+    } & DefaultSession["user"];
+  }
+
+  interface Profile {
+    nhs_number: string;
+  }
+}
+
+declare module "next-auth/jwt" {
+  interface JWT {
+    user: {
+      nhs_number: string;
+      birthdate: string;
+    };
+    expires_at: number;
+    refresh_token: string;
+    access_token: string;
+    fixedExpiry: number;
+  }
+}

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

@@ -3,7 +3,7 @@ import { userLogout } from "@src/utils/auth/user-logout";
 import { signOut } from "next-auth/react";
 
 jest.mock("next-auth/react", () => ({
-  signOut: jest.fn()
+  signOut: jest.fn(),
 }));
 
 describe("user-logout", () => {
@@ -12,7 +12,7 @@ describe("user-logout", () => {
 
     expect(signOut).toHaveBeenCalledWith({
       redirect: true,
-      redirectTo: SESSION_LOGOUT_ROUTE
+      redirectTo: SESSION_LOGOUT_ROUTE,
     });
   });
 });