Skip to content

Commit 5b73095

Browse files
committed
fix: throw nuxt error
1 parent 9da66d2 commit 5b73095

18 files changed

+103
-48
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@imrim12/base",
33
"type": "module",
4-
"version": "1.3.9",
4+
"version": "1.3.10",
55
"publishConfig": {
66
"registry": "https://npm.pkg.github.com/",
77
"access": "restricted"

server/api/auth/login.post.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ export default defineEventHandler(async (event) => {
4848
})
4949
}
5050
catch (error: any) {
51-
setResponseStatus(event, 401, error.message)
51+
throw createError({
52+
statusCode: 401,
53+
statusMessage: error.message,
54+
})
5255
}
5356
})

server/api/auth/signup.post.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ export default defineEventHandler(async (event) => {
4848
return sysUser
4949
}
5050
catch (error: any) {
51-
console.error(error)
52-
setResponseStatus(event, 400, error.message)
51+
throw createError({
52+
statusCode: 500,
53+
statusMessage: error.message,
54+
})
5355
}
5456
})

server/api/firebase.post.ts

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,53 @@ import admin from 'firebase-admin'
22
import { useUserDeviceCrud } from '@base/server/composables/useUserDeviceCrud'
33

44
export default defineEventHandler(async (event) => {
5-
const { user_id } = await readBody(event)
5+
try {
6+
const { user_id } = await readBody(event)
67

7-
if (!user_id)
8-
return { message: 'User id is required' }
8+
if (!user_id)
9+
return { message: 'User id is required' }
910

10-
const service = getFirebaseServiceAccount()
11+
const service = getFirebaseServiceAccount()
1112

12-
if (admin.apps.length === 0) {
13-
admin.initializeApp({
14-
credential: admin.credential.cert(service as admin.ServiceAccount),
15-
})
16-
}
17-
18-
const { getUserDeviceAllTokens } = useUserDeviceCrud({ user_id })
19-
const response = await getUserDeviceAllTokens({} as ParsedFilterQuery)
20-
21-
if (response && response.total === 0) {
22-
setResponseStatus(event, 200)
23-
return { message: 'No device found' }
24-
}
25-
else {
26-
const tokens = response.data!.map<string>((item: any) => item.token_device)
27-
const body = {
28-
tokens,
29-
notification: {
30-
body: 'You have a new notification.',
31-
title: 'Nuxt Template',
32-
},
13+
if (admin.apps.length === 0) {
14+
admin.initializeApp({
15+
credential: admin.credential.cert(service as admin.ServiceAccount),
16+
})
3317
}
3418

35-
const res = await admin.messaging().sendEachForMulticast(body)
19+
const { getUserDeviceAllTokens } = useUserDeviceCrud({ user_id })
20+
const response = await getUserDeviceAllTokens({} as ParsedFilterQuery)
3621

37-
if (res) {
22+
if (response && response.total === 0) {
3823
setResponseStatus(event, 200)
39-
return { message: 'Notification sent successfully' }
24+
return { message: 'No device found' }
4025
}
4126
else {
42-
setResponseStatus(event, 400)
43-
return { message: 'Failed to send notification' }
27+
const tokens = response.data!.map<string>((item: any) => item.token_device)
28+
const body = {
29+
tokens,
30+
notification: {
31+
body: 'You have a new notification.',
32+
title: 'Nuxt Template',
33+
},
34+
}
35+
36+
const res = await admin.messaging().sendEachForMulticast(body)
37+
38+
if (res) {
39+
setResponseStatus(event, 200)
40+
return { message: 'Notification sent successfully' }
41+
}
42+
else {
43+
setResponseStatus(event, 400)
44+
return { message: 'Failed to send notification' }
45+
}
4446
}
4547
}
48+
catch (error: any) {
49+
throw createError({
50+
statusCode: 500,
51+
statusMessage: error.message,
52+
})
53+
}
4654
})

server/api/me.get.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ export default defineEventHandler(async (event) => {
1313
return sysUser
1414
}
1515
catch (error: any) {
16-
setResponseStatus(event, 404, error.message)
16+
throw createError({
17+
statusCode: 500,
18+
statusMessage: error.message,
19+
})
1720
}
1821
})

server/api/me.patch.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ export default defineEventHandler(async (event) => {
2323
return sysUser
2424
}
2525
catch (error: any) {
26-
setResponseStatus(event, 400, error.message)
26+
throw createError({
27+
statusCode: 500,
28+
statusMessage: error.message,
29+
})
2730
}
2831
})

server/api/roles/[uuid].delete.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ export default defineEventHandler(async (event) => {
1616
return { data: sysRole[0] }
1717
}
1818
catch (error: any) {
19-
setResponseStatus(event, 404, error.message)
19+
throw createError({
20+
statusCode: 500,
21+
statusMessage: error.message,
22+
})
2023
}
2124
})

server/api/roles/[uuid].get.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ export default defineEventHandler(async (event) => {
1616
return { data: sysRole[0] }
1717
}
1818
catch (error: any) {
19-
setResponseStatus(event, 404, error.message)
19+
throw createError({
20+
statusCode: 500,
21+
statusMessage: error.message,
22+
})
2023
}
2124
})

server/api/roles/[uuid].patch.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ export default defineEventHandler(async (event) => {
1717
return { data: sysRole }
1818
}
1919
catch (error: any) {
20-
setResponseStatus(event, 400, error.message)
20+
throw createError({
21+
statusCode: 500,
22+
statusMessage: error.message,
23+
})
2124
}
2225
})

server/api/roles/index.post.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ export default defineEventHandler(async (event) => {
1515
return { data: sysRole[0] }
1616
}
1717
catch (error: any) {
18-
setResponseStatus(event, 400, error.message)
18+
throw createError({
19+
statusCode: 500,
20+
statusMessage: error.message,
21+
})
1922
}
2023
})

0 commit comments

Comments
 (0)