AaronPo/the-biergarten-app
1
0
Fork 0
mirror of https://github.com/aaronpo97/the-biergarten-app.git synced 2026-02-16 20:13:49 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Update next-connect, begin work on cloud img upload

Browse Source
This commit is contained in:
Aaron William Po
2023-02-09 23:58:03 -05:00
parent 0fb013e250
commit 45cc10a009
17 changed files with 1616 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/api/beers/[id]/comments.ts
View File

@@ -1,14 +1,14 @@
import validateRequest from '@/config/zod/middleware/validateRequest';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import createNewBeerComment from '@/services/BeerComment/createNewBeerComment';
import { BeerCommentQueryResultT } from '@/services/BeerComment/schema/BeerCommentQueryResult';
import BeerCommentValidationSchema from '@/services/BeerComment/schema/CreateBeerCommentValidationSchema';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
interface CreateCommentRequest extends UserExtendedNextApiRequest {
@@ -36,10 +36,16 @@ const createComment = async (
});
};
const handler = nextConnect(NextConnectConfig).post(
const router = createRouter<
CreateCommentRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
validateRequest({ bodySchema: BeerCommentValidationSchema }),
getCurrentUser,
createComment,
);
const handler = router.handler(NextConnectOptions);
export default handler;

77
pages/api/beers/[id]/images/index.ts Normal file
View File

@@ -0,0 +1,77 @@
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import { NextHandler, createRouter, expressWrapper } from 'next-connect';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import multer from 'multer';
import cloudinaryConfig from '@/config/cloudinary';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
const { storage } = cloudinaryConfig;
const fileFilter: multer.Options['fileFilter'] = (req, file, cb) => {
if (
file.mimetype === 'image/png' ||
file.mimetype === 'image/jpg' ||
file.mimetype === 'image/jpeg'
) {
cb(null, true);
} else {
cb(null, false);
}
};
const uploadMiddleware = multer({ storage, fileFilter }).array('images');
interface UploadBeerPostImagesRequest extends UserExtendedNextApiRequest {
files?:
| Express.Multer.File[]
| {
[fieldname: string]: Express.Multer.File[];
};
query: {
id: string;
};
// beerPost?: BeerPostQueryResult;
}
const checkIfBeerPostOwner = async (
req: UploadBeerPostImagesRequest,
res: NextApiResponse,
next: NextHandler,
) => {
const { id } = req.query;
const user = req.user!;
const beerPost = await getBeerPostById(id);
if (!beerPost) {
throw new ServerError('Beer post not found', 404);
}
if (beerPost.postedBy.id !== user.id) {
throw new ServerError('You are not authorized to edit this beer post', 403);
}
return next();
};
const router = createRouter<
UploadBeerPostImagesRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
// @ts-expect-error
router.post(getCurrentUser, expressWrapper(uploadMiddleware), checkIfBeerPostOwner);
const handler = router.handler(NextConnectOptions);
export default handler;
export const config = { api: { bodyParser: false } };

16
pages/api/beers/[id]/like/index.ts
View File

