From 022a85e211c74deec7db2c6784eb32bb611696e3 Mon Sep 17 00:00:00 2001
From: xfarrow <ale99napoli@icloud.com>
Date: Wed, 27 Sep 2023 15:07:40 +0200
Subject: [PATCH] Update api.js

---
 backend/api.js | 76 ++++++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/backend/api.js b/backend/api.js
index 51125fe..d63bbed 100644
--- a/backend/api.js
+++ b/backend/api.js
@@ -3,24 +3,25 @@
 **  licensed under GPLv3
 */
 
-
 const express = require('express');
-const { Client } = require('pg');
 const bcrypt = require('bcrypt');
+const { Pool } = require('pg');
 
 const app = express();
 const port = 3000;
 
-
 // Middleware which parses JSON for POST requests
 app.use(express.json());
 
-// Sample data (an array of items)
-const items = [
-  { id: 1, name: 'Item 1' },
-  { id: 2, name: 'Item 2' },
-  { id: 3, name: 'Item 3' },
-];
+const pool = new Pool({
+  user: 'postgres',
+  host: 'localhost',
+  database: 'Blink',
+  password: 'postgres',
+  port: 5432,
+  max: 10, 
+  idleTimeoutMillis: 30000,
+});
 
 // Define a route to get all items
 app.get('/api/items', (req, res) => {
@@ -32,25 +33,21 @@ app.post('/api/register', (req, res) => {
   const userData = req.body;
   
   // Ensure that the required fields are present before proceeding
-  if (!userData.display_name || !userData.email) {
+  if (!userData.display_name || !userData.email || !userData.password) {
     return res.status(400).json("Invalid request");
   }
 
-  // Create a PostgreSQL client
-  const client = new Client({
-    user: 'postgres',
-    host: 'localhost',
-    database: 'Blink',
-    password: 'postgres',
-    port: 5432, // Default PostgreSQL port
-  });
-
-  client.connect()
-    .then(() => {
-      // SQL query with placeholders for parameters
-      const insertQuery = `
-        INSERT INTO "User" (display_name, date_of_birth, place_of_living, is_looking_for_job, email)
-        VALUES ($1, $2, $3, $4, $5)
+  bcrypt.hash(userData.password, 10, (err, hashedPassword) => {
+    if (err) {
+      console.error('Error hashing password:', err);
+    } else {
+      // Acquire a connection from the pool
+      pool.connect()
+      .then((client) => {
+        // SQL query with placeholders for parameters
+        const insertQuery = `
+        INSERT INTO "User" (display_name, date_of_birth, place_of_living, is_looking_for_job, email, password)
+        VALUES ($1, $2, $3, $4, $5, $6)
         RETURNING *`; // Return the inserted row
 
       return client.query(insertQuery, [
@@ -58,21 +55,28 @@ app.post('/api/register', (req, res) => {
         userData.date_of_birth,
         userData.place_of_living,
         userData.is_looking_for_job,
-        userData.email
-      ]);
-    })
-    .then((result) => {
-      // Respond with the inserted user data
-      res.status(200).json(result.rows[0]);
+        userData.email,
+        hashedPassword
+      ])
+      .then((result) => {
+        // Respond with the inserted user data
+        res.status(200).json(result.rows[0]);
+      })
+      .catch((error) => {
+        console.error('Error inserting data:', error);
+        res.status(500).json("Internal server error");
+      })
+      .finally(() => {
+        // Release the connection back to the pool
+        client.release();
+      });
     })
     .catch((error) => {
-      console.error('Error inserting data:', error);
+      console.error('Error acquiring a connection from the pool:', error);
       res.status(500).json("Internal server error");
-    })
-    .finally(() => {
-      // Close the database connection
-      client.end();
     });
+  }
+});
 });
 
 // Start the server