type fix

pawelos231 · Jun 26, 2023 · 107e0d1 · 107e0d1
1 parent d096c6b
commit 107e0d1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/pages/api/middleware/authMiddleware.ts b/pages/api/middleware/authMiddleware.ts
@@ -2,14 +2,20 @@ import { verify } from "@server/helpers/validateToken";
 import { NextApiResponse, NextApiRequest } from "next";
 import { NOTAUTH } from "@constants/auth";
 
-export interface AuthenticatedRequest extends NextApiRequest {
-  user?: any;
+export interface IAuthRes extends NextApiRequest {
+  user: {
+    Email: string;
+    Name: string;
+  };
 }
 
-type HandlerFunc<T> = (req: T, res: NextApiResponse<any>) => Promise<any>;
+type HandlerFunc<T extends IAuthRes> = (
+  req: T,
+  res: NextApiResponse<any>
+) => Promise<any>;
 
 export const authMiddleware =
-  <T extends AuthenticatedRequest>(handler: HandlerFunc<T>): HandlerFunc<T> =>
+  <T extends IAuthRes>(handler: HandlerFunc<T>): HandlerFunc<T> =>
   async (req, res) => {
     const token: string = String(req.headers["authorization"]);
 

diff --git a/pages/api/middleware/paginate.ts b/pages/api/middleware/paginate.ts
@@ -1,15 +1,18 @@
 import { NextApiResponse, NextApiRequest } from "next";
 import { NOTAUTH } from "@constants/auth";
 
-export interface PaginatedRequest extends NextApiRequest {
+export interface IPaginate extends NextApiRequest {
   PAGE_SIZE: string;
   skipValue: string;
 }
 
-type HandlerFunc<T> = (req: T, res: NextApiResponse<any>) => Promise<any>;
+type HandlerFunc<T extends IPaginate> = (
+  req: T,
+  res: NextApiResponse<any>
+) => Promise<any>;
 
 export const paginateMiddleware =
-  <T extends PaginatedRequest>(handler: HandlerFunc<T>): HandlerFunc<T> =>
+  <T extends IPaginate>(handler: HandlerFunc<T>): HandlerFunc<T> =>
   async (req, res) => {
     const skipValue = req.headers["skipvalue"] as string;
     const PAGE_SIZE = req.headers["page_size"] as string;

diff --git a/pages/api/middleware/types/index.ts b/pages/api/middleware/types/index.ts
@@ -1 +1,4 @@
-export type HandlerFunc = number;
+import { IAuthRes } from "../authMiddleware";
+import { IPaginate } from "../paginate";
+
+export type IAuthPag = IAuthRes & IPaginate;
diff --git a/pages/api/user/UserLikedPosts.ts b/pages/api/user/UserLikedPosts.ts
@@ -1,8 +1,9 @@
 import { getLikedUserPosts, CountLikedPostssDB } from "@server/db/posts";
 import { authMiddleware } from "../middleware/authMiddleware";
 import { paginateMiddleware } from "../middleware/paginate";
+import { IAuthPag } from "../middleware/types";
 
-export default authMiddleware(
+export default authMiddleware<IAuthPag>(
   paginateMiddleware(async function Handler(req, res) {
     try {
       const Name = String(req.user.Name);

diff --git a/pages/api/user/fetchUserSpecificData.ts b/pages/api/user/fetchUserSpecificData.ts
@@ -2,8 +2,9 @@ import { getPostsByUser } from "@server/db/posts";
 import { authMiddleware } from "../middleware/authMiddleware";
 import { paginateMiddleware } from "../middleware/paginate";
 import { CountCreatedPostssDB } from "@server/db/posts";
+import { IAuthPag } from "../middleware/types";
 
-export default authMiddleware(
+export default authMiddleware<IAuthPag>(
   paginateMiddleware(async function Handler(req, res) {
     try {
       const userEmail = String(req.user.Email);