update all files

Author: janishar

.env.example

@@ -3,6 +3,9 @@
 # Environment Name
 NODE_ENV=development
 
+# TimeZone
+TZ=UTC
+
 # Server listen to this port
 PORT=3000
 
@@ -11,17 +14,19 @@ CORS_URL=*
 
 # Databse 
 # YOUR_MONGO_DB_NAME
-DB_NAME=afteracademy-blog-db 
+DB_NAME=blogs-db
+DB_MIN_POOL_SIZE=2
+DB_MAX_POOL_SIZE=5
 
 #localhost or IP of the server
 # If using the docker installation then use 'mongo' for host name else localhost or ip or db server
 #YOUR_MONGO_DB_HOST_NAME 
-DB_HOST=mongo
+DB_HOST=localhost
 
 DB_PORT=27017
 
 #YOUR_MONGO_DB_USER_NAME
-DB_USER=afteracademy-blog-db-user
+DB_USER=blogs-db-user
 
 #YOUR_MONGO_DB_USER_PWD
 DB_USER_PWD=changeit
@@ -36,7 +41,9 @@ DB_ADMIN_PWD=changeit
 # LOG_DIR=YOUR_DIRECTORY_PATH_FOR_LOG_FILES 
 
 # Token Info
-ACCESS_TOKEN_VALIDITY_DAYS=30
-REFRESH_TOKEN_VALIDITY_DAYS=120
-TOKEN_ISSUER=afteracademy.com
-TOKEN_AUDIENCE=afteracademy.com
+# 2 DAYS: 172800 Sec
+ACCESS_TOKEN_VALIDITY_SEC=172800
+# 7 DAYS: 604800 Sec
+REFRESH_TOKEN_VALIDITY_SEC=604800
+TOKEN_ISSUER=api.dev.xyz.com
+TOKEN_AUDIENCE=xyz.com

.gitignore

@@ -22,4 +22,16 @@ coverage
 
 # Environment varibles
 *.env
