Merge pull request #13 from blockchainuci/task-3-branch-from-task-2

Task 3 branch from task 2

backend/middleware/index.js

@@ -0,0 +1,28 @@
+const admin = require("../config/firebase-config");
+
+class Middleware {
+    async decodeToken(req, res, next) {
+        let token;
+        if (req.headers.authorization) {
+            token = req.headers.authorization.split(" ")[1];
+        }
+
+        if (!token || token == "Bearer") {
+            return res.status(401).json({ message: "Firebase ID token not provided" });
+        }
+
+        try {
+            const decodeValue = await admin.auth().verifyIdToken(token);
+            if (decodeValue) {
+                req.user = decodeValue; // Attach user info to request
+                return next();
+            }
+            return res.status(403).json({ message: "Unauthorized access" });
+        } catch (error) {
+            console.error(error);
+            return res.status(500).json({ message: "Internal server error" });
+        }
+    }
+}
+
+module.exports = new Middleware();

backend/routes/carbon.js

@@ -1,9 +1,10 @@
 const express = require("express");
 const router = express.Router();
 const pool = require("../db");
+const middleware = require("../middleware");
 
 // Create carbon data
-router.post("/", async (req, res) => {
+router.post("/", middleware.decodeToken, async (req, res) => {
   try {
     const {
       item_id,
@@ -117,7 +118,7 @@ router.get("/:id", async (req, res) => {
 });
 
 // Update carbon data
-router.put("/:id", async (req, res) => {
+router.put("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     const {
@@ -171,7 +172,7 @@ router.put("/:id", async (req, res) => {
 });
 
 // Delete carbon data
-router.delete("/:id", async (req, res) => {
+router.delete("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     const deleteCarbon = await pool.query(

backend/routes/items.js

@@ -2,14 +2,15 @@ const express = require("express");
 const router = express.Router();
 const pool = require("../db");
 const OpenAI = require("openai");
+const middleware = require("../middleware");
 
 // Initialize OpenAI configuration
 const openai = new OpenAI({
   apiKey: process.env.OPEN_AI_API_KEY,
 });
 
 // Create item with GPT-generated details using vision
-router.post("/", async (req, res) => {
+router.post("/", middleware.decodeToken, async (req, res) => {
   try {
     const {
       name,
@@ -182,7 +183,8 @@ router.get("/:id", async (req, res) => {
 });
 
 // Update item
-router.put("/:id", async (req, res) => {
+
+router.put("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     const {
@@ -217,7 +219,7 @@ router.put("/:id", async (req, res) => {
 });
 
 // Delete item
-router.delete("/:id", async (req, res) => {
+router.delete("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     await pool.query("DELETE FROM items WHERE id = $1", [id]);
@@ -229,7 +231,7 @@ router.delete("/:id", async (req, res) => {
 });
 
 // Emission Calculator
-router.post("/emission-calculator", async (req, res) => {
+router.post("/emission-calculator", middleware.decodeToken, async (req, res) => {
   try {
     const {
       estimated_weight_kg,

backend/routes/lenders.js

@@ -1,8 +1,9 @@
 const router = require("express").Router();
 const pool = require("../db");
+const middleware = require("../middleware");
 
 // Create lender record
-router.post("/", async (req, res) => {
+router.post("/", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id, email } = req.body;
     const newLender = await pool.query(
@@ -63,7 +64,7 @@ router.get("/:item_id", async (req, res) => {
 });
 
 // Update lender status
-router.put("/:item_id", async (req, res) => {
+router.put("/:item_id", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id } = req.params;
     const { is_picked_up, is_returned } = req.body;
@@ -125,7 +126,7 @@ router.put("/:item_id", async (req, res) => {
 });
 
 // Delete lender record
-router.delete("/:item_id", async (req, res) => {
+router.delete("/:item_id", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id } = req.params;
     await pool.query("DELETE FROM lender WHERE item_id = $1", [item_id]);

backend/routes/renters.js

@@ -1,8 +1,9 @@
 const router = require("express").Router();
 const pool = require("../db");
+const middleware = require("../middleware");
 
 // Create renter record
-router.post("/", async (req, res) => {
+router.post("/", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id, email } = req.body;
     const newRenter = await pool.query(
@@ -63,7 +64,7 @@ router.get("/:item_id", async (req, res) => {
 });
 
 // Update renter status
-router.put("/:item_id", async (req, res) => {
+router.put("/:item_id", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id } = req.params;
     const { is_picked_up, is_returned } = req.body;
@@ -125,7 +126,7 @@ router.put("/:item_id", async (req, res) => {
 });
 
 // Delete renter record
-router.delete("/:item_id", async (req, res) => {
+router.delete("/:item_id", middleware.decodeToken, async (req, res) => {
   try {
     const { item_id } = req.params;
     await pool.query("DELETE FROM renter WHERE item_id = $1", [item_id]);

backend/routes/users.js

@@ -1,8 +1,9 @@
 const router = require("express").Router();
 const pool = require("../db");
+const middleware = require("../middleware");
 
 // Create user
-router.post("/", async (req, res) => {
+router.post("/", middleware.decodeToken, async (req, res) => {
   try {
     const { email, wallet_address } = req.body;
     const newUser = await pool.query(
@@ -40,7 +41,7 @@ router.get("/:id", async (req, res) => {
 });
 
 // Update user
-router.put("/:id", async (req, res) => {
+router.put("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     const { email, wallet_address } = req.body;
@@ -56,7 +57,7 @@ router.put("/:id", async (req, res) => {
 });
 
 // Delete user
-router.delete("/:id", async (req, res) => {
+router.delete("/:id", middleware.decodeToken, async (req, res) => {
   try {
     const { id } = req.params;
     await pool.query("DELETE FROM users WHERE id = $1", [id]);

frontend/src/contexts/AuthContext.jsx

@@ -1,5 +1,6 @@
 import { createContext, useContext, useState, useEffect } from "react";
 import { auth } from "../firebase";
+import { getAuth } from "firebase/auth";
 
 const AuthContext = createContext();
 
@@ -31,3 +32,12 @@ export function AuthProvider({ children }) {
     </AuthContext.Provider>
   );
 }
+
+export async function getBearerToken() {
+    const auth = getAuth();
+    const user = auth.currentUser;
+    if (user) {
+        return await user.getIdToken();
+    }
+    return null;
+}

frontend/src/pages/ChatPage.jsx

@@ -12,7 +12,7 @@ import {
 } from "@chakra-ui/react";
 import { useState, useEffect, useRef } from "react";
 import axios from "axios";
-import { io } from "socket.io-client";
+//import { io } from "socket.io-client";
 
 
 /* Sample Data */

frontend/src/pages/CheckoutPage.jsx

@@ -12,6 +12,7 @@ import {
 import { useState, useEffect } from "react";
 import { auth } from "../firebase";
 import axios from "axios";
+import { getBearerToken } from "../contexts/AuthContext";
 
 function CheckoutPage() {
   const { id } = useParams();
@@ -75,17 +76,28 @@ function CheckoutPage() {
 
   const handleSubmitPayment = async () => {
     try {
+      const token = await getBearerToken();
       // First update the item with days_rented
       await axios.put(`http://localhost:3001/items/${id}`, {
         ...item, // Spread existing item properties
         days_rented: days, // Add the new days_rented value
         status: "Awaiting Pickup",
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
       });
 
       // Then create renter record
       await axios.post("http://localhost:3001/renters", {
         item_id: parseInt(id),
         email: userEmail,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
       });
 
       // Navigate to confirmation page

frontend/src/pages/LendPage.jsx

@@ -21,6 +21,7 @@ import {
   FaTree,
   FaEye,
 } from "react-icons/fa";
+import { getBearerToken } from "../contexts/AuthContext";
 
 function LendPage() {
   const [items, setItems] = useState([]);
@@ -83,10 +84,16 @@ function LendPage() {
   }, [userEmail]);
 
   const handlePickupConfirmation = async (itemId) => {
+    const token = await getBearerToken();
     try {
       await axios.put(`http://localhost:3001/lenders/${itemId}`, {
         is_picked_up: true,
         is_returned: false,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       // Navigate to waiting page
@@ -99,9 +106,15 @@ function LendPage() {
 
   const handleReturnConfirmation = async (itemId) => {
     try {
+      const token = await getBearerToken();
       await axios.put(`http://localhost:3001/lenders/${itemId}`, {
         is_picked_up: true,
         is_returned: true,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       // Navigate to waiting page

frontend/src/pages/ListItemPage.jsx

@@ -19,7 +19,7 @@ import { getStorage, ref, uploadBytes, getDownloadURL } from "firebase/storage";
 import { storage, auth } from "../firebase";
 import axios from "axios";
 import { useNavigate } from "react-router-dom";
-
+import { getBearerToken } from "../contexts/AuthContext";
 function ListItemPage() {
   const [images, setImages] = useState([]);
   const [imageFiles, setImageFiles] = useState(Array(4).fill(null));
@@ -91,7 +91,7 @@ function ListItemPage() {
         alert("Please fill in all required fields");
         return;
       }
-
+      const token = await getBearerToken();
       // Create item in database with email
       const response = await axios.post(`http://localhost:3001/items`, {
         name,
@@ -102,6 +102,11 @@ function ListItemPage() {
         images,
         email: userEmail,
         status: "Listed",
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       alert("Item listed successfully");

frontend/src/pages/RentPage.jsx

@@ -21,6 +21,7 @@ import {
   FaTree,
   FaEye,
 } from "react-icons/fa";
+import { getBearerToken } from "../contexts/AuthContext";
 
 function RentPage() {
   const [items, setItems] = useState([]);
@@ -80,10 +81,16 @@ function RentPage() {
   }, [userEmail]);
 
   const handlePickupConfirmation = async (itemId) => {
+    const token = await getBearerToken();
     try {
       await axios.put(`http://localhost:3001/renters/${itemId}`, {
         is_picked_up: true,
         is_returned: false,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       // Navigate to waiting page
@@ -95,10 +102,16 @@ function RentPage() {
   };
 
   const handleReturnConfirmation = async (itemId) => {
+    const token = await getBearerToken();
     try {
       await axios.put(`http://localhost:3001/renters/${itemId}`, {
         is_picked_up: true,
         is_returned: true,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       // Navigate to waiting page

frontend/src/pages/SignUpPage.jsx

@@ -4,6 +4,7 @@ import { auth } from "../firebase";
 import { createUserWithEmailAndPassword } from "firebase/auth";
 import { useNavigate } from "react-router-dom";
 import axios from "axios";
+import { getBearerToken } from "../contexts/AuthContext";
 import { FcGoogle } from "react-icons/fc";
 import { signInWithPopup } from "firebase/auth";
 import { provider } from "../firebase";
@@ -29,12 +30,19 @@ function SignUpPage() {
 
     try {
       // First, create the Firebase auth user
+      await createUserWithEmailAndPassword(auth, email, password);
+      const token = await getBearerToken();
       const result = await signInWithPopup(auth, provider);
 
       // Then, add user to your database using axios
       await axios.post("http://localhost:3001/users", {
         email: email,
         wallet_address: "0x742d35Cc6634C0532925a3b844Bc454e4438f44e", // Hard-coded wallet address
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       });
 
       navigate("/");