format pre es6 to es6

janishar · janishar · commit 0fa7eacc42d0 · 2020-03-27T14:55:07.000+05:30
diff --git a/src/app.ts b/src/app.ts
@@ -5,6 +5,7 @@ import cors from 'cors';
 import { corsUrl, environment } from './config';
 import './database'; // initialize database
 import { NotFoundError, ApiError, InternalError } from './core/ApiError';
+import routesV1 from './routes/v1';
 
 const app = express();
 
@@ -13,7 +14,7 @@ app.use(bodyParser.urlencoded({ limit: '10mb', extended: true, parameterLimit: 5
 app.use(cors({ origin: corsUrl, optionsSuccessStatus: 200 }));
 
 // Routes
-app.use('/v1', require('./routes/v1'));
+app.use('/v1', routesV1);
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => next(new NotFoundError()));
diff --git a/src/auth/apikey.ts b/src/auth/apikey.ts
@@ -9,7 +9,7 @@ import asyncHandler from '../helpers/asyncHandler';
 
 const router = express.Router();
 
-router.use(validator(schema.apiKey, ValidationSource.HEADER),
+export default router.use(validator(schema.apiKey, ValidationSource.HEADER),
 	asyncHandler(async (req: PublicRequest, res, next) => {
 
 		req.apiKey = req.headers['x-api-key'].toString();
@@ -19,7 +19,4 @@ router.use(validator(schema.apiKey, ValidationSource.HEADER),
 
 		if (!apiKey) throw new ForbiddenError();
 		return next();
-	}
-	));
-
-module.exports = router;
+	}));
diff --git a/src/auth/authentication.ts b/src/auth/authentication.ts
@@ -13,7 +13,7 @@ import asyncHandler from '../helpers/asyncHandler';
 
 const router = express.Router();
 
-router.use(validator(schema.auth, ValidationSource.HEADER),
+export default router.use(validator(schema.auth, ValidationSource.HEADER),
 	asyncHandler(async (req: ProtectedRequest, res, next) => {
 		req.accessToken = req.headers['x-access-token'].toString();
 
@@ -39,7 +39,4 @@ router.use(validator(schema.auth, ValidationSource.HEADER),
 			if (e instanceof TokenExpiredError) throw new AccessTokenError(e.message);
 			throw e;
 		}
-	}
-	));
-
-module.exports = router;
+	}));
diff --git a/src/auth/authorization.ts b/src/auth/authorization.ts
@@ -6,7 +6,7 @@ import asyncHandler from '../helpers/asyncHandler';
 
 const router = express.Router();
 
-router.use(
+export default router.use(
 	asyncHandler(async (req: ProtectedRequest, res, next) => {
 		if (!req.user || !req.user.roles || !req.currentRoleCode)
 			throw new AuthFailureError('Permission denied');
@@ -21,6 +21,4 @@ router.use(
 			throw new AuthFailureError('Permission denied');
 
 		return next();
-	}));
-
-module.exports = router;
+	}));
diff --git a/src/helpers/role.ts b/src/helpers/role.ts
@@ -0,0 +1,9 @@
+import { RoleCode } from '../database/model/Role';
+import { RoleRequest } from 'app-request';
+import { Response, NextFunction } from 'express';
+
+export default (roleCode: RoleCode) =>
+	(req: RoleRequest, res: Response, next: NextFunction) => {
+		req.currentRoleCode = roleCode;
+		next();
+	};
diff --git a/src/routes/v1/access/login.ts b/src/routes/v1/access/login.ts
@@ -13,7 +13,7 @@ import _ from 'lodash';
 
 const router = express.Router();
 
-router.post('/basic', validator(schema.userCredential),
+export default router.post('/basic', validator(schema.userCredential),
 	asyncHandler(async (req, res, next) => {
 		const user = await UserRepo.findByEmail(req.body.email);
 		if (!user) throw new BadRequestError('User not registered');
@@ -32,6 +32,4 @@ router.post('/basic', validator(schema.userCredential),
 			user: _.pick(user, ['_id', 'name', 'roles', 'profilePicUrl']),
 			tokens: tokens
 		}).send(res);
-	}));
-
-module.exports = router;
+	}));
diff --git a/src/routes/v1/access/logout.ts b/src/routes/v1/access/logout.ts
@@ -3,12 +3,13 @@ import KeystoreRepo from '../../../database/Repository/KeystoreRepo';
 import { ProtectedRequest } from 'app-request';
 import { SuccessMsgResponse } from '../../../core/ApiResponse';
 import asyncHandler from '../../../helpers/asyncHandler';
