Commit 092a6e2

committed

fix: language validation in submit and run

1 parent e418264 commit 092a6e2Copy full SHA for 092a6e2

File tree

+22

-33

lines changed

+22

-33

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+import DB from 'models';`
	`2`	`+import { Request, Response, NextFunction } from 'express';`
	`3`	`+`
	`4`	`+export default (key = 'body') => async (req: Request, res: Response, next: NextFunction) => {`
	`5`	`+ const lang_slug = req[key].lang`
	`6`	`+ const lang = await DB.langs.findOne({`
	`7`	`+ where: {`
	`8`	`+ lang_slug`
	`9`	`+ }`
	`10`	`+ })`
	`11`	`+ if (!lang) {`
	`12`	`+ return res.status(400).json({`
	`13`	`+ message: 'Language not Found'`
	`14`	`+ })`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ return next()`
	`18`	`+}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@ import { Router } from 'express'`
`2`	`2`	`import Controller from './controller'`
`3`	`3`	`import Validator from './validators'`
`4`	`4`	`import { successListener } from 'rabbitmq/jobqueue'`
	`5`	`+import langValidator from 'middlewares/langValidator';`
`5`	`6`
`6`	`7`	`const router: Router = Router()`
`7`	`8`	`const validator = new Validator()`
`8`	`9`
`9`		`-router.post('/', validator.POST, Controller.runPOST)`
	`10`	`+router.post('/', validator.POST, langValidator(),Controller.runPOST)`
`10`	`11`	`successListener.on('run_result', Controller.onSuccess)`
`11`	`12`
`12`	`13`	`export default router`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@ import { Router } from 'express'`
`2`	`2`	`import Controller from './controller'`
`3`	`3`	`import Validator from './validators'`
`4`	`4`	`import { successListener } from 'rabbitmq/jobqueue'`
	`5`	`+import langValidator from 'middlewares/langValidator'`
`5`	`6`
`6`	`7`	`const router: Router = Router()`
`7`	`8`	`const validator = new Validator()`
`8`	`9`
`9`		`-router.post('/', validator.POST, Controller.submitPOST)`
	`10`	`+router.post('/', validator.POST, langValidator(),Controller.submitPOST)`
`10`	`11`	`successListener.on('submit_result', Controller.onSuccess)`
`11`	`12`
`12`	`13`	`export default router`

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,21 +41,6 @@ describe('RunValidator', async () => {`
`41`	`41`	`expect(nextSpy.calledOnce).to.be.false;`
`42`	`42`	`});`
`43`	`43`
`44`		`- it('should throw an error with incorrect language', async () => {`
`45`		`- const req = {`
`46`		`- body: {`
`47`		`- source: 'LKJSDFKLMC414CcnBcba12',`
`48`		`- lang: 'wrongLang',`
`49`		`- mode: 'sync',`
`50`		`- stdin: 'INPUT'`
`51`		`- }`
`52`		`- };`
`53`		`-`
`54`		`- await runValidator.POST(req, res, nextSpy);`
`55`		`- expect(sentStatus).to.equal(400);`
`56`		`- expect(nextSpy.calledOnce).to.be.false;`
`57`		`- });`
`58`		`-`
`59`	`44`	`it('should throw an error when source is missing', async () => {`
`60`	`45`	`const req = {`
`61`	`46`	`body: {`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,22 +53,6 @@ describe('SubmitValidator', async () => {`
`53`	`53`	`expect(nextSpy.calledOnce).to.be.false;`
`54`	`54`	`});`
`55`	`55`
`56`		`- it('should throw an error with incorrect language', async () => {`
`57`		`- const req = {`
`58`		`- body: {`
`59`		`- source: 'LKJSDFKLMC414CcnBcba12',`
`60`		`- lang: 'wrongLang',`
`61`		`- mode: 'sync',`
`62`		`- testcases`
`63`		`- }`
`64`		`- };`
`65`		`-`
`66`		`- await submitValidator.POST(req, res, nextSpy);`
`67`		`-`
`68`		`- expect(sentStatus).to.equal(400);`
`69`		`- expect(nextSpy.calledOnce).to.be.false;`
`70`		`- });`
`71`		`-`
`72`	`56`	`it('should throw an error when source is missing', async () => {`
`73`	`57`	`const req = {`
`74`	`58`	`body: {`

Comments

(0)