Normalize protected read API responses

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

@@ -1,9 +1,9 @@
 import { getRouterParam } from "h3"
 import { Album } from "../../models/album"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/albums/[id]/tracks.get.ts

@@ -1,9 +1,9 @@
 import { getQuery, getRouterParam } from "h3"
 import { Track } from "../../../models/track"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 import { parseMongoId, parseNumber, validationResponse } from "../../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/albums/index.get.ts

@@ -1,9 +1,9 @@
 import { getQuery } from "h3"
 import { Album } from "../../models/album"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoIds, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedIds = parseMongoIds(getQuery(event).ids)

server/api/all/albums.get.ts

@@ -1,7 +1,7 @@
 import { Album } from "../../models/album"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	return Album.find({}).populate("artists").populate("genre")

server/api/all/artists.get.ts

@@ -1,7 +1,7 @@
 import { Artist } from "../../models/artist"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	return Artist.find({})

server/api/all/genres.get.ts

@@ -1,7 +1,7 @@
 import { Genre } from "../../models/genre"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	return Genre.find({})

server/api/all/tracks.get.ts

@@ -1,7 +1,7 @@
 import { Track } from "../../models/track"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	return Track.find({})

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

@@ -1,9 +1,9 @@
 import { getRouterParam } from "h3"
 import { Artist } from "../../models/artist"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/artists/[id]/albums.get.ts

@@ -1,9 +1,9 @@
 import { getQuery, getRouterParam } from "h3"
 import { Album } from "../../../models/album"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 import { parseMongoId, parseNumber, validationResponse } from "../../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/artists/[id]/tracks.get.ts

@@ -1,9 +1,9 @@
 import { getQuery, getRouterParam } from "h3"
 import { Track } from "../../../models/track"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 import { parseMongoId, parseNumber, validationResponse } from "../../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/artists/index.get.ts

@@ -1,9 +1,9 @@
 import { getQuery } from "h3"
 import { Artist } from "../../models/artist"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoIds, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedIds = parseMongoIds(getQuery(event).ids)

server/api/genres/albums/[id].get.ts

@@ -1,9 +1,9 @@
 import mongoose, { type PipelineStage } from "mongoose"
 import { Album } from "../../../models/album"
 import { parseMongoId, parseNumber, validationResponse } from "../../../utils/api-validation"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const id = parseMongoId(getRouterParam(event, "id"))

server/api/genres/random.get.ts

@@ -1,8 +1,8 @@
 import { Genre } from "../../models/genre"
 import { parseNumber, validationResponse } from "../../utils/api-validation"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const { limit: rawLimit } = getQuery(event)

server/api/genres/tracks/[id].get.ts

@@ -1,9 +1,9 @@
 import mongoose, { type PipelineStage } from "mongoose"
 import { Track } from "../../../models/track"
 import { parseMongoId, parseNumber, validationResponse } from "../../../utils/api-validation"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const id = parseMongoId(getRouterParam(event, "id"))

server/api/search.get.ts

@@ -7,11 +7,11 @@ import {
 	parseQueryString,
 	validationResponse,
 } from "../utils/api-validation"
-import { requireAuthenticatedUser } from "../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../utils/auth"
 
 const searchTypes = ["track", "album", "artist", "default"] as const
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const query = getQuery(event)

server/api/tracks.get.ts

@@ -1,9 +1,9 @@
 import { getQuery } from "h3"
 import { Track } from "../models/track"
-import { requireAuthenticatedUser } from "../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../utils/auth"
 import { parseMongoIds, validationResponse } from "../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedIds = parseMongoIds(getQuery(event).ids)

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

@@ -1,9 +1,9 @@
 import { getRouterParam } from "h3"
 import { Track } from "../../models/track"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/tracks/[id]/lyrics.get.ts

@@ -1,9 +1,9 @@
 import { getRouterParam } from "h3"
 import { Track } from "../../../models/track"
-import { requireAuthenticatedUser } from "../../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../../utils/auth"
 import { parseMongoId, validationResponse } from "../../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event)
 
 	const parsedId = parseMongoId(getRouterParam(event, "id"))

server/api/user/index.get.ts

@@ -1,5 +1,5 @@
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	return await requireAuthenticatedUser(event)
 })

server/api/user/tracks.get.ts

@@ -1,8 +1,8 @@
 import { User } from "../../models/user"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { setResponseStatus } from "h3"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	const authenticatedUser = await requireAuthenticatedUser(event)
 	const user = await User.findById(authenticatedUser._id).populate("savedTracks")
 

server/api/user/tracks.patch.ts

@@ -1,10 +1,10 @@
 import { getQuery, setResponseStatus } from "h3"
 import mongoose, { type ObjectId } from "mongoose"
 import { User } from "../../models/user"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	const authenticatedUser = await requireAuthenticatedUser(event)
 	const parsedId = parseMongoId(getQuery(event).id)
 	if ("error" in parsedId) return validationResponse(event, parsedId.error)