13/3

Author: Nisreen Oweidat

src/app.js

@@ -5,8 +5,7 @@ const logger = require("morgan");
 const swaggerUi = require("swagger-ui-express");
 const YAML = require("yamljs");
 const swaggerDocument = YAML.load("./docs/swagger.yaml");
-const bcrypt = require("bcrypt");
-const jwt = require("jsonwebtoken");
+
 
 const indexRouter = require("./routes/index");
 const pokemonRouter = require("./routes/pokemon");

src/controllers/pokemon.js

@@ -75,7 +75,15 @@ exports.deletePokemon = (req, res) => {
 };
 
 
-// //update
+// create 
+
+exports.createPokemon = (req, res) => {
+  const newPokemon = req.body;
+  pokedex.push(newPokemon);
+  res.status(201).json(newPokemon); 
+}
+
+//update
 
 exports.updatePokemon = (req, res) => {
   const id = req.params.id;
@@ -87,11 +95,3 @@ exports.updatePokemon = (req, res) => {
   res.json(pokedex[index]);
 };    
 
-
-// create 
-
-exports.createPokemon = (req, res) => {
-  const newPokemon = req.body;
-  pokedex.push(newPokemon);
-  res.status(201).json(newPokemon); 
-}

src/middleware/authMiddleware.js

@@ -2,19 +2,19 @@
 
 const jwt = require("jsonwebtoken");
 
-const SECRET_KEY = "your_secret_key"; 
+const SECRET_KEY = "nisreen`s token"; 
 
 
 exports.authenticateUser = (req, res, next) => {
-    const token = req.header("Authorization");
+    const token = req.header("Authorization"); // Get the token from the request header 
 
     if (!token) {
         return res.status(403).json({ error: "Access denied" });
     }
 
     try {
-        const decoded = jwt.verify(token.replace("Bearer ", ""), SECRET_KEY);
-        req.user = decoded;
+        const decoded = jwt.verify(token.replace("Bearer ", ""), SECRET_KEY); // splite the token from Bearer
+        req.user = decoded; 
         next();
     } catch (err) {
         res.status(401).json({ error: "Invalid token" });

src/routes/auth.js

@@ -1,14 +1,14 @@
 const express = require("express");
-const jwt = require("jsonwebtoken");
-const bcrypt = require("bcryptjs");
+const jwt = require("jsonwebtoken"); // for generating token
+const bcrypt = require("bcryptjs"); // for encrypting password
 
 const router = express.Router();
 
 const users = [];
 
 const SECRET_KEY = "your_secret_key";
 
-router.post("/signup", async (req, res) => {
+router.post("/signup", async (req, res) => { // create new user
     const { username, password } = req.body;
 
 
@@ -24,7 +24,7 @@ router.post("/signup", async (req, res) => {
 });
 
 
-router.post("/login", async (req, res) => {
+router.post("/login", async (req, res) => { // normal login 
     const { username, password } = req.body;
     const user = users.find(user => user.username === username);
 

src/routes/pokemon.js

@@ -15,17 +15,17 @@ router.get("/name/:name", pokemonControllers.getName);
 router.get("/:id", pokemonControllers.getId);
 
 
-//login
-router.post("/", authenticateUser);
+//user
+router.post("/", authenticateUser); // authenticate user middleware 
 
-router.put("/:id", authenticateUser);
+router.put("/:id", authenticateUser); 
 
 router.delete("/:id", authenticateUser);
 
-// router.delete("/:id", pokemonControllers.deletePokemon);
+router.delete("/:id", pokemonControllers.deletePokemon);
 
-// router.put("/:id", pokemonControllers.updatePokemon);
+router.put("/:id", pokemonControllers.updatePokemon);
 
-// router.post("/", pokemonControllers.createPokemon);
+router.post("/", pokemonControllers.createPokemon); 
 
 module.exports = router;