clean up express route definitions

Author: tdjsnelling

api/src/index.js

@@ -14,65 +14,24 @@ import config from '../../config'
 import validateConfig from './utils/validateConfig'
 import createTrackerRoute from './tracker/routes'
 import auth from './middleware/auth'
+import {
+  accountRoutes,
+  userRoutes,
+  torrentRoutes,
+  announcementRoutes,
+  reportRoutes,
+  adminRoutes,
+  requestRoutes,
+} from './routes'
 import {
   register,
   login,
-  generateInvite,
-  fetchInvites,
-  changePassword,
   initiatePasswordReset,
   finalisePasswordReset,
-  fetchUser,
-  getUserStats,
-  getUserRole,
-  getUserVerifiedEmailStatus,
   verifyUserEmail,
-  banUser,
-  unbanUser,
-  buyItems,
-  generateTotpSecret,
-  enableTotp,
-  disableTotp,
 } from './controllers/user'
-import {
-  uploadTorrent,
-  downloadTorrent,
-  fetchTorrent,
-  deleteTorrent,
-  addComment as addCommentTorrent,
-  listLatest,
-  searchTorrents,
-  addVote,
-  removeVote,
-  toggleFreeleech,
-} from './controllers/torrent'
-import {
-  createAnnouncement,
-  fetchAnnouncement,
-  getAnnouncements,
-  getPinnedAnnouncements,
-  deleteAnnouncement,
-  pinAnnouncement,
-  editAnnouncement,
-  addComment as addCommentAnnouncement,
-} from './controllers/announcement'
-import {
-  createReport,
-  fetchReport,
-  getReports,
-  setReportResolved,
-  getStats,
-} from './controllers/moderation'
+import { downloadTorrent } from './controllers/torrent'
 import { rssFeed } from './controllers/rss'
-import {
-  createRequest,
-  getRequests,
-  fetchRequest,
-  deleteRequest,
-  addComment as addCommentRequest,
-  addCandidate,
-  acceptCandidate,
-} from './controllers/request'
 import createAdminUser from './setup/createAdminUser'
 
 let mail
