Merge pull request #92 from tcet-opensource/development

[Major] Change from common JS to Modern JS

Author: JayeshVP24

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+coverage
+logs
+.env

.eslintrc.cjs

@@ -0,0 +1,38 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+    jest: true
+  },
+  extends: "airbnb-base",
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+  },
+  rules: {
+    "linebreak-style": 0,
+    "no-console": 0,
+    semi: ["error", "always"],
+    quotes: ["error", "double"],
+    "import/prefer-default-export": "off"
+  },
+  "settings": {
+    "import/resolver": {
+      "alias": {
+        "map": [
+          ["#app", "./app.js"],
+          ["#util", "./util.js"],
+          ["#constant", "./constant.js"],
+          ["#routes", "./routes"],
+          ["#models", "./models"],
+          ["#middleware", "./middleware"],
+          ["#controller", "./controller"],
+          ["#services", "./services"],
+          ["#error", "./error"]
+        ],
+        "extensions": [".js"]
+      }
+    }
+  }
+};

.prettierrc

@@ -0,0 +1,4 @@
+{
+    "singleQuote": true,
+    "tabWidth": 2
+}

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:18.15.0
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm ci
+
+COPY . .
+
+EXPOSE 3500
+CMD ["npm", "run", "start"]
+
+
+

app.js

@@ -1,24 +1,30 @@
-const express = require('express');
-const path = require('path');
-const logger = require('morgan');
-const cookieParser = require('cookie-parser');
-const cors = require('cors');
-
-const indexRouter = require('./routes/index');
-const usersRouter = require('./routes/users');
-const authRouter = require('./routes/auth');
+import express from "express";
+import path, { dirname } from "path";
+import morgan from "morgan";
+import cookieParser from "cookie-parser";
+import cors from "cors";
+import { fileURLToPath } from "url";
+import { logger } from "#util";
+import indexRouter from "#routes/index";
+import usersRouter from "#routes/users";
+import authRouter from "#routes/auth";
 
 const app = express();
+const currDirName = dirname(fileURLToPath(import.meta.url));
+
+app.use(morgan(
+  ":remote-addr - :remote-user \":method :url HTTP/:http-version\" :status \":referrer\" \":user-agent\"",
+  { stream: logger.stream },
+));
 
 app.use(cors());
-app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(currDirName, "public")));
 
-app.use('/', indexRouter);
-app.use('/users', usersRouter);
-app.use('/auth', authRouter);
+app.use("/", indexRouter);
+app.use("/users", usersRouter);
+app.use("/auth", authRouter);
 
-module.exports = app;
+export default app;

bin/www

@@ -0,0 +1,94 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+import http from "http";
+import debug from "debug";// ("api:server");
+import dotenv from "dotenv";
+import app from "#app";
+import { logger } from "#util";
+
+dotenv.config();
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+  const port = parseInt(val, 10);
+
+  if (Number.isNaN(port)) {
+    // named pipe
+    return val;
+  }
+
+  if (port >= 0) {
+    // port number
+    return port;
+  }
+
+  return false;
+}
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+const port = normalizePort(process.env.PORT || "3000");
+app.set("port", port);
+
+/**
+ * Create HTTP server.
+ */
+
+const server = http.createServer(app);
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+  if (error.syscall !== "listen") {
+    throw error;
+  }
+
+  const bind = typeof port === "string"
+    ? `Pipe ${port}`
+    : `Port ${port}`;
+
+  // handle specific listen errors with friendly messages
+  switch (error.code) {
+    case "EACCES":
+      logger.error(`${bind} requires elevated privileges`);
+      process.exit(1);
+      break;
+    case "EADDRINUSE":
+      logger.error(`${bind} is already in use`);
+      process.exit(1);
+      break;
+    default:
+      throw error;
+  }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+  const addr = server.address();
+  const bind = typeof addr === "string"
+    ? `pipe ${addr}`
+    : `port ${addr.port}`;
+  debug(`Listening on ${bind}`);
+}
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on("error", onError);
+server.on("listening", onListening);

bin/www.js

@@ -0,0 +1,5 @@
+export const logLevel = {
+  local: "silly",
+  dev: "debug",
+  prod: "info",
+};

constant.js

@@ -1,27 +1,66 @@
-const { genrateToken } = require('../util');
-const user = require('../models/user');
+import util, {logger} from "#util";
+import { authenticateUser, userExists, updatePassword } from "#services/user";
 
-exports.login = async function(req, res, next) {
-	const {id, password} = req.body;
-	let userValidated = await user.validateUser(id, password); 
-	if(userValidated){
-		userDetails = {
-		"uid": userValidated.uid,
-		"name": userValidated.name, 
-		"emailId":userValidated.emailId,
-		"type": userValidated.userType,
-		}
-		let token = genrateToken(userDetails);
-		userDetails["token"] = token;
-		res.send({res:"welcome", user:userDetails})
-	}
-	else{
-		res.status(403)
-		res.send({err:"incorrect ID password"});
-		}
+const otpStore = {};
+
+async function login(req, res) {
+  const { id, password } = req.body;
+  try {
+    const userValidated = await authenticateUser(id, password);
+    const userDetails = {
+      uid: userValidated.uid,
+      name: userValidated.name,
+      emailId: userValidated.emailId,
+      type: userValidated.userType,
+    };
+    const token = util.generateToken(userDetails, req.ip);
+    userDetails.token = token;
+    res.json({ res: "welcome", user: userDetails });
+  } catch (error) {
+    logger.error("Error while login", error)
+    if (error.name === "UserDoesNotExist") {
+      res.status(403);
+      res.json({ err: "Incorrect ID password" });
+    } else {
+      res.status(500);
+      res.json({ err: "Something is wrong on our side. Try again" });
+    }
+  }
+}
+
+function validateUser(req, res) {
+  res.json({ res: req.user, msg: "user validated", err: null });
+}
+
+async function sendOTP(req, res) {
+  const { uid, emailId } = req.body;
+  if (await userExists(uid, emailId)) {
+    const otp = Math.floor(1000 + Math.random() * 9000);
+    otpStore[uid] = otp;
+    util.sendOTP(emailId, otp);
+    res.json({ res: "otp sent to emailID" });
+  } else {
+    res.json({ err: "incorrect UID or emailId" });
+  }
 }
 
-exports.validateUser = function(req, res, next) {
-  res.json({res: req.user, msg: "user validated", err:null})
+async function resetPassword(req, res) {
+  const { uid, otp, password } = req.body;
+  if (otpStore[uid] === otp) {
+    try {
+      await updatePassword(uid, password);
+      res.json({ res: "successfully updated password" });
+    } catch (error) {
+      logger.log("Error while updating", error)
+      res.status(500);
+      if (error.name === "UpdateError") res.json({ err: "Something went wrong while updating password" });
+      else res.json({ err: "something went wrong" });
+    }
+  } else {
+    res.json({ err: "incorrect otp" });
+  }
 }
 
+export default {
+  validateUser, sendOTP, resetPassword, login,
+};