Removing getPatronData and middleware and calling auth function on ge…

…tServerSideProps instead

__test__/pages/Home.test.tsx

@@ -3,6 +3,13 @@ import { render, screen } from "@testing-library/react"
 
 import Home from "../../pages/index"
 
+// Mock the auth module on the Page component level.
+jest.mock("jose", () => ({
+  importSPKI: async () => Promise.resolve("testPublicKey"),
+  jwtVerify: async () => ({
+    payload: {},
+  }),
+}))
 // Mock next router
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 

pages/index.tsx

@@ -12,7 +12,6 @@ import Layout from "../src/components/Layout/Layout"
 import RCLink from "../src/components/RCLink/RCLink"
 import { SITE_NAME } from "../src/config/constants"
 import { appConfig } from "../src/config/config"
-import { getPatronData } from "../src/server/getPatronData"
 import initializePatronTokenAuth from "../src/server/auth"
 
 export default function Home() {
@@ -161,16 +160,12 @@ export default function Home() {
 }
 
 export async function getServerSideProps({ req }) {
-  // Get patron data if the cookie has been parsed in the middleware.
-  // This could be passed down to props for the page component to use.
+  // Every page that needs patron data must call initializePatronTokenAuth
+  // to find if the token is valid and what the patron id is.
   const patronTokenResponse = await initializePatronTokenAuth(req)
-  // const patronData = await getPatronData({
-  //   isTokenValid: patronTokenResponse?.isTokenValid,
-  //   userId: patronTokenResponse?.decodedPatron?.sub,
-  // })
-  console.log("sevre side props")
-  // console.log(req.cookies)
-  console.log("This is just to test patronTokenResponse", patronTokenResponse)
+  // Now it can be used to get patron data from Sierra or Platform API
+  // or use `isTokenValid` to redirect to login page if it's not valid.
+  console.log("patronTokenResponse is", patronTokenResponse)
 
   // return props object
   return {

src/server/auth.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { JWTPayload } from "jose"
-import { importSPKI, jwtVerify } from "jose"
+// import type { JWTPayload } from "jose"
+import { importSPKI, jwtVerify, type JWTPayload } from "jose"
 import type { NextRequest } from "next/server"
 
 import { appConfig } from "../config/config"
@@ -20,8 +20,9 @@ interface UserJwtPayload extends JWTPayload {
  * and then verify it through JWT. The decoded patron information is returned.
  */
 export default async function initializePatronTokenAuth(req: NextRequest) {
-  const nyplIdentityPatron = (req.cookies as any)?.nyplIdentityPatron
+  type cookie = typeof req.cookies & { nyplIdentityPatron?: string }
 
+  const nyplIdentityPatron = (req.cookies as cookie)?.nyplIdentityPatron
   const nyplIdentityCookieObject = nyplIdentityPatron
     ? JSON.parse(nyplIdentityPatron)
     : {}

src/server/tests/auth.test.ts

@@ -20,14 +20,12 @@ jest.mock("jose", () => ({
 }))
 
 const reqNoCookies = {
-  cookies: { get: () => undefined },
+  cookies: {},
 } as NextRequest
 const reqCookiesWithToken = {
   cookies: {
-    get: () => ({
-      value: '{"access_token":123}',
-    }),
-  },
+    nyplIdentityPatron: '{"access_token":123}',
+  } as any,
 } as NextRequest
 
 describe("initializePatronTokenAuth", () => {