Update types and clean things up

Author: bcbogdan

lib/ts/recipe/session/framework/nextjs.ts

@@ -3,30 +3,12 @@ import jose from "jose";
 import SuperTokens from "../../../superTokens";
 
 import type { AccessTokenPayload, LoadedSessionContext } from "../types";
+import { CookiesStore, CookiesObject, GetServerSidePropsReturnValue, isCookiesStore } from "./types";
 
 const COOKIE_ACCESS_TOKEN_NAME = "sAccessToken";
 const HEADER_ACCESS_TOKEN_NAME = "st-access-token";
 const FRONT_TOKEN_NAME = "sFrontToken";
 
-type CookiesStore = {
-    get: (name: string) => { value: string };
-};
-
-function isCookiesStore(obj: unknown): obj is CookiesStore {
-    return typeof obj === "object" && obj !== null && "get" in obj && typeof (obj as CookiesStore).get === "function";
-}
-
-type CookiesObject = Record<string, string>;
-
-type GetServerSidePropsRedirect = {
-    redirect: { destination: string; permanent: boolean };
-};
-type GetServerSidePropsReturnValue =
-    | {
-          props: { session: LoadedSessionContext };
-      }
-    | GetServerSidePropsRedirect;
-
 type SSRSessionState =
     | "front-token-not-found"
     | "front-token-expired"
@@ -53,17 +35,17 @@ export async function getSSRSession(
     switch (state) {
         case "front-token-not-found":
             if (!redirect) {
-                return { redirect: { destination: getWebsiteBasePath(), permanent: false } };
+                return { redirect: { destination: getAuthPagePath(), permanent: false } };
             } else {
-                return redirect(getWebsiteBasePath());
+                return redirect(getAuthPagePath());
             }
         case "front-token-expired":
         case "access-token-not-found":
         case "tokens-do-not-match":
             if (!redirect) {
-                return { redirect: { destination: `${getApiBasePath()}/refresh`, permanent: false } };
+                return { redirect: { destination: getRefreshApiPath(), permanent: false } };
             } else {
-                return redirect(`${getApiBasePath()}/refresh`);
+                return redirect(getRefreshApiPath());
             }
         case "tokens-match":
             if (!redirect) {
@@ -121,20 +103,20 @@ async function getSSRSessionState(
     };
 }
 
-const getApiBasePath = () => {
-    return SuperTokens.getInstanceOrThrow().appInfo.apiBasePath.getAsStringDangerous();
+const getRefreshApiPath = () => {
+    return `${SuperTokens.getInstanceOrThrow().appInfo.apiBasePath.getAsStringDangerous()}/refresh`;
 };
 
-const getWebsiteBasePath = () => {
-    return SuperTokens.getInstanceOrThrow().appInfo.websiteBasePath.getAsStringDangerous();
+const getAuthPagePath = () => {
+    return `${SuperTokens.getInstanceOrThrow().appInfo.websiteBasePath.getAsStringDangerous()}/`;
 };
 
 function parseFrontToken(frontToken: string): AccessTokenPayload {
     return JSON.parse(decodeURIComponent(escape(atob(frontToken))));
 }
 
 async function parseAccessToken(token: string): Promise<AccessTokenPayload> {
-    const JWKS = jose.createRemoteJWKSet(new URL(`${getApiBasePath()}/authjwt/jwks.json`));
+    const JWKS = jose.createRemoteJWKSet(new URL(`${getRefreshApiPath()}/authjwt/jwks.json`));
     const { payload } = await jose.jwtVerify(token, JWKS);
     return payload;
 }

lib/ts/recipe/session/framework/types.ts

@@ -0,0 +1,21 @@
+import type { LoadedSessionContext } from "../types";
+
+export type CookiesStore = {
+    get: (name: string) => { value: string };
+};
+
+export function isCookiesStore(obj: unknown): obj is CookiesStore {
+    return typeof obj === "object" && obj !== null && "get" in obj && typeof (obj as CookiesStore).get === "function";
+}
+
+export type CookiesObject = Record<string, string>;
+
+export type GetServerSidePropsRedirect = {
+    redirect: { destination: string; permanent: boolean };
+};
+
+export type GetServerSidePropsReturnValue =
+    | {
+          props: { session: LoadedSessionContext };
+      }
+    | GetServerSidePropsRedirect;