@@ -184,7 +143,6 @@ validateConfig(config).then(() => {
   app.use(cookieParser())
   app.use(cors())
 
-  // root
   app.get('/', (req, res) =>
     res.send(`■ sqtracker running: ${process.env.SQ_SITE_NAME}`).status(200)
   )
@@ -205,57 +163,13 @@ validateConfig(config).then(() => {
   // everything from here on requires user auth
   app.use(auth)
 
-  // user/account routes
-  app.get('/account/invites', fetchInvites)
-  app.post('/account/generate-invite', generateInvite)
-  app.post('/account/change-password', changePassword)
-  app.get('/account/get-stats', getUserStats)
-  app.get('/account/get-role', getUserRole)
-  app.get('/account/get-verified', getUserVerifiedEmailStatus)
-  app.post('/account/buy', buyItems)
-  app.get('/user/:username', fetchUser(tracker))
-  app.post('/user/ban/:username', banUser)
-  app.post('/user/unban/:username', unbanUser)
-  app.get('/account/totp/generate', generateTotpSecret)
-  app.post('/account/totp/enable', enableTotp)
-  app.post('/account/totp/disable', disableTotp)
-
-  // torrent routes
-  app.post('/torrent/upload', uploadTorrent)
-  app.get('/torrent/info/:infoHash', fetchTorrent(tracker))
-  app.delete('/torrent/delete/:infoHash', deleteTorrent)
-  app.post('/torrent/comment/:infoHash', addCommentTorrent)
-  app.post('/torrent/vote/:infoHash/:vote', addVote)
-  app.post('/torrent/unvote/:infoHash/:vote', removeVote)
-  app.post('/torrent/report/:infoHash', createReport)
-  app.post('/torrent/toggle-freeleech/:infoHash', toggleFreeleech)
-  app.get('/torrents/latest', listLatest(tracker))
-  app.get('/torrents/search', searchTorrents(tracker))
-
-  // announcement routes
-  app.post('/announcements/new', createAnnouncement)
-  app.get('/announcements/pinned', getPinnedAnnouncements)
-  app.get('/announcements/:slug', fetchAnnouncement)
-  app.get('/announcements/page/:page', getAnnouncements)
-  app.delete('/announcements/:slug', deleteAnnouncement)
-  app.post('/announcements/pin/:announcementId/:action', pinAnnouncement)
-  app.post('/announcements/edit/:announcementId', editAnnouncement)
-  app.post('/announcements/comment/:announcementId', addCommentAnnouncement)
-
-  // moderation routes
-  app.get('/reports/page/:page', getReports)
-  app.post('/reports/resolve/:reportId', setReportResolved)
-  app.get('/reports/:reportId', fetchReport)
-  app.get('/admin/stats', getStats(tracker))
-
-  // request routes
-  app.post('/requests/new', createRequest)
-  app.get('/requests/page/:page', getRequests)
-  app.get('/requests/:index', fetchRequest)
-  app.delete('/requests/:index', deleteRequest)
-  app.post('/requests/comment/:requestId', addCommentRequest)
-  app.post('/requests/suggest/:requestId', addCandidate)
-  app.post('/requests/accept/:requestId', acceptCandidate)
+  app.use('/account', accountRoutes())
+  app.use('/user', userRoutes(tracker))
+  app.use('/torrent', torrentRoutes(tracker))
+  app.use('/announcements', announcementRoutes())
+  app.use('/reports', reportRoutes())
+  app.use('/admin', adminRoutes(tracker))
+  app.use('/requests', requestRoutes())
 
   const port = process.env.SQ_PORT || 3001
   app.listen(port, () => {

api/src/routes/account.js

@@ -0,0 +1,29 @@
+import express from 'express'
+import {
+  fetchInvites,
+  generateInvite,
+  changePassword,
+  getUserStats,
+  getUserRole,
+  getUserVerifiedEmailStatus,
+  buyItems,
+  generateTotpSecret,
+  enableTotp,
+  disableTotp,
+} from '../controllers/user'
+
+const router = express.Router()
+
+export default () => {
+  router.get('/invites', fetchInvites)
+  router.post('/generate-invite', generateInvite)
+  router.post('/change-password', changePassword)
+  router.get('/get-stats', getUserStats)
+  router.get('/get-role', getUserRole)
+  router.get('/get-verified', getUserVerifiedEmailStatus)
+  router.post('/buy', buyItems)
+  router.get('/totp/generate', generateTotpSecret)
+  router.post('/totp/enable', enableTotp)
+  router.post('/totp/disable', disableTotp)
+  return router
+}

api/src/routes/admin.js

@@ -0,0 +1,9 @@
+import express from 'express'
+import { getStats } from '../controllers/moderation'
+
+const router = express.Router()
+
+export default (tracker) => {
+  router.get('/stats', getStats(tracker))
+  return router
+}

api/src/routes/announcement.js

@@ -0,0 +1,25 @@
+import express from 'express'
+import {
+  addComment,
+  createAnnouncement,
+  deleteAnnouncement,
+  editAnnouncement,
+  fetchAnnouncement,
+  getAnnouncements,
+  getPinnedAnnouncements,
+  pinAnnouncement,
+} from '../controllers/announcement'
+
+const router = express.Router()
+
+export default () => {
+  router.post('/new', createAnnouncement)
+  router.get('/pinned', getPinnedAnnouncements)
+  router.get('/:slug', fetchAnnouncement)
+  router.get('/page/:page', getAnnouncements)
+  router.delete('/:slug', deleteAnnouncement)
+  router.post('/pin/:announcementId/:action', pinAnnouncement)
+  router.post('/edit/:announcementId', editAnnouncement)
+  router.post('/comment/:announcementId', addComment)
+  return router
+}

api/src/routes/index.js

@@ -0,0 +1,17 @@
+import accountRoutes from './account'
+import userRoutes from './user'
+import torrentRoutes from './torrent'
+import announcementRoutes from './announcement'
+import reportRoutes from './report'
+import adminRoutes from './admin'
+import requestRoutes from './request'
+
+export {
+  accountRoutes,
+  userRoutes,
+  torrentRoutes,
+  announcementRoutes,
+  reportRoutes,
+  adminRoutes,
+  requestRoutes,
+}

api/src/routes/report.js

@@ -0,0 +1,15 @@
+import express from 'express'
+import {
+  fetchReport,
+  getReports,
+  setReportResolved,
+} from '../controllers/moderation'
+
+const router = express.Router()
+
+export default () => {
+  router.get('/page/:page', getReports)
+  router.post('/resolve/:reportId', setReportResolved)
+  router.get('/:reportId', fetchReport)
+  return router
+}

api/src/routes/request.js

@@ -0,0 +1,23 @@
+import express from 'express'
+import {
+  acceptCandidate,
+  addCandidate,
+  addComment as addCommentRequest,
+  createRequest,
+  deleteRequest,
+  fetchRequest,
+  getRequests,
+} from '../controllers/request'
+
+const router = express.Router()
+
+export default () => {
+  router.post('/new', createRequest)
+  router.get('/page/:page', getRequests)
+  router.get('/:index', fetchRequest)
+  router.delete('/:index', deleteRequest)
+  router.post('/comment/:requestId', addCommentRequest)
+  router.post('/suggest/:requestId', addCandidate)
+  router.post('/accept/:requestId', acceptCandidate)
+  return router
+}

api/src/routes/torrent.js

@@ -0,0 +1,29 @@
+import express from 'express'
+import {
+  addComment as addCommentTorrent,
+  addVote,
+  deleteTorrent,
+  fetchTorrent,
+  listLatest,
+  removeVote,
+  searchTorrents,
+  toggleFreeleech,
+  uploadTorrent,
+} from '../controllers/torrent'
+import { createReport } from '../controllers/moderation'
+
+const router = express.Router()
+
+export default (tracker) => {
+  router.post('/upload', uploadTorrent)
+  router.get('/info/:infoHash', fetchTorrent(tracker))
+  router.delete('/delete/:infoHash', deleteTorrent)
+  router.post('/comment/:infoHash', addCommentTorrent)
+  router.post('/vote/:infoHash/:vote', addVote)
+  router.post('/unvote/:infoHash/:vote', removeVote)
+  router.post('/report/:infoHash', createReport)
+  router.post('/toggle-freeleech/:infoHash', toggleFreeleech)
+  router.get('/latest', listLatest(tracker))
+  router.get('/search', searchTorrents(tracker))
+  return router
+}

api/src/routes/user.js

@@ -0,0 +1,11 @@
+import express from 'express'
+import { banUser, fetchUser, unbanUser } from '../controllers/user'
+
+const router = express.Router()
+
+export default (tracker) => {
+  router.get('/:username', fetchUser(tracker))
+  router.post('/ban/:username', banUser)
+  router.post('/unban/:username', unbanUser)
+  return router
+}

client/pages/categories/[category].js

@@ -57,7 +57,7 @@ export const getServerSideProps = withAuthServerSideProps(
 
     try {
       const searchRes = await fetch(
-        `${SQ_API_URL}/torrents/search?${qs.stringify(params)}`,
+        `${SQ_API_URL}/torrent/search?${qs.stringify(params)}`,
         {
           headers: fetchHeaders,
         }