@next-k8s/tickets 1.0.14 → 1.0.19

package/src/routes/__test__/find.test.ts

@@ -1,10 +1,14 @@
+
+import mongoose from 'mongoose'
 import request from 'supertest'
+import { getTokenCookie } from '@next-k8s/common'
+
 import app from '../../app'
-import { createTicket, getTokenCookie } from '../../test/utils'
+import { createTicket } from '../../test/utils'
 
-describe('[List Tickets] Route: /api/tickets', () => {
+describe('[List Tickets] Route: GET /api/tickets', () => {
   it('should return a list of tickets', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
     await createTicket(app, cookie)
     await createTicket(app, cookie, 'Test Event 2', 40000)
     const list = await request(app)

package/src/routes/__test__/get.test.ts

@@ -1,9 +1,11 @@
 import request from 'supertest'
 import mongoose from 'mongoose'
+import { getTokenCookie } from '@next-k8s/common'
+
 import app from '../../app'
-import { createTicket, getTokenCookie } from '../../test/utils'
+import { createTicket } from '../../test/utils'
 
-describe('[Get Ticket] Route: /api/tickets/:id', () => {
+describe('[Get Ticket] Route: GET /api/tickets/:id', () => {
   it('should throw a BadRequestError if ticket ID is invalid', async () => {
     await request(app)
       .get('/api/tickets/notarealid')
@@ -20,7 +22,7 @@ describe('[Get Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should return the fetched ticket', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
     const response = await createTicket(app, cookie)
 
     const ticket = await request(app)

package/src/routes/__test__/update.test.ts

@@ -1,14 +1,15 @@
 import request from 'supertest'
 import mongoose from 'mongoose'
+import { getTokenCookie } from '@next-k8s/common'
 
 import app from '../../app'
-import { createTicket, getTokenCookie } from '../../test/utils'
+import { createTicket } from '../../test/utils'
 import natsClient from '../../nats-client'
 
-describe('[Update Ticket] Route: /api/tickets/:id', () => {
+describe('[Update Ticket] Route: PUT /api/tickets/:id', () => {
   it('should throw a NotFoundError if the ticket does not exist', async () => {
     const id = new mongoose.Types.ObjectId().toHexString()
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
 
     await request(app)
       .put(`/api/tickets/${id}`)
@@ -18,7 +19,7 @@ describe('[Update Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should throw an UnauthorizedError if not authenticated', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
 
     const response = await request(app)
       .post(`/api/tickets`)
@@ -33,25 +34,26 @@ describe('[Update Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should throw an UnauthorizedError if user does not own the ticket', async () => {
-    const cookie = await getTokenCookie()
+    const users = [
+      await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() }),
+      await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
+    ]
 
     const response = await request(app)
       .post(`/api/tickets`)
-      .set('Cookie', [cookie])
+      .set('Cookie', [users[0]])
       .send({ title: 'Test Event', price: 20000 })
       .expect(201)
 
-    const newCookie = await getTokenCookie()
-
     await request(app)
       .put(`/api/tickets/${response.body.ticket.id}`)
-      .set('Cookie', [newCookie])
+      .set('Cookie', [users[1]])
       .send({ title: 'Test Event', price: 23000 })
       .expect(401)
   })
 
   it('should throw a BadRequestError if an invalid ticket is provided', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
 
     await request(app)
       .put(`/api/tickets/notarealid`)
@@ -61,7 +63,7 @@ describe('[Update Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should throw an error on invalid ticket data', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
     const response = await createTicket(app, cookie)
     
     await request(app)
@@ -78,7 +80,7 @@ describe('[Update Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should update a ticket', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
     const response = await createTicket(app, cookie)
     
     const updated = await request(app)
@@ -94,7 +96,7 @@ describe('[Update Ticket] Route: /api/tickets/:id', () => {
   })
 
   it('should publish a ticket:updated event', async () => {
-    const cookie = await getTokenCookie()
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
     await createTicket(app, cookie)
     expect(natsClient.client.publish).toHaveBeenCalled()
   })

package/src/routes/update.ts

@@ -18,7 +18,7 @@ router.put('/api/tickets/:id', requireAuth, validateInput, validateRequest, asyn
   if (!isValidObjectId(req.params.id)) throw new BadRequestError('Invalid Ticket ID')
   const ticket = await Ticket.findById(req.params.id)
   if (!ticket) throw new NotFoundError()
-  if (ticket.owner !== req.currentUser!.id) throw new UnauthorizedError()
+  if (ticket.owner.toHexString() !== req.currentUser!.id) throw new UnauthorizedError()
   const { title, price } = req.body
   ticket.set({ title, price })
   await ticket.save()

package/src/test/utils.ts

@@ -1,14 +1,5 @@
-import jwt from 'jsonwebtoken'
-import mongoose from 'mongoose'
 import request from 'supertest'
 
-export const getTokenCookie = async () => {
-  const payload = { id: new mongoose.Types.ObjectId().toHexString(), email: 'test@test.com' }
-  const token = jwt.sign(payload, process.env.JWT_KEY!)
-  const cookie = Buffer.from(JSON.stringify({ jwt: token })).toString('base64')
-  return `session=${cookie}`
-}
-
 export const createTicket = (app: Express.Application, cookie?: string, title = 'Test Event', price = 20000, expectedStatusCode = 201) => {
   return request(app)
     .post('/api/tickets')