@@ -1,16 +1,16 @@
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/zod/middleware/validateRequest';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import { NextApiResponse } from 'next';
import ServerError from '@/config/util/ServerError';
import createBeerPostLike from '@/services/BeerPostLike/createBeerPostLike';
import removeBeerPostLikeById from '@/services/BeerPostLike/removeBeerPostLikeById';
import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
const sendLikeRequest = async (
req: UserExtendedNextApiRequest,
@@ -43,7 +43,12 @@ const sendLikeRequest = async (
res.status(200).json(jsonResponse);
};
const handler = nextConnect(NextConnectConfig).post(
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
getCurrentUser,
validateRequest({
querySchema: z.object({
@@ -53,4 +58,5 @@ const handler = nextConnect(NextConnectConfig).post(
sendLikeRequest,
);
const handler = router.handler(NextConnectOptions);
export default handler;

22
pages/api/beers/[id]/like/is-liked.ts
View File

@@ -1,11 +1,11 @@
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import validateRequest from '@/config/zod/middleware/validateRequest';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import DBClient from '@/prisma/DBClient';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
const checkIfLiked = async (
@@ -30,10 +30,20 @@ const checkIfLiked = async (
});
};
const handler = nextConnect(NextConnectConfig).get(
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.get(
getCurrentUser,
validateRequest({ querySchema: z.object({ id: z.string().uuid() }) }),
validateRequest({
querySchema: z.object({
id: z.string().uuid(),
}),
}),
checkIfLiked,
);
const handler = router.handler(NextConnectOptions);
export default handler;

16
pages/api/beers/create.ts
View File

@@ -1,13 +1,13 @@
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/zod/middleware/validateRequest';
import nextConnect from 'next-connect';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { createRouter } from 'next-connect';
import createNewBeerPost from '@/services/BeerPost/createNewBeerPost';
import BeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
interface CreateBeerPostRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof BeerPostValidationSchema>;
@@ -37,10 +37,16 @@ const createBeerPost = async (
});
};
const handler = nextConnect(NextConnectConfig).post(
const router = createRouter<
CreateBeerPostRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
validateRequest({ bodySchema: BeerPostValidationSchema }),
getCurrentUser,
createBeerPost,
);
const handler = router.handler(NextConnectOptions);
export default handler;

13
pages/api/users/current.ts
View File

@@ -1,9 +1,9 @@
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import nextConnect from 'next-connect';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { createRouter } from 'next-connect';
import { z } from 'zod';
const sendCurrentUser = async (req: UserExtendedNextApiRequest, res: NextApiResponse) => {
@@ -16,9 +16,12 @@ const sendCurrentUser = async (req: UserExtendedNextApiRequest, res: NextApiResp
});
};
const handler = nextConnect<
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig).get(getCurrentUser, sendCurrentUser);
>();
router.get(getCurrentUser, sendCurrentUser);
const handler = router.handler(NextConnectOptions);
export default handler;

39
pages/api/users/login.ts
View File

@@ -1,36 +1,35 @@
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import passport from 'passport';
import nextConnect from 'next-connect';
import { createRouter, expressWrapper } from 'next-connect';
import localStrat from '@/config/auth/localStrat';
import { setLoginSession } from '@/config/auth/session';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
import { UserExtendedNextApiRequest } from '../../../config/auth/types';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
export default nextConnect<
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig)
.use(passport.initialize())
.use(async (req, res, next) => {
const parsed = LoginValidationSchema.safeParse(req.body);
if (!parsed.success) {
throw new ServerError('Username and password are required.', 400);
}
>();
router.post(
validateRequest({ bodySchema: LoginValidationSchema }),
expressWrapper(async (req, res, next) => {
passport.initialize();
passport.use(localStrat);
passport.authenticate('local', { session: false }, (error, token) => {
if (error) {
next(error);
} else {
req.user = token;
next();
return;
}
req.user = token;
next();
})(req, res, next);
})
.post(async (req, res) => {
}),
async (req, res) => {
const user = req.user!;
await setLoginSession(res, user);
@@ -40,4 +39,8 @@ export default nextConnect<
statusCode: 200,
success: true,
});
});
},
);
const handler = router.handler(NextConnectOptions);
export default handler;

13
pages/api/users/logout.ts
View File

@@ -1,16 +1,18 @@
import { getLoginSession } from '@/config/auth/session';
import { removeTokenCookie } from '@/config/auth/cookie';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiRequest, NextApiResponse } from 'next';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
const handler = nextConnect<
const router = createRouter<
NextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig).all(async (req, res) => {
>();
router.all(async (req, res) => {
const session = await getLoginSession(req);
if (!session) {
@@ -18,10 +20,13 @@ const handler = nextConnect<
}
removeTokenCookie(res);
res.status(200).json({
message: 'Logged out.',
statusCode: 200,
success: true,
});
});
const handler = router.handler(NextConnectOptions);
export default handler;

18
pages/api/users/register.ts
View File

@@ -1,13 +1,14 @@
import { NextApiRequest, NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import nc from 'next-connect';
import { createRouter } from 'next-connect';
import createNewUser from '@/services/User/createNewUser';
import CreateUserValidationSchema from '@/services/User/schema/CreateUserValidationSchema';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import findUserByUsername from '@/services/User/findUserByUsername';
import findUserByEmail from '@/services/User/findUserByEmail';
import validateRequest from '@/config/zod/middleware/validateRequest';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
interface RegisterUserRequest extends NextApiRequest {
body: z.infer<typeof CreateUserValidationSchema>;
@@ -42,9 +43,12 @@ const registerUser = async (req: RegisterUserRequest, res: NextApiResponse) => {
});
};
const handler = nc(NextConnectConfig).post(
validateRequest({ bodySchema: CreateUserValidationSchema }),
registerUser,
);
const router = createRouter<
RegisterUserRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(validateRequest({ bodySchema: CreateUserValidationSchema }), registerUser);
const handler = router.handler(NextConnectOptions);
export default handler;