Merge pull request #18 from afteracademy/upgrade-libs

upgrade all libs

Author: janishar

.eslintrc

@@ -1,11 +1,10 @@
 {
   "rules": {
-    "semi": ["error", "always"],
-    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/naming-convention": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-use-before-define": "off"
+    "@typescript-eslint/explicit-function-return-types": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off"
   },
   "extends": [
     "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin

.gitignore

@@ -2,7 +2,6 @@
 .idea
 
 # ignore vs code project config files
-.vscode/settings.json
 .vs
 
 # ignore logs

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "javascript.validate.enable": true,
+  "typescript.preferences.importModuleSpecifier": "relative",
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": false,
+  "editor.tabSize": 2,
+  "typescript.validate.enable": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

package-lock.json

@@ -6,12 +6,14 @@
   "scripts": {
     "start": "npm run build && npm run serve",
     "serve": "node -r dotenv/config build/server.js",
-    "build": "npm run build-ts",
+    "build": "npm run clean && npm run build-ts",
     "watch": "concurrently -k -p \"[{name}]\" -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold,green.bold\" \"npm run watch-ts\" \"npm run watch-node\"",
     "watch-node": "nodemon -r dotenv/config build/server.js",
+    "clean": "rimraf ./build",
     "build-ts": "tsc",
     "watch-ts": "tsc -w",
     "eslint": "eslint . --ext .js,.ts",
+    "upgrade": "npm update --save-dev && npm update --save",
     "test": "jest --forceExit --detectOpenHandles --coverage --verbose"
   },
   "repository": {
@@ -22,48 +24,48 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "bcrypt": "^4.0.1",
+    "bcrypt": "^5.0.0",
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "express": "^4.17.1",
-    "helmet": "^3.21.3",
+    "helmet": "^4.1.1",
     "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.15",
-    "mongoose": "^5.9.5",
-    "winston": "^3.2.1",
-    "winston-daily-rotate-file": "^4.4.2"
+    "lodash": "^4.17.20",
+    "mongoose": "^5.10.11",
+    "winston": "^3.3.3",
+    "winston-daily-rotate-file": "^4.5.0"
   },
   "devDependencies": {
     "@types/bcrypt": "^3.0.0",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
-    "@types/cors": "^2.8.6",
-    "@types/express": "^4.17.3",
-    "@types/hapi__joi": "^16.0.12",
-    "@types/helmet": "0.0.45",
-    "@types/jest": "^25.1.4",
-    "@types/jsonwebtoken": "^8.3.8",
-    "@types/lodash": "^4.14.149",
-    "@types/mongoose": "^5.7.7",
-    "@types/morgan": "^1.9.0",
-    "@types/node": "^13.9.3",
-    "@types/supertest": "^2.0.8",
-    "@typescript-eslint/eslint-plugin": "^2.29.0",
-    "@typescript-eslint/parser": "^2.29.0",
+    "@types/cors": "^2.8.8",
+    "@types/express": "^4.17.8",
+    "@types/hapi__joi": "^17.1.6",
+    "@types/helmet": "^4.0.0",
+    "@types/jest": "^26.0.15",
+    "@types/jsonwebtoken": "^8.5.0",
+    "@types/lodash": "^4.14.163",
+    "@types/mongoose": "^5.7.36",
+    "@types/morgan": "^1.9.2",
+    "@types/node": "^14.14.6",
+    "@types/supertest": "^2.0.10",
+    "@typescript-eslint/eslint-plugin": "^4.6.0",
+    "@typescript-eslint/parser": "^4.6.0",
     "colors": "^1.4.0",
+    "concurrently": "^5.3.0",
     "dotenv": "^8.2.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "jest": "^25.2.1",
-    "nodemon": "^2.0.2",
-    "prettier": "^2.0.5",
-    "supertest": "^4.0.2",
-    "ts-jest": "^25.2.1",
-    "ts-node": "^8.8.1",
+    "eslint": "^7.12.1",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "jest": "^26.6.1",
+    "nodemon": "^2.0.6",
+    "prettier": "^2.1.2",
+    "supertest": "^6.0.0",
+    "ts-jest": "^26.4.3",
+    "ts-node": "^9.0.0",
     "tslint": "^6.1.0",
-    "typescript": "^3.8.3",
-    "concurrently": "^5.3.0"
+    "typescript": "^4.0.5"
   }
 }

package.json

@@ -12,6 +12,7 @@ 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 apiKey = await ApiKeyRepo.findByKey(req.apiKey);

src/auth/apikey.ts

@@ -5,7 +5,7 @@ import { Types } from 'mongoose';
 import User from '../database/model/User';
 import { tokenInfo } from '../config';
 
-export const getAccessToken = (authorization: string) => {
+export const getAccessToken = (authorization?: string) => {
   if (!authorization) throw new AuthFailureError('Invalid Authorization');
   if (!authorization.startsWith('Bearer ')) throw new AuthFailureError('Invalid Authorization');
   return authorization.split(' ')[1];

src/auth/authUtils.ts

@@ -3,20 +3,20 @@ export const environment = process.env.NODE_ENV;
 export const port = process.env.PORT;
 
 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,
+  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 || '',
 };
 
 export const corsUrl = process.env.CORS_URL;
 
 export const tokenInfo = {
-  accessTokenValidityDays: parseInt(process.env.ACCESS_TOKEN_VALIDITY_DAYS),
-  refreshTokenValidityDays: parseInt(process.env.REFRESH_TOKEN_VALIDITY_DAYS),
-  issuer: process.env.TOKEN_ISSUER,
-  audience: process.env.TOKEN_AUDIENCE,
+  accessTokenValidityDays: parseInt(process.env.ACCESS_TOKEN_VALIDITY_SEC || '0'),
+  refreshTokenValidityDays: parseInt(process.env.REFRESH_TOKEN_VALIDITY_SEC || '0'),
+  issuer: process.env.TOKEN_ISSUER || '',
+  audience: process.env.TOKEN_AUDIENCE || '',
 };
 
 export const logDirectory = process.env.LOG_DIR;

src/config.ts

@@ -35,7 +35,7 @@ abstract class ApiResponse {
   private static sanitize<T extends ApiResponse>(response: T): T {
     const clone: T = {} as T;
     Object.assign(clone, response);
-    // delete {some_field};
+    // @ts-ignore
     delete clone.status;
     for (const i in clone) if (typeof clone[i] === 'undefined') delete clone[i];
     return clone;
@@ -49,14 +49,14 @@ export class AuthFailureResponse extends ApiResponse {
 }
 
 export class NotFoundResponse extends ApiResponse {
-  private url: string;
+  private url: string | undefined;
 
   constructor(message = 'Not Found') {
     super(StatusCode.FAILURE, ResponseStatus.NOT_FOUND, message);
   }
 
   send(res: Response): Response {
-    this.url = res.req.originalUrl;
+    this.url = res.req?.originalUrl;
     return super.prepare<NotFoundResponse>(res, this);
   }
 }

src/core/ApiResponse.ts

@@ -8,7 +8,7 @@ export default interface Blog extends Document {
   title: string;
   description: string;
   text?: string;
-  draftText: string;
+  draftText?: string;
   tags: string[];
   author: User;
   imgUrl?: string;