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

Update api routes to use authenticated user

Browse Source
This commit is contained in:
Aaron William Po
2023-02-06 19:01:01 -05:00
parent 9a9d8bcb94
commit 3626e3de44
12 changed files with 190 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import { ExtendedNextApiRequest } from '@/config/auth/types';
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 { z } from 'zod';
const sendCurrentUser = async (req: ExtendedNextApiRequest, res: NextApiResponse) => {
const sendCurrentUser = async (req: UserExtendedNextApiRequest, res: NextApiResponse) => {
const { user } = req;
res.status(200).json({
message: `Currently logged in as ${user!.username}`,
@@ -17,7 +17,7 @@ const sendCurrentUser = async (req: ExtendedNextApiRequest, res: NextApiResponse
};
const handler = nextConnect<
ExtendedNextApiRequest,
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig).get(getCurrentUser, sendCurrentUser);

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

@@ -8,20 +8,19 @@ import { NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import LoginValidationSchema from '@/services/user/schema/LoginValidationSchema';
import { ExtendedNextApiRequest } from '../../../config/auth/types';
import { UserExtendedNextApiRequest } from '../../../config/auth/types';
export default nextConnect<
ExtendedNextApiRequest,
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig)
.use(passport.initialize())
.use(async (req, res, next) => {
passport.use(localStrat);
const parsed = LoginValidationSchema.safeParse(req.body);
if (!parsed.success) {
throw new ServerError('Username and password are required.', 400);
}
passport.use(localStrat);
passport.authenticate('local', { session: false }, (error, token) => {
if (error) {
next(error);

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

@@ -1,44 +1,18 @@
import { NextApiRequest, NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import nc, { NextHandler } from 'next-connect';
import nc from 'next-connect';
import createNewUser from '@/services/user/createNewUser';
import CreateUserValidationSchema from '@/services/user/schema/CreateUserValidationSchema';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import findUserByUsername from '@/services/user/findUserByUsername';
import findUserByEmail from '@/services/user/findUserByEmail';
import validateRequest from '@/config/zod/middleware/validateRequest';
interface RegisterUserRequest extends NextApiRequest {
body: z.infer<typeof CreateUserValidationSchema>;
}
const validateRequest =
({
bodySchema,
querySchema,
}: {
bodySchema?: z.ZodSchema<any>;
querySchema?: z.ZodSchema<any>;
}) =>
async (req: NextApiRequest, res: NextApiResponse, next: NextHandler) => {
if (bodySchema) {
const parsed = bodySchema.safeParse(req.body);
if (!parsed.success) {
throw new ServerError('Invalid request body.', 400);
}
}
if (querySchema) {
const parsed = querySchema.safeParse(req.query);
if (!parsed.success) {
throw new ServerError(parsed.error.message, 400);
}
req.query = parsed.data;
}
next();
};
const registerUser = async (req: RegisterUserRequest, res: NextApiResponse) => {
const [usernameTaken, emailTaken] = await Promise.all([
findUserByUsername(req.body.username),