add withMiddleware for all api routes. Now it do nothing

pages/api/albums/[album].js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Album from '../../../src/core/Album'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const id = req.query.album
@@ -15,4 +16,4 @@ export default async (req, res) => {
             error: `Album ${id} not found`
         })
     }
-}
+})

pages/api/albums/index.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Album from '../../../src/core/Album'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const data = await Album.find({}, { sort: { date: -1 } })
@@ -15,4 +16,4 @@ export default async (req, res) => {
             error: `Article not found`
         })
     }
-}
+})

pages/api/articles/index.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import { findArticles } from '../../../src/api/articles'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const { query } = req
@@ -18,4 +19,4 @@ export default async (req, res) => {
             error: `Article ${id} not found`
         })
     }
-}
+})

pages/api/articles/urls.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Article from '../../../src/core/Article'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const data = await Article.find({})
@@ -17,4 +18,4 @@ export default async (req, res) => {
             error: `Not found`
         })
     }
-}
+})

pages/api/files/[document].js

@@ -1,8 +1,9 @@
 import { connect } from '../../../src/core/db'
 import Document from '../../../src/core/Document'
 import { encodeFile } from '../../../src/api/files'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const id = req.query.document
@@ -16,4 +17,4 @@ export default async (req, res) => {
             error: `Document ${id} not found`
         })
     }
-}
+})

pages/api/files/index.js

@@ -1,8 +1,9 @@
 import { connect } from '../../../src/core/db'
 import Document from '../../../src/core/Document'
 import { encodeFile } from '../../../src/api/files'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const documents = await Document.find({hidden: false})
@@ -20,4 +21,4 @@ export default async (req, res) => {
             error: `Documents not found`
         })
     }
-}
+})

pages/api/files/urls.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Document from '../../../src/core/Document'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const data = await Document.find({})
@@ -17,4 +18,4 @@ export default async (req, res) => {
             error: `Not found`
         })
     }
-}
+})

pages/api/image.js

@@ -1,8 +1,9 @@
 import { connect } from '../../src/core/db'
 import Image from '../../src/core/Image'
 import { encodeImage } from '../../src/api/image'
+import { withMiddleware } from '../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const file = req.query.file
@@ -16,4 +17,4 @@ export default async (req, res) => {
             error: `Image ${file} not found`
         })
     }
-}
+})

pages/api/page.js

@@ -2,8 +2,9 @@ import { connect } from '../../src/core/db'
 import Page from '../../src/core/Page'
 import { getPathWithNoTrailingSlash } from '../../src/lib/url'
 import { encodePage } from '../../src/api/page'
+import { withMiddleware } from '../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const page = getPathWithNoTrailingSlash(req.query.page)
@@ -17,4 +18,4 @@ export default async (req, res) => {
             error: `Image ${page} not found`
         })
     }
-}
+})

pages/api/pages/index.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Page from '../../../src/core/Page'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const items = await Page.find({})
@@ -16,4 +17,4 @@ export default async (req, res) => {
             error: `Article ${id} not found`
         })
     }
-}
+})

pages/api/pages/urls.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Page from '../../../src/core/Page'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const data = await Page.find({})
@@ -17,4 +18,4 @@ export default async (req, res) => {
             error: `Not found`
         })
     }
-}
+})

pages/api/persons/[person].js

@@ -1,8 +1,9 @@
 import { connect } from '../../../src/core/db'
 import Teacher from '../../../src/core/Teacher'
 import { encodePerson } from '../../../src/api/persons'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const id = req.query.person
@@ -16,4 +17,4 @@ export default async (req, res) => {
             error: `Article ${id} not found`
         })
     }
-}
+})

pages/api/persons/index.js

@@ -2,8 +2,9 @@ import { connect } from '../../../src/core/db'
 import Teacher from '../../../src/core/Teacher'
 import { prioritySort } from '../../../src/lib/sort'
 import { encodePerson } from '../../../src/api/persons'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const order = [
@@ -29,4 +30,4 @@ export default async (req, res) => {
             error: `Article ${id} not found`
         })
     }
-}
+})

pages/api/persons/urls.js

@@ -1,7 +1,8 @@
 import { connect } from '../../../src/core/db'
 import Teacher from '../../../src/core/Teacher'
+import { withMiddleware } from '../../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const data = await Teacher.find({})
@@ -17,4 +18,4 @@ export default async (req, res) => {
             error: `Not found`
         })
     }
-}
+})

pages/api/schedule.js

@@ -1,7 +1,8 @@
 import { connect } from '../../src/core/db'
 import { findSchedule } from '../../src/core/schedule'
+import { withMiddleware } from '../../src/middlewares/withMiddleware'
 
-export default async (req, res) => {
+export default withMiddleware(async (req, res) => {
     await connect()
 
     const period = req.query.period
@@ -16,4 +17,4 @@ export default async (req, res) => {
             error: `Schedule ${period}:${semester} not found`
         })
     }
-}
+})

src/middlewares/withMiddleware.js

@@ -0,0 +1,3 @@
+export const withMiddleware = handler => async (req, res) => {
+   return handler(req, res);
+};