diff --git a/server/api/albums/[id].get.ts b/server/api/albums/[id].get.ts index f6e3374..e3390d7 100644 --- a/server/api/albums/[id].get.ts +++ b/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")) diff --git a/server/api/albums/[id]/tracks.get.ts b/server/api/albums/[id]/tracks.get.ts index fe5c0b0..9ec1673 100644 --- a/server/api/albums/[id]/tracks.get.ts +++ b/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")) diff --git a/server/api/albums/index.get.ts b/server/api/albums/index.get.ts index 89f36b3..96f1d2f 100644 --- a/server/api/albums/index.get.ts +++ b/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) diff --git a/server/api/all/albums.get.ts b/server/api/all/albums.get.ts index 442be87..4319802 100644 --- a/server/api/all/albums.get.ts +++ b/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") diff --git a/server/api/all/artists.get.ts b/server/api/all/artists.get.ts index c3c8bf4..afe4ede 100644 --- a/server/api/all/artists.get.ts +++ b/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({}) diff --git a/server/api/all/genres.get.ts b/server/api/all/genres.get.ts index 329bfb6..a70b428 100644 --- a/server/api/all/genres.get.ts +++ b/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({}) diff --git a/server/api/all/tracks.get.ts b/server/api/all/tracks.get.ts index 8aeb1bf..bcc9a05 100644 --- a/server/api/all/tracks.get.ts +++ b/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({}) diff --git a/server/api/artists/[id].get.ts b/server/api/artists/[id].get.ts index 3710a08..09c890f 100644 --- a/server/api/artists/[id].get.ts +++ b/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")) diff --git a/server/api/artists/[id]/albums.get.ts b/server/api/artists/[id]/albums.get.ts index 465bc32..984ad3c 100644 --- a/server/api/artists/[id]/albums.get.ts +++ b/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")) diff --git a/server/api/artists/[id]/tracks.get.ts b/server/api/artists/[id]/tracks.get.ts index 9907547..8b2cb09 100644 --- a/server/api/artists/[id]/tracks.get.ts +++ b/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")) diff --git a/server/api/artists/index.get.ts b/server/api/artists/index.get.ts index 3671af3..df73e02 100644 --- a/server/api/artists/index.get.ts +++ b/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) diff --git a/server/api/genres/albums/[id].get.ts b/server/api/genres/albums/[id].get.ts index b8da70d..96332b6 100644 --- a/server/api/genres/albums/[id].get.ts +++ b/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")) diff --git a/server/api/genres/random.get.ts b/server/api/genres/random.get.ts index 3482b53..8848fc7 100644 --- a/server/api/genres/random.get.ts +++ b/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) diff --git a/server/api/genres/tracks/[id].get.ts b/server/api/genres/tracks/[id].get.ts index cb8b68e..37a7bc0 100644 --- a/server/api/genres/tracks/[id].get.ts +++ b/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")) diff --git a/server/api/search.get.ts b/server/api/search.get.ts index 19f2414..dabf738 100644 --- a/server/api/search.get.ts +++ b/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) diff --git a/server/api/tracks.get.ts b/server/api/tracks.get.ts index ba04b8e..c10908b 100644 --- a/server/api/tracks.get.ts +++ b/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) diff --git a/server/api/tracks/[id].get.ts b/server/api/tracks/[id].get.ts index 7a15d53..d3b78df 100644 --- a/server/api/tracks/[id].get.ts +++ b/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")) diff --git a/server/api/tracks/[id]/lyrics.get.ts b/server/api/tracks/[id]/lyrics.get.ts index dcf58bd..019152f 100644 --- a/server/api/tracks/[id]/lyrics.get.ts +++ b/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")) diff --git a/server/api/user/index.get.ts b/server/api/user/index.get.ts index 8b818b9..b616d2b 100644 --- a/server/api/user/index.get.ts +++ b/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) }) diff --git a/server/api/user/tracks.get.ts b/server/api/user/tracks.get.ts index 634a1c6..801dffd 100644 --- a/server/api/user/tracks.get.ts +++ b/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") diff --git a/server/api/user/tracks.patch.ts b/server/api/user/tracks.patch.ts index c4a2325..4c46d93 100644 --- a/server/api/user/tracks.patch.ts +++ b/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)