update: add delete user api route, AuthProvider extracted from App.tsx

src/pages/_app.tsx

@@ -1,4 +1,4 @@
-import UserContext from '@/contexts/UserContext';
+import UserContext, { AuthProvider } from '@/contexts/UserContext';
 
 import '@/styles/globals.css';
 import type { AppProps } from 'next/app';
@@ -13,15 +13,12 @@ import Layout from '@/components/ui/Layout';
 import useUser from '@/hooks/auth/useUser';
 import CustomToast from '@/components/ui/CustomToast';
 
-const spaceGrotesk = Space_Grotesk({
-  subsets: ['latin'],
-});
+const spaceGrotesk = Space_Grotesk({ subsets: ['latin'] });
 
-export default function App({ Component, pageProps }: AppProps) {
+const App = ({ Component, pageProps }: AppProps) => {
   useEffect(() => {
     themeChange(false);
   }, []);
-  const { user, isLoading, error, mutate } = useUser();
 
   return (
     <>
@@ -38,15 +35,17 @@ export default function App({ Component, pageProps }: AppProps) {
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0"
         />
       </Head>
-      <UserContext.Provider value={{ user, isLoading, error, mutate }}>
+      <AuthProvider>
         <Layout>
           <CustomToast>
             <Component {...pageProps} />
           </CustomToast>
         </Layout>
-      </UserContext.Provider>
+      </AuthProvider>
 
       <Analytics />
     </>
   );
-}
+};
+
+export default App;

src/pages/api/users/[id]/index.ts

@@ -4,6 +4,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
+import deleteUserById from '@/services/User/deleteUserById';
 import findUserByEmail from '@/services/User/findUserByEmail';
 import findUserById from '@/services/User/findUserById';
 import findUserByUsername from '@/services/User/findUserByUsername';
@@ -21,11 +22,12 @@ const EditUserSchema = BaseCreateUserSchema.pick({
   lastName: true,
 });
 
-interface EditUserRequest extends UserExtendedNextApiRequest {
+interface UserRouteRequest extends UserExtendedNextApiRequest {
+  query: { id: string };
+}
+
+interface EditUserRequest extends UserRouteRequest {
   body: z.infer<typeof EditUserSchema>;
-  query: {
-    id: string;
-  };
 }
 
 const checkIfUserCanEditUser = async (
@@ -41,7 +43,7 @@ const checkIfUserCanEditUser = async (
   }
 
   if (authenticatedUser.id !== userToUpdate.id) {
-    throw new ServerError('You are not permitted to edit this user', 403);
+    throw new ServerError('You are not permitted to modify this user', 403);
   }
 
   await next();
@@ -88,6 +90,24 @@ const editUser = async (
   });
 };
 
+const deleteUser = async (
+  req: UserRouteRequest,
+  res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
+) => {
+  const { id } = req.query;
+  const deletedUser = await deleteUserById(id);
+
+  if (!deletedUser) {
+    throw new ServerError('Could not find a user with that id.', 400);
+  }
+
+  res.send({
+    message: 'Successfully deleted user.',
+    statusCode: 200,
+    success: true,
+  });
+};
+
 const router = createRouter<
   EditUserRequest,
   NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
@@ -103,6 +123,15 @@ router.put(
   editUser,
 );
 
+router.delete(
+  getCurrentUser,
+  validateRequest({
+    querySchema: z.object({ id: z.string().cuid() }),
+  }),
+  checkIfUserCanEditUser,
+  deleteUser,
+);
+
 const handler = router.handler(NextConnectOptions);
 
 export default handler;

src/pages/api/users/edit-password.ts

@@ -5,7 +5,6 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import DBClient from '@/prisma/DBClient';
 import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { createRouter } from 'next-connect';
@@ -23,26 +22,15 @@ const updatePassword = async (
   const hash = await hashPassword(password);
 
   const user = req.user!;
-  const updatedUser: z.infer<typeof GetUserSchema> = await DBClient.instance.user.update({
+  await DBClient.instance.user.update({
     data: { hash },
     where: { id: user.id },
-    select: {
-      id: true,
-      username: true,
-      createdAt: true,
-      updatedAt: true,
-      email: true,
-      firstName: true,
-      lastName: true,
-      dateOfBirth: true,
-      accountIsVerified: true,
-    },
   });
+
   res.json({
     message: 'Updated user password.',
     statusCode: 200,
     success: true,
-    payload: updatedUser,
   });
 };
 const router = createRouter<