Skip to content

Commit f779efd

Browse files
committed
fix: rename user context to appUser
1 parent 017df96 commit f779efd

File tree

12 files changed

+25
-24
lines changed

12 files changed

+25
-24
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"db:drop": "drizzle-kit drop",
1515
"pwa:generate-assets": "pwa-assets-generator --preset minimal public/logo.png",
1616
"lint": "eslint --cache .",
17-
"lint:fix": "eslint --cache --fix ."
17+
"lint:fix": "eslint --cache --fix .",
18+
"typecheck": "nuxi typecheck"
1819
},
1920
"devDependencies": {
2021
"@antfu/eslint-config": "latest",

pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/api/auth/verify.post.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default defineEventHandler(async (event) => {
88
const result = await verifyRequestBody.safeParseAsync(await readBody(event))
99
if (!result.success) {
1010
throw createError({
11-
status: 400,
11+
statusCode: 400,
1212
statusMessage: 'Bad request',
1313
})
1414
}
@@ -21,7 +21,7 @@ export default defineEventHandler(async (event) => {
2121

2222
if (!user) {
2323
throw createError({
24-
status: 404,
24+
statusCode: 404,
2525
statusMessage: 'Not found',
2626
})
2727
}

server/api/event/[id].get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default defineProtectedEventHandler(async (event) => {
2222

2323
if (!result) {
2424
throw createError({
25-
status: 400,
25+
statusCode: 400,
2626
statusMessage: 'Bad request',
2727
})
2828
}

server/api/event/[id].post.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default defineProtectedEventHandler(async (event) => {
1717
const result = await updateEventRequestBody.safeParseAsync(await readBody(event))
1818
if (!result.success) {
1919
throw createError({
20-
status: 400,
20+
statusCode: 400,
2121
statusMessage: 'Bad request',
2222
})
2323
}
@@ -38,7 +38,7 @@ export default defineProtectedEventHandler(async (event) => {
3838

3939
if (updatedEvent.length > 1) {
4040
throw createError({
41-
status: 500,
41+
statusCode: 500,
4242
statusMessage: 'Internal server error',
4343
})
4444
}

server/api/event/index.get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineProtectedEventHandler(async (event) => {
1919

2020
if (!result) {
2121
throw createError({
22-
status: 400,
22+
statusCode: 400,
2323
statusMessage: 'Bad request',
2424
})
2525
}

server/api/event/index.post.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default defineProtectedEventHandler(async (event) => {
1414
const result = await createEventRequestBody.safeParseAsync(await readBody(event))
1515
if (!result.success) {
1616
throw createError({
17-
status: 400,
17+
statusCode: 400,
1818
statusMessage: 'Bad request',
1919
})
2020
}
@@ -34,7 +34,7 @@ export default defineProtectedEventHandler(async (event) => {
3434

3535
if (createdEvent.length > 1) {
3636
throw createError({
37-
status: 500,
37+
statusCode: 500,
3838
statusMessage: 'Internal server error',
3939
})
4040
}

server/api/user/[id].delete.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { eq } from 'drizzle-orm'
22
import { users } from '~/server/db/schema'
33

44
export default defineProtectedEventHandler(async (event) => {
5-
if (event.context.user!.id !== event.context.params!.id) {
5+
if (event.context.appUser!.id !== event.context.params!.id) {
66
throw createError({
7-
status: 403,
7+
statusCode: 403,
88
statusMessage: 'Forbidden',
99
})
1010
}

server/api/user/[id].get.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
export default defineProtectedEventHandler(async (event) => {
55
if (event.context.firebaseId !== event.context.params!.id) {
66
throw createError({
7-
status: 403,
7+
statusCode: 403,
88
statusMessage: 'Forbidden',
99
})
1010
}
1111

12-
return event.context.user
12+
return event.context.appUser
1313
}, {
1414
cache: {
1515
maxAge: 5,

server/api/user/[id].post.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default defineProtectedEventHandler(async (event) => {
1010
const result = await registerRequestBody.safeParseAsync(await readBody(event))
1111
if (!result.success) {
1212
throw createError({
13-
status: 400,
13+
statusCode: 400,
1414
statusMessage: 'Bad request',
1515
})
1616
}
@@ -28,7 +28,7 @@ export default defineProtectedEventHandler(async (event) => {
2828

2929
if (updatedUsers.length > 1) {
3030
throw createError({
31-
status: 500,
31+
statusCode: 500,
3232
statusMessage: 'Internal server error',
3333
})
3434
}

server/db/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export const bookings = sqliteTable('bookings', {
7373
id: text('id').primaryKey().$defaultFn(() => createId()),
7474
userId: text('user_id').notNull().references(() => users.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
7575
slotId: text('slot_id').notNull().references(() => slots.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
76-
status: text('status', {
76+
statusCode: text('status', {
7777
enum: [
7878
'pending',
7979
'cancelled',

server/utils/handlers.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { User } from '~/shared/types'
88

99
declare module 'h3' {
1010
interface H3EventContext {
11-
user?: User
11+
appUser?: User // Vuefire is using `user` property so we have to use appUser
1212
firebaseId?: string
1313
}
1414
}
@@ -34,7 +34,7 @@ export function defineProtectedEventHandler<T extends EventHandlerRequest, D>(
3434

3535
if (!authorization.startsWith('Bearer ')) {
3636
throw createError({
37-
status: 403,
37+
statusCode: 403,
3838
statusMessage: 'Unauthorized',
3939
})
4040
}
@@ -57,21 +57,21 @@ export function defineProtectedEventHandler<T extends EventHandlerRequest, D>(
5757

5858
if (user === null) {
5959
throw createError({
60-
status: 401,
60+
statusCode: 401,
6161
statusMessage: 'Unauthorized',
6262
})
6363
}
6464

6565
if (options.restrictTo) {
6666
if (!user?.memberType || !options.restrictTo.includes(user.memberType)) {
6767
throw createError({
68-
status: 403,
68+
statusCode: 403,
6969
statusMessage: 'Forbidden',
7070
})
7171
}
7272
}
7373

74-
event.context.user = user
74+
event.context.appUser = user
7575
event.context.firebaseId = sub
7676

7777
return handler(event)

0 commit comments

Comments
 (0)