Merge pull request #10 from aayush-05/cleanupCode

Cleanup Code

Author: vaibhavdaren

.env

@@ -1,4 +1,3 @@
-MONGO_USER = "codeuino-user"
-MONGO_PASSWORD = "thisisthewrongpassword"
+DATABASE_URL="mongodb://<username>:<password>@cluster0-shard-00-00.t4hho.mongodb.net:27017,cluster0-shard-00-01.t4hho.mongodb.net:27017,cluster0-shard-00-02.t4hho.mongodb.net:27017/<dbname>?ssl=true&replicaSet=atlas-a80apd-shard-0&authSource=admin&retryWrites=true&w=majority"
 JWT_SECRET = "somesupersecretkey"
 PORT=8000

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules/
+package-lock.json

app.js

@@ -1,85 +1,68 @@
-var createError = require("http-errors");
-var express = require("express");
-var path = require("path");
-var bodyParser = require("body-parser");
-var cookieParser = require("cookie-parser");
-var logger = require("morgan");
-var http = require('http');
-var graphqlHTTP = require("express-graphql");
-var indexRouter = require("./routes/index");
-var usersRouter = require("./routes/users");
-var graphQlSchema = require("./graphql/schema/index");
-var graphQlResolvers = require("./graphql/resolvers/index");
-var isAuth = require("./middleware/is-auth");
-var Topic = require("./models/topic")
-var User = require('./models/user');
-const { topics } = require("./graphql/resolvers/index");
+const createError = require("http-errors");
+const express = require("express");
+const path = require("path");
+const isAuth = require("./middleware/is-auth");
+const bodyParser = require("body-parser");
+const cookieParser = require("cookie-parser");
+const morgan = require("morgan");
+const cors = require("cors");
+const http = require("http");
+const graphqlHTTP = require("express-graphql");
+const graphQlSchema = require("./graphql/schema/index");
+const graphQlResolvers = require("./graphql/resolvers/index");
+const Topic = require("./models/topic");
+const User = require("./models/user");
+const Message = require("./models/message");
 require("./config/mongoose");
-var app = express();
 
-var server = http.createServer(app);
-var io = require("socket.io")(server);
+const app = express();
+const server = http.createServer(app);
+const io = require("socket.io")(server);
 
-
-app.use((req, res, next) => {
-  res.setHeader("Access-Control-Allow-Origin", "*");
-  res.setHeader("Access-Control-Allow-Methods", "POST,GET,OPTIONS");
-  res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-  if (req.method === "OPTIONS") {
-    res.sendStatus(200);
-  }
-  next();
-});
-
-app.set("views", path.join(__dirname, "views"));
-app.set("view engine", "pug");
-
-app.use(logger("dev"));
+app.use(cors());
+app.use(morgan("dev"));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(bodyParser.json());
 app.use(express.static(path.join(__dirname, "public")));
-
 app.use(isAuth);
