refactor: use generics as the type for the custom ssrApi

teableio · Jun 26, 2024 · ed99fa1 · ed99fa1
1 parent eb83a08
commit ed99fa1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/apps/nestjs-backend/src/types/cls.ts b/apps/nestjs-backend/src/types/cls.ts
@@ -24,7 +24,7 @@ export interface IClsStore extends ClsStore {
   permissions: PermissionAction[];
   // for share db adapter
   cookie?: string;
-  setting: {
+  setting?: {
     disallowSignUp: boolean;
     disallowSpaceCreation: boolean;
   };

diff --git a/apps/nextjs-app/src/lib/withAuthSSR.ts b/apps/nextjs-app/src/lib/withAuthSSR.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ParsedUrlQuery } from 'querystring';
 import type { IHttpError } from '@teable/core';
 import type {
@@ -13,15 +14,12 @@ export type GetServerSideProps<
   P extends { [key: string]: any } = { [key: string]: any },
   Q extends ParsedUrlQuery = ParsedUrlQuery,
   D extends PreviewData = PreviewData,
-> = (
-  context: GetServerSidePropsContext<Q, D>,
-  ssrApi: SsrApi
-) => Promise<GetServerSidePropsResult<P>>;
+  T extends SsrApi = SsrApi,
+> = (context: GetServerSidePropsContext<Q, D>, ssrApi: T) => Promise<GetServerSidePropsResult<P>>;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export default function withAuthSSR<P extends { [key: string]: any }>(
-  handler: GetServerSideProps<P>,
-  ssrClass: typeof SsrApi = SsrApi
+export default function withAuthSSR<P extends { [key: string]: any }, T extends SsrApi>(
+  handler: GetServerSideProps<P, ParsedUrlQuery, PreviewData, T>,
+  ssrClass: new () => T = SsrApi as new () => T
 ): NextGetServerSideProps {
   return async (context: GetServerSidePropsContext) => {
     const req = context.req;