-*.env.*
+*.env.test
+
+#keys
+keys/*
+!keys/*.md
+!keys/*.example
+
+#temp
+temp
+.DS_Store
+
+*.save
+*.save.*

src/app.ts

@@ -1,10 +1,9 @@
 import express, { Request, Response, NextFunction } from 'express';
 import Logger from './core/Logger';
-import bodyParser from 'body-parser';
 import cors from 'cors';
 import { corsUrl, environment } from './config';
 import './database'; // initialize database
-import { NotFoundError, ApiError, InternalError } from './core/ApiError';
+import { NotFoundError, ApiError, InternalError, ErrorType } from './core/ApiError';
 import routesV1 from './routes/v1';
 
 process.on('uncaughtException', (e) => {
@@ -13,8 +12,8 @@ process.on('uncaughtException', (e) => {
 
 const app = express();
 
-app.use(bodyParser.json({ limit: '10mb' }));
-app.use(bodyParser.urlencoded({ limit: '10mb', extended: true, parameterLimit: 50000 }));
+app.use(express.json({ limit: '10mb' }));
+app.use(express.urlencoded({ limit: '10mb', extended: true, parameterLimit: 50000 }));
 app.use(cors({ origin: corsUrl, optionsSuccessStatus: 200 }));
 
 // Routes
@@ -28,10 +27,13 @@ app.use((req, res, next) => next(new NotFoundError()));
 app.use((err: Error, req: Request, res: Response, next: NextFunction) => {
   if (err instanceof ApiError) {
     ApiError.handle(err, res);
+    if (err.type === ErrorType.INTERNAL)
+      Logger.error(`500 - ${err.message} - ${req.originalUrl} - ${req.method} - ${req.ip}`);
   } else {
+    Logger.error(`500 - ${err.message} - ${req.originalUrl} - ${req.method} - ${req.ip}`);
+    Logger.error(err);
     if (environment === 'development') {
-      Logger.error(err);
-      return res.status(500).send(err.message);
+      return res.status(500).send(err);
     }
     ApiError.handle(new InternalError(), res);
   }

src/auth/apikey.ts

@@ -6,19 +6,21 @@ import { PublicRequest } from 'app-request';
 import schema from './schema';
 import validator, { ValidationSource } from '../helpers/validator';
 import asyncHandler from '../helpers/asyncHandler';
+import { Header } from '../core/utils';
 
 const router = express.Router();
 
 export default router.use(
   validator(schema.apiKey, ValidationSource.HEADER),
   asyncHandler(async (req: PublicRequest, res, next) => {
-    // @ts-ignore
-    req.apiKey = req.headers['x-api-key'].toString();
+    const key = req.headers[Header.API_KEY]?.toString();
+    if (!key) throw new ForbiddenError();
 
-    const apiKey = await ApiKeyRepo.findByKey(req.apiKey);
+    const apiKey = await ApiKeyRepo.findByKey(key);
+    if (!apiKey) throw new ForbiddenError();
     Logger.info(apiKey);
 
-    if (!apiKey) throw new ForbiddenError();
+    req.apiKey = apiKey;
     return next();
   }),
 );

src/auth/authUtils.ts

@@ -37,7 +37,7 @@ export const createTokens = async (
       tokenInfo.audience,
       user._id.toString(),
       accessTokenKey,
-      tokenInfo.accessTokenValidityDays,
+      tokenInfo.accessTokenValidity,
     ),
   );
 
@@ -49,7 +49,7 @@ export const createTokens = async (
       tokenInfo.audience,
       user._id.toString(),
       refreshTokenKey,
-      tokenInfo.refreshTokenValidityDays,
+      tokenInfo.refreshTokenValidity,
     ),
   );
 

src/auth/authentication.ts

@@ -25,7 +25,7 @@ export default router.use(
       if (!user) throw new AuthFailureError('User not registered');
       req.user = user;
 
-      const keystore = await KeystoreRepo.findforKey(req.user._id, payload.prm);
+      const keystore = await KeystoreRepo.findforKey(req.user, payload.prm);
       if (!keystore) throw new AuthFailureError('Invalid access token');
       req.keystore = keystore;
 

src/auth/authorization.ts

@@ -8,17 +8,25 @@ const router = express.Router();
 
 export default router.use(
   asyncHandler(async (req: ProtectedRequest, res, next) => {
-    if (!req.user || !req.user.roles || !req.currentRoleCode)
+    if (!req.user || !req.user.roles || !req.currentRoleCodes)
       throw new AuthFailureError('Permission denied');
 
-    const role = await RoleRepo.findByCode(req.currentRoleCode);
-    if (!role) throw new AuthFailureError('Permission denied');
+    const roles = await RoleRepo.findByCodes(req.currentRoleCodes);
+    if (roles.length === 0) throw new AuthFailureError('Permission denied');
 
-    const validRoles = req.user.roles.filter(
-      (userRole) => userRole._id.toHexString() === role._id.toHexString(),
-    );
+    let authorized = false;
 
-    if (!validRoles || validRoles.length == 0) throw new AuthFailureError('Permission denied');
+    for (const userRole of req.user.roles) {
+      if (authorized) break;
+      for (const role of roles) {
+        if (userRole._id.equals(role._id)) {
+          authorized = true;
+          break;
+        }
+      }
+    }
+
+    if (!authorized) throw new AuthFailureError('Permission denied');
 
     return next();
   }),

src/auth/schema.ts

@@ -1,10 +1,11 @@
-import Joi from '@hapi/joi';
+import Joi from 'joi';
+import { Header } from '../core/utils';
 import { JoiAuthBearer } from '../helpers/validator';
 
 export default {
   apiKey: Joi.object()
     .keys({
-      'x-api-key': Joi.string().required(),
+      [Header.API_KEY]: Joi.string().required(),
     })
     .unknown(true),
   auth: Joi.object()

src/config.ts

@@ -1,20 +1,23 @@
 // Mapper for environment variables
 export const environment = process.env.NODE_ENV;
 export const port = process.env.PORT;
+export const timezone = process.env.TZ;
 
 export const db = {
   name: process.env.DB_NAME || '',
   host: process.env.DB_HOST || '',
   port: process.env.DB_PORT || '',
   user: process.env.DB_USER || '',
   password: process.env.DB_USER_PWD || '',
+  minPoolSize: parseInt(process.env.DB_MIN_POOL_SIZE || '5'),
+  maxPoolSize: parseInt(process.env.DB_MAX_POOL_SIZE || '10'),
 };
 
 export const corsUrl = process.env.CORS_URL;
 
 export const tokenInfo = {
-  accessTokenValidityDays: parseInt(process.env.ACCESS_TOKEN_VALIDITY_SEC || '0'),
-  refreshTokenValidityDays: parseInt(process.env.REFRESH_TOKEN_VALIDITY_SEC || '0'),
+  accessTokenValidity: parseInt(process.env.ACCESS_TOKEN_VALIDITY_SEC || '0'),
+  refreshTokenValidity: parseInt(process.env.REFRESH_TOKEN_VALIDITY_SEC || '0'),
   issuer: process.env.TOKEN_ISSUER || '',
   audience: process.env.TOKEN_AUDIENCE || '',
 };

src/core/ApiError.ts

@@ -9,7 +9,7 @@ import {
   ForbiddenResponse,
 } from './ApiResponse';
 
-enum ErrorType {
+export enum ErrorType {
   BAD_TOKEN = 'BadTokenError',
   TOKEN_EXPIRED = 'TokenExpiredError',
   UNAUTHORIZED = 'AuthFailureError',