-app.use("/", indexRouter);
-app.use("/users", usersRouter);
 
 io.sockets.on("connection", function (socket, client) {
-  console.log("client connected!")
-  socket.on('room', function(room){
+  console.log("client connected!");
+  socket.on("room", function (room) {
     socket.join(room);
-    console.log(`Someone joined the room: ${room}`)
-  })
+    console.log(`Someone joined the room: ${room}`);
+  });
   socket.on("newMessage", async (data) => {
     try {
-        console.log(data);
-        Topic.findById(data.topicId, async function(err,Topic){
-          if(err){
-            throw new Error (err);
+      console.log(Topic);
+      await Topic.findById(data.topicId, async function (err, Topic) {
+        if (err) {
+          throw new Error(err);
+        }
+        let user = await User.findById(data.userId, function (err, user) {
+          if (err) {
+            throw new Error(err);
           }
-          let user = await User.findById(data.userId, function(err,user){
-            if (err){
-              throw new Error(err)
-            }
-            return user.username;
-          })
-          console.log(user.username);
-          let newChat = {
-            username: user.username,
-            replyTo: data.replyTo,
-            description: data.description,
-            userId: user._id,
-          }
-          Topic.chats.push(newChat)
-          await Topic.save();
-          io.to(data.topicId).emit('newChat', Topic.chats.pop())
-        })
-
-    } catch{
-        console.log('Error')
+          return user.username;
+        });
+        let message = new Message({
+          userId: user._id,
+          replyTo: data.replyTo,
+          description: data.description,
+          likes: data.likes,
+        });
+        await message.save();
+        console.log(Topic);
+        Topic.chats.push(message);
+        await Topic.save();
+        io.to(data.topicId).emit("message", Topic.chats.pop());
+      });
+    } catch {
+      console.log(err);
     }
-})
+  });
 });
 
 app.use(
@@ -103,4 +86,4 @@ app.use(function (err, req, res, next) {
   res.render("error");
 });
 
-module.exports = {app:app, server:server};
+module.exports = { app: app, server: server };

bin/www

@@ -3,27 +3,27 @@
  * Module dependencies.
  */
 
-var app = require('../app').app;
-var debug = require('debug')('community-forum-backend:server');
+var app = require("../app").app;
+var debug = require("debug")("spansberry-backend:server");
 
 /**
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '8000');
-app.set('port', port);
+var port = normalizePort(process.env.PORT || "8000");
+app.set("port", port);
 
 /**
  * Create HTTP server.
  */
-var server = require('../app').server
+var server = require("../app").server;
 /**
  * Listen on provided port, on all network interfaces.
  */
 
 server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
+server.on("error", onError);
+server.on("listening", onListening);
 
 /**
  * Normalize a port into a number, string, or false.
@@ -50,22 +50,20 @@ function normalizePort(val) {
  */
 
 function onError(error) {
-  if (error.syscall !== 'listen') {
+  if (error.syscall !== "listen") {
     throw error;
   }
 
-  var bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
+  var bind = typeof port === "string" ? "Pipe " + port : "Port " + port;
 
   // handle specific listen errors with friendly messages
   switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
+    case "EACCES":
+      console.error(bind + " requires elevated privileges");
       process.exit(1);
       break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
+    case "EADDRINUSE":
+      console.error(bind + " is already in use");
       process.exit(1);
       break;
     default:
@@ -79,10 +77,8 @@ function onError(error) {
 
 function onListening() {
   var addr = server.address();
-  var bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
+  var bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port;
+  debug("Listening on " + bind);
 }
 
-module.exports = server;
+module.exports = server;

config/mongoose.js

@@ -1,15 +1,16 @@
-const mongoose = require('mongoose');
-require('dotenv').config();
+const mongoose = require("mongoose");
+require("dotenv").config();
 
-mongoose.connect(`mongodb://${process.env.MONGO_USER}:${process.env.MONGO_PASSWORD}@anonymous-project-shard-00-00-e0dq9.mongodb.net:27017,anonymous-project-shard-00-01-e0dq9.mongodb.net:27017,anonymous-project-shard-00-02-e0dq9.mongodb.net:27017/<test_codeuino>?ssl=true&replicaSet=Anonymous-Project-shard-0&authSource=admin&retryWrites=true&w=majority`, {
-  useNewUrlParser: true,
-  useCreateIndex: true,
-  useUnifiedTopology: true,
-  useFindAndModify: false
-})
+mongoose
+  .connect(process.env.DATABASE_URL, {
+    useNewUrlParser: true,
+    useCreateIndex: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+  })
   .then(() => {
-    console.log('mongodb connection successful')
+    console.log("mongodb connection successful");
   })
   .catch((err) => {
-    console.log('mongodb connection error', err)
-  })
+    console.log("mongodb connection error", err);
+  });

graphql/resolvers/auth.js

@@ -1,46 +1,58 @@
 const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
-require('dotenv').config();
+require("dotenv").config();
 const User = require("../../models/user");
 
 module.exports = {
   createUser: async (args) => {
     try {
       const existingUser = await User.findOne({ email: args.userInput.email });
       if (existingUser) {
-        throw new Error("User exist already.");
+        throw Error("User is already registered");
       }
       const user = new User({
         email: args.userInput.email,
         password: args.userInput.password,
         username: args.userInput.username,
       });
-      const result = await user.save();
-      return { ...result._doc, password: null };
+      const saveUser = await user.save();
+      return { ...saveUser._doc };
     } catch (err) {
+      console.log(err);
       throw err;
     }
   },
   login: async (args) => {
-    const user = await User.findOne({ email: args.email });
-    if (!user) {
-      throw new Error("User not found");
-    }
-    const isequal = await bcrypt.compare(args.password, user.password);
-    if (!isequal) {
-      throw new Error("Password is Incorrect");
-    }
-    const token = jwt.sign(
-      {
-        userId: user.id,
-        email: user.email,
-        username: user.username
-      },
-      `${process.env.JWT_TOKEN}`,
-      {
-        expiresIn: "1h",
+    try {
+      const user = await User.findOne({ email: args.email });
+      if (!user) {
+        throw new Error("User not registered");
+      }
+      const isequal = await bcrypt.compare(args.password, user.password);
+      if (!isequal) {
+        throw new Error("Incorrect password provided");
       }
-    );
-    return { userId: user.id, token: token, tokenexpiration: 1, username:user.username};
+      const token = jwt.sign(
+        {
+          userId: user.id,
+          email: user.email,
+          username: user.username,
+        },
+        `${process.env.JWT_SECRET}`,
+        {
+          algorithm: "HS256",
+          expiresIn: "1h",
+        }
+      );
+      return {
+        userId: user.id,
+        username: user.username,
+        token: token,
+        tokenexpiration: 1,
+      };
+    } catch (err) {
+      console.log(err);
+      throw err;
+    }
   },
 };

graphql/resolvers/category.js

@@ -4,24 +4,26 @@ module.exports = {
   categories: async () => {
     try {
       let categories = await Category.find();
-      return categories.map((result) => {
-        return { ...result._doc };
+      return categories.map((category) => {
+        return { ...category._doc };
       });
     } catch (err) {
+      console.log(err);
       throw err;
     }
   },
-  createCategories: async (args,req) => {
-    if(!req.isAuth){
-      throw new Error('Not Authenticated!')
+  createCategories: async (args, req) => {
+    if (!req.isAuth) {
+      throw new Error("Please login to continue");
     }
     try {
       let category = new Category({
         categoryName: args.categoryInput.categoryName,
       });
-      let result = await category.save();
-      return { ...result._doc };
+      let saveCategory = await category.save();
+      return { ...saveCategory._doc };
     } catch (err) {
+      console.log(err);
       throw err;
     }
   },

graphql/resolvers/index.js

@@ -1,11 +1,13 @@
-const topicResolver = require('./topic');
-const categoryResolver = require('./category');
-const authResolver = require('./auth')
+const topicResolver = require("./topic");
+const categoryResolver = require("./category");
+const authResolver = require("./auth");
+const messageResolver = require("./message");
 
 const rootResolver = {
+  ...messageResolver,
   ...topicResolver,
   ...categoryResolver,
-  ...authResolver
-}
+  ...authResolver,
+};
 
-module.exports = rootResolver;
+module.exports = rootResolver;