Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix libraryFolder not existing on new libraryModel #3354

Closed
wants to merge 3 commits into from
Closed

Fix libraryFolder not existing on new libraryModel #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da82e21
Fix: `libraryFolder` does not exist for new library model
nichwall Sep 1, 2024
184858e
Ensure folder exists in library
nichwall Sep 1, 2024
3233017
Fix comment for upload
nichwall Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/controllers/MiscController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ class MiscController {
if (!library) {
return res.status(404).send(`Library not found with id ${libraryId}`)
}
const folder = library.libraryFolders.find((fold) => fold.id === folderId)
if (!folder) {
const folder = await Database.libraryFolderModel.findByPk(folderId)
// Verify the folder matches the library ID so we don't accidentally upload to the wrong library
if (!folder || folder.libraryId !== library.id) {
return res.status(404).send(`Folder not found with id ${folderId} in library ${library.name}`)
}

Expand Down
5 changes: 3 additions & 2 deletions server/controllers/PodcastController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ class PodcastController {
return res.status(404).send('Library not found')
}

const folder = library.libraryFolders.find((fold) => fold.id === payload.folderId)
if (!folder) {
const folder = await Database.libraryFolderModel.findByPk(payload.folderId)
// Verify the folder matches the library ID so we don't accidentally add a podcast to the wrong path
if (!folder || folder.libraryId !== library.id) {
Logger.error(`[PodcastController] Create: Folder not found "${payload.folderId}"`)
return res.status(404).send('Folder not found')
}
Expand Down
Loading