✨ proper equipment handling

app/pages/users/[user]/equipment.vue

@@ -6,7 +6,7 @@ import type { User } from '~/types/models'
 const route = useRoute()
 const penModal = ref(false)
 const cartridgeModal = ref(false)
-const { data: user } = await useApi().api<MetapiResponse<User>>(`/api/user/${route.params.user}`)
+const { data: user } = await useApi().fetch<MetapiResponse<User>>(`/api/user/${route.params.user}`)
 
 useCrumb()
   .custom({
@@ -16,7 +16,7 @@ useCrumb()
   },
   )
   .custom({
-    label: user.value.data.name as string,
+    label: user.value?.data.name as string,
     icon: 'i-mdi-account',
   })
   .custom({
@@ -26,8 +26,8 @@ useCrumb()
   .action({ label: 'Add a Pen', click: () => penModal.value = true })
   .action({ label: 'Add a Cartridge', click: () => cartridgeModal.value = true })
 
-const { data: pens, refresh: penRefresh } = await useApi().api<MetapiResponse<Pen[]>>(`/api/user/${route.params.user}/pen`)
-const { data: cartridges, refresh: cartRefresh } = await useApi().api<MetapiResponse<Cartridge[]>>(`/api/user/${route.params.user}/cartridge`)
+const { data: pens, refresh: penRefresh } = await useApi().fetch<MetapiResponse<Pen[]>>(`/api/user/${route.params.user}/pen`)
+const { data: cartridges, refresh: cartRefresh } = await useApi().fetch<MetapiResponse<Cartridge[]>>(`/api/user/${route.params.user}/cartridge`)
 
 const refresh = () => {
   penRefresh()
@@ -44,9 +44,9 @@ const reload = () => {
 <template>
   <div class="flex flex-col space-y-8">
     <div class="text-lg font-semibold">Pens </div>
-    <pen-list :pens="pens.data" :cartridges="cartridges.data" @reload="reload" />
+    <pen-list :pens="pens?.data" :cartridges="cartridges?.data" @reload="reload" />
     <div class="text-lg font-semibold">Cartridges </div>
-    <cartridge-list :cartridges="cartridges.data" @reload="reload" />
+    <cartridge-list :cartridges="cartridges?.data" @reload="reload" />
     <u-dashboard-modal
       v-model="penModal"
       title="Add a pen"

server/routes/cartridges.ts

@@ -2,7 +2,8 @@ import { z } from 'zod'
 import { cartridgeContents, cartridgeMgs, cartridgeMls } from '~/utils/shared'
 
 const index = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number() })
   const parsed = schema.safeParse({ id: Number.parseInt(event.context.params?.user as string) })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 400)
@@ -20,7 +21,8 @@ const index = defineEventHandler(async (event) => {
 })
 
 const create = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({
     user: z.string(),
     content: z.enum(cartridgeContents as [string, ...string[]]),
@@ -42,7 +44,8 @@ const create = defineEventHandler(async (event) => {
 })
 
 const get = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number(), user: z.number() })
   const parsed = schema.safeParse({
     id: event.context.params?.id,
@@ -59,7 +62,8 @@ const get = defineEventHandler(async (event) => {
 })
 
 const remove = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number(), user: z.number() })
   const parsed = schema.safeParse({ id: event.context.params?.id, user: Number.parseInt(event.context.params?.user as string) })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 403)

server/routes/pen.ts

@@ -27,8 +27,7 @@ const create = defineEventHandler(async (event) => {
   const pen = await prisma.pen.create({
     data: {
       color: parsed.data.color,
-      // user: { connect: { id: BigInt(auth.user().id) } },
-      userId: BigInt(user.id),
+      userId: user.id,
       cartridgeId: null,
     },
   })

server/routes/pens.ts

@@ -2,7 +2,8 @@ import { z } from 'zod'
 import { penColors } from '~/utils/shared'
 
 const index = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number() })
   const parsed = schema.safeParse({ id: Number.parseInt(event.context.params?.user as string) })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 400)
@@ -23,7 +24,8 @@ const index = defineEventHandler(async (event) => {
 })
 
 const create = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({
     user: z.string(),
     color: z.enum(penColors as [string, ...string[]]),
@@ -42,7 +44,8 @@ const create = defineEventHandler(async (event) => {
 })
 
 const update = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({
     id: z.number(),
     user: z.number(),
@@ -68,6 +71,8 @@ const update = defineEventHandler(async (event) => {
 })
 
 const get = defineEventHandler(async (event) => {
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number(), user: z.number() })
   const parsed = schema.safeParse({
     id: event.context.params?.id,
@@ -84,7 +89,8 @@ const get = defineEventHandler(async (event) => {
 })
 
 const remove = defineEventHandler(async (event) => {
-  if (!middleware.requireAdmin()) return metapi().notFound(event)
+  const { user } = await requireUserSession(event)
+  if (!user.isAdmin) return metapi().notFound(event)
   const schema = z.object({ id: z.number(), user: z.number() })
   const parsed = schema.safeParse({ id: event.context.params?.id, user: Number.parseInt(event.context.params?.user as string) })
   if (!parsed.success) return metapi().error(event, parsed.error.issues, 403)