feat: user can set a custom url code

app.js

@@ -1,83 +1,83 @@
-const express = require("express");
-const mongoose = require("mongoose");
-const bodyParser = require("body-parser");
-const cors = require("cors");
-
-const url = require("./routes/api/url");
-const users = require("./routes/api/users");
-const auth = require("./routes/api/auth");
-
-const Url = require("./models/url");
-
-const app = express();
-
-app.use(express.urlencoded({ extended: false }));
-app.use(express.json());
-app.use(cors());
-
-require('dotenv').config();
-
-mongoose
-  .connect(
-    process.env.MONGODB_URL,
-    {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-      useCreateIndex: true,
-    }
-  )
-  .then(() => {
-    console.log("MongoDb connected.....");
-  })
-  .catch((err) => {
-    console.log("Cannot connect to db due to " + err);
-  });
-
-app.use("/api/urls", url);
-app.use("/api/register", users);
-app.use("/api/login", auth);
-
-app.get("/:code", async (req, res) => {
-  try {
-    const url = await Url.findOne({ code: req.params.code });
-
-    if (url) {
-      if (
-        url.lastDate &&
-        url.lastDate.toISOString() < new Date().toISOString()
-      ) {
-        const user = await User.findById(url.creator);
-
-        for (let i = 0; i < user.shortenedUrl.length; i++) {
-          if (user.shortenedUrl[i].toString() === id) {
-            user.shortenedUrl.splice(i, 1);
-            break;
-          }
-        }
-        await user.save();
-        await url.deleteOne();
-        return res
-          .status(404)
-          .json({ msg: "This Compress URL does not exist any more!" });
-      }
-      if (!url.status) {
-        return res
-          .status(200)
-          .json({ msg: "This url is temporarily out of service!" });
-      }
-
-      url.clicks = url.clicks + 1;
-      url.save();
-      return res.redirect(url.longUrl);
-    } else {
-      return res.status(404).json({ msg: "No Compressed URL Found" });
-    }
-  } catch (err) {
-    console.log(err);
-    res.status(500).json({ msg: "Internal Server Error" });
-  }
-});
-
-const port = process.env.PORT || 5000;
-
-app.listen(port, () => console.log(`Server Started on port ${port}`));
+const express = require("express");
+const mongoose = require("mongoose");
+const bodyParser = require("body-parser");
+const cors = require("cors");
+
+const url = require("./routes/api/url");
+const users = require("./routes/api/users");
+const auth = require("./routes/api/auth");
+
+const Url = require("./models/url");
+
+const app = express();
+
+app.use(express.urlencoded({ extended: false }));
+app.use(express.json());
+app.use(cors());
+
+require('dotenv').config();
+
+mongoose
+  .connect(
+    process.env.MONGODB_URL,
+    {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+      useCreateIndex: true,
+    }
+  )
+  .then(() => {
+    console.log("MongoDb connected.....");
+  })
+  .catch((err) => {
+    console.log("Cannot connect to db due to " + err);
+  });
+
+app.use("/api/urls", url);
+app.use("/api/register", users);
+app.use("/api/login", auth);
+
+app.get("/:code", async (req, res) => {
+	try {
+		const url = await Url.findOne({ code: req.params.code });
+
+		if (url) {
+			if (
+				url.lastDate &&
+				url.lastDate.toISOString() < new Date().toISOString()
+			) {
+				const user = await User.findById(url.creator);
+
+				for (let i = 0; i < user.shortenedUrl.length; i++) {
+					if (user.shortenedUrl[i].toString() === id) {
+						user.shortenedUrl.splice(i, 1);
+						break;
+					}
+				}
+				await user.save();
+				await url.deleteOne();
+				return res
+					.status(404)
+					.json({ msg: "This Compress URL does not exist any more!" });
+			}
+			if (!url.status) {
+				return res
+					.status(200)
+					.json({ msg: "This url is temporarily out of service!" });
+			}
+
+			url.clicks = url.clicks + 1;
+			url.save();
+			return res.redirect(url.longUrl);
+		} else {
+			return res.status(404).json({ msg: "No Compressed URL Found" });
+		}
+	} catch (err) {
+		console.log(err);
+		res.status(500).json({ msg: "Internal Server Error" });
+	}
+});
+
+const port = process.env.PORT || 5000;
+
+app.listen(port, () => console.log(`Server Started on port ${port}`));

routes/api/url.js

@@ -35,19 +35,9 @@ router.post("/compress", middleAuth, async (req, res) => {
     return res.status(400).send({ msg: "Invalid Base Url" });
   }
 
-  let urlCode;
-  if (customCode) {
-    urlCode = customCode;
-
-    if (await Url.findOne({ code: urlCode })) {
-      return res.status(409).send({ msg: "This code is already in use, try another code" });
-    };
-
-  } else {
-    urlCode = shortId.generate();
-  }
-
   if (validUrl.isUri(longUrl)) {
+
+
     try {
       let url = await Url.findOne({ longUrl: longUrl });
 
@@ -56,6 +46,18 @@ router.post("/compress", middleAuth, async (req, res) => {
           .status(400)
           .send({ msg: "Compressed URL already exists", url: url.shortUrl });
       } else {
+        let urlCode;
+        if (customCode) {
+        urlCode = customCode;
+
+        if (await Url.findOne({ code: urlCode })) {
+          return res.status(409).send({ msg: "This code is already in use, try another code" });
+        };
+
+        } else {
+          urlCode = shortId.generate();
+        }
+
         const shortUrl = baseUrl + "/" + urlCode;
 
         url = new Url({

routes/api/users.js

@@ -5,13 +5,23 @@ const jwt = require("jsonwebtoken");
 
 const User = require("../../models/user");
 
+const { validatePassword, validateEmail } = require("../../validators/validators");
+
 router.post("/", async (req, res) => {
   const { name, email, password } = req.body;
 
   if (!name || !email || !password) {
     return res.status(400).send({ msg: "Please enter all fields" });
   }
 
+  if (!validateEmail(email)) {
+    return res.status(400).send({ msg: "Invalid email address format specified" });
+  }
+
+  if (!validatePassword(password)) {
+    return res.status(400).send({ msg: "Password must be at least 8 characters in length and must contain at least 1 lowercase letter, 1 uppercase letter, 1 numeric digit, and 1 special character" });
+  }
+
   const existingUser = await User.findOne({ email });
   if (existingUser) {
     res.status(400).send({ msg: "Already registered user with this email" });

validators/validators.js

@@ -0,0 +1,22 @@
+const validatePassword = (password) => {
+    // 1 special character
+    // 1 digit
+    // 1 lowercase character
+    // 1 uppercase character
+    const passwordRegex = /^(?=.*[^A-Za-z0-9])(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$/;
+
+    return passwordRegex.test(password);
+};
+
+const validateEmail = (email) => {
+    // from https://emailregex.com/
+    // claims to match 99.99% of all email addresses
+    const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+    return emailRegex.test(email);
+};
+
+module.exports = {
+    validatePassword,
+    validateEmail,
+};