Dev

.gitignore

@@ -8,3 +8,4 @@ node_modules
 .env
 
 ServiceAccount.json
+.vercel

controllers/beneficiaries.controllers.js

@@ -68,6 +68,7 @@ const editBeneficiary = async (req, res) => {
     try {
         const beneficiaryId = req.params?.beneficiaryId;
         console.log(req.body);
+
         if (beneficiaryId) {
             const beneficiary = Beneficiary.findByIdAndUpdate(
                 beneficiaryId,

controllers/users.controllers.js

@@ -1,13 +1,13 @@
 const { ObjectId } = require("mongoose").Types;
-const admin = require("../firebase");
+const auth = require("../firebase");
 
 const User = require("../models/User.js");
 
 const createUser = async (req, res) => {
     try {
         //needed in case we need to add validation stuff in the future
         const { firebaseUID, firstName, lastName, joinDate, level } = req.body;
-
+        console.log("ADDING USER");
         const newUser = await User.create(req.body);
         await newUser.save();
 
@@ -139,19 +139,17 @@ const deleteUser = async (req, res) => {
 const createFirebaseUser = (req, res) => {
     // TODO: encrypt this bro
     const { email, pass } = req.body;
-    admin
-        .auth()
-        .createUser({
-            email: email,
-            password: pass,
-        })
+    auth.createUser({
+        email: email,
+        password: pass,
+    })
         .then((userRecord) => {
             console.log("Successfully created user");
             console.log(userRecord);
             res.send(userRecord);
         })
         .catch((error) => {
-            console.log("Error, error");
+            console.log(error);
         });
 };
 

firebase.js

@@ -1,20 +1,21 @@
 // const admin = require("firebase-admin");
 // const serviceAccount = require("./ServiceAccount.json");
-// const {getAuth} = require('firebase-admin/auth')
+// const { getAuth } = require('firebase-admin/auth')
 
 // admin.initializeApp({
 //     credential: admin.credential.cert(serviceAccount),
 // });
 
 // module.exports = admin;
 // TODO: figure out the difference between above and below
+
 const { initializeApp, cert } = require("firebase-admin/app");
 const { getAuth } = require("firebase-admin/auth");
-
-const serviceAccount = require("./ServiceAccount.json");
+//const admin = require("firebase-admin");
+// const serviceAccount = require("./ServiceAccount.json");
 
 const app = initializeApp({
-    credential: cert(serviceAccount),
+    credential: cert(JSON.parse(process.env.VERCEL_URI)),
 });
 
 const auth = getAuth(app);

app.js → index.js

@@ -3,7 +3,7 @@ const cors = require("cors");
 const helmet = require("helmet");
 const connectDB = require("./config/database.js");
 
-const PORT = 3000;
+const PORT = process.env.VERCEL_URL || 3000;
 
 const app = express();
 
@@ -13,6 +13,7 @@ connectDB(); // Connect to MongoDB
 app.use(express.json());
 app.use(cors());
 app.use(helmet());
+// app.use(express.static('public'))
 
 // Routers
 app.use("/assessments", require("./routes/assessments.router.js"));

middleware/verifyAdmin.js

@@ -33,9 +33,10 @@ const verifyAdmin = async (req, res, next) => {
 };
 
 const checkAdminStatus = async (uid, token) => {
+    console.log("checkAdmin function starting");
     try {
         const res = await fetch(
-            `http://localhost:3000/users?firebaseUID=${uid}`,
+            `https://hfc-backend-delta.vercel.app/users?firebaseUID=${uid}`,
             {
                 headers: {
                     "Content-Type": "application/json",

models/Beneficiary.js

@@ -83,6 +83,45 @@ const BeneficiarySchema = new Schema({
     photo: {
         type: String, // change this when we know how to store photos
     },
+    hasBankAccountIntake: {
+        type: Boolean,
+    },
+    hasBankAccountCompletion: {
+        type: Boolean,
+    },
+    englishLvlIntake: {
+        type: Number,
+    },
+    englishLvlCompletion: {
+        type: Number,
+    },
+    computerSkillsIntake: {
+        type: Number,
+    },
+    computerSkillsCompletion: {
+        type: Number,
+    },
+    emotionalWellnessIntake: {
+        type: Number,
+    },
+    emotionalWellnessCompletion: {
+        type: Number,
+    },
+    incomeIntake: {
+        type: Number,
+    },
+    incomeCompletion: {
+        type: Number,
+    },
+    savingsIntake: {
+        type: Number,
+    },
+    savingsCompletion: {
+        type: Number,
+    },
+    hasFoundWorkCompletion: {
+        type: Boolean,
+    },
 });
 
 module.exports = Beneficiary = mongoose.model(

package.json

@@ -2,10 +2,10 @@
     "name": "hfc-backend",
     "version": "1.0.0",
     "description": "",
-    "main": "app.js",
+    "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "nodemon app.js",
+        "start": "node index.js",
         "format": "prettier --write \"**/*.{js,jsx,json,css,md}\""
     },
     "lint-staged": {
@@ -32,6 +32,7 @@
         "express": "^4.18.2",
         "firebase-admin": "^11.5.0",
         "helmet": "^6.0.1",
+        "i": "^0.3.7",
         "mongoose": "^6.7.2"
     },
     "devDependencies": {

vercel.json

@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "builds": [
+        {
+            "src": "*.js",
+            "use": "@vercel/node"
+        }
+    ],
+    "routes": [
+        {
+            "src": "/(.*)",
+            "dest": "/"
+        }
+    ]
+}