+import authentication from '../../../auth/authentication';
 
 const router = express.Router();
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for Access Token
-router.use('/', require('../../../auth/authentication'));
+router.use('/', authentication);
 /*-------------------------------------------------------------------------*/
 
 router.delete('/',
@@ -17,4 +18,4 @@ router.delete('/',
 		new SuccessMsgResponse('Logout success').send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/access/signup.ts b/src/routes/v1/access/signup.ts
@@ -38,4 +38,4 @@ router.post('/basic', validator(schema.signup),
 		}).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/access/token.ts b/src/routes/v1/access/token.ts
@@ -60,4 +60,4 @@ router.post('/refresh',
 		new TokenRefreshResponse('Token Issued', tokens.accessToken, tokens.refreshToken).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/blog/blogDetail.ts b/src/routes/v1/blog/blogDetail.ts
@@ -23,4 +23,4 @@ router.get('/id/:id', validator(schema.blogId, ValidationSource.PARAM),
 		return new SuccessResponse('success', blog).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/blog/blogList.ts b/src/routes/v1/blog/blogList.ts
@@ -59,4 +59,4 @@ router.get('/similar/id/:id', validator(schema.blogId, ValidationSource.PARAM),
 		return new SuccessResponse('success', blogs).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/blog/editor.ts b/src/routes/v1/blog/editor.ts
@@ -1,6 +1,6 @@
 import express from 'express';
-import { BadRequestResponse, SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
-import { ProtectedRequest, RoleRequest } from 'app-request';
+import { SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
+import { ProtectedRequest } from 'app-request';
 import { BadRequestError, ForbiddenError } from '../../../core/ApiError';
 import BlogRepo from '../../../database/repository/BlogRepo';
 import { RoleCode } from '../../../database/model/Role';
@@ -9,15 +9,15 @@ import validator, { ValidationSource } from '../../../helpers/validator';
 import schema from './schema';
 import asyncHandler from '../../../helpers/asyncHandler';
 import _ from 'lodash';
+import authentication from '../../../auth/authentication';
+import authorization from '../../../auth/authorization';
+import role from '../../../helpers/role';
 
 const router = express.Router();
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for Access Token and Editor's Role
-router.use('/',
-	require('../../../auth/authentication'),
-	(req: RoleRequest, res, next) => { req.currentRoleCode = RoleCode.EDITOR; next(); },
-	require('../../../auth/authorization'));
+router.use('/', authentication, role(RoleCode.EDITOR), authorization);
 /*-------------------------------------------------------------------------*/
 
 router.put('/publish/:id', validator(schema.blogId, ValidationSource.PARAM),
@@ -87,4 +87,4 @@ router.get('/id/:id', validator(schema.blogId, ValidationSource.PARAM),
 		new SuccessResponse('success', blog).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/blog/writer.ts b/src/routes/v1/blog/writer.ts
@@ -10,15 +10,15 @@ import validator, { ValidationSource } from '../../../helpers/validator';
 import schema from './schema';
 import asyncHandler from '../../../helpers/asyncHandler';
 import _ from 'lodash';
+import authentication from '../../../auth/authentication';
+import authorization from '../../../auth/authorization';
+import role from '../../../helpers/role';
 
 const router = express.Router();
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for writer's role
-router.use('/',
-	require('../../../auth/authentication'),
-	(req: RoleRequest, res, next) => { req.currentRoleCode = RoleCode.WRITER; next(); },
-	require('../../../auth/authorization'));
+router.use('/', authentication, role(RoleCode.WRITER), authorization);
 /*-------------------------------------------------------------------------*/
 
 const formatEndpoint = (endpoint: string) => endpoint.replace(/\s/g, '').replace(/\//g, '-');
@@ -142,4 +142,4 @@ router.get('/id/:id', validator(schema.blogId, ValidationSource.PARAM),
 		new SuccessResponse('success', blog).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/src/routes/v1/index.ts b/src/routes/v1/index.ts
@@ -1,20 +1,30 @@
 import express from 'express';
+import apikey from '../../auth/apikey';
+import signup from './access/signup';
+import login from './access/login';
+import logout from './access/logout';
+import token from './access/token';
+import blogList from './blog/blogList';
+import blogDetail from './blog/blogDetail';
+import writer from './blog/writer';
+import editor from './blog/editor';
+import user from './profile/user';
 
 const app = express();
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are public APIs protected by api-key
-app.use('/', require('../../auth/apikey'));
+app.use('/', apikey);
 /*-------------------------------------------------------------------------*/
 
-app.use('/signup', require('./access/signup'));
-app.use('/login', require('./access/login'));
-app.use('/logout', require('./access/logout'));
-app.use('/token', require('./access/token'));
-app.use('/blogs', require('./blog/blogList'));
-app.use('/blog', require('./blog/blogDetail'));
-app.use('/writer/blog', require('./blog/writer'));
-app.use('/editor/blog', require('./blog/editor'));
-app.use('/profile', require('./profile/user'));
+app.use('/signup', signup);
+app.use('/login', login);
+app.use('/logout', logout);
+app.use('/token', token);
+app.use('/blogs', blogList);
+app.use('/blog', blogDetail);
+app.use('/writer/blog', writer);
+app.use('/editor/blog', editor);
+app.use('/profile', user);
 
-module.exports = app;
+export default app;
diff --git a/src/routes/v1/profile/user.ts b/src/routes/v1/profile/user.ts
@@ -8,6 +8,7 @@ import validator, { ValidationSource } from '../../../helpers/validator';
 import schema from './schema';
 import asyncHandler from '../../../helpers/asyncHandler';
 import _ from 'lodash';
+import authentication from '../../../auth/authentication';
 
 const router = express.Router();
 
@@ -20,7 +21,7 @@ router.get('/public/id/:id', validator(schema.userId, ValidationSource.PARAM),
 
 /*-------------------------------------------------------------------------*/
 // Below all APIs are private APIs protected for Access Token
-router.use('/', require('../../../auth/authentication'));
+router.use('/', authentication);
 /*-------------------------------------------------------------------------*/
 
 router.get('/my',
@@ -42,4 +43,4 @@ router.put('/', validator(schema.profile),
 		return new SuccessResponse('Profile updated', _.pick(user, ['name', 'profilePicUrl', 'roles'])).send(res);
 	}));
 
-module.exports = router;
+export default router;
diff --git a/test/auth/apikey.test.ts b/test/auth/apikey.test.ts
diff --git a/test/dummy.test.ts b/test/dummy.test.ts
diff --git a/tests/auth/apikey.test.ts b/tests/auth/apikey.test.ts
@@ -0,0 +1,8 @@
+// import supertest from 'supertest';
+// import app from '../../src/app';
+// import apikey from '../../src/auth/apikey';
+
+// describe('apikey validation', () => {
+
+// 	it.
+// });
diff --git a/tests/utils/ApiResponse.test.ts b/tests/utils/ApiResponse.test.ts
