fix(classes): fix fetching user response

Author: rhahao

index.js

@@ -16,11 +16,11 @@ import { Announcements } from "./src/classes/Announcements.js";
 const PORT = process.env.PORT || 8000;
 const APP_VERSION = process.env.npm_package_version;
 
-app.listen(PORT, async () => {
-  await Announcements.loadAll();
-  await Users.loadAll();
-  await Congregations.loadAll();
-  await CongregationRequests.loadAll();
+await Announcements.loadAll();
+await Users.loadAll();
+await Congregations.loadAll();
+await CongregationRequests.loadAll();
 
+app.listen(PORT, async () => {
   logger("info", JSON.stringify({ details: `server up and running (v${APP_VERSION})` }));
 });

package-lock.json

@@ -16,6 +16,7 @@ export class Congregation {
   cong_sourceMaterial_draft = [];
   cong_schedule_draft = [];
   cong_swsPocket = [];
+  cong_settings;
   last_backup = {};
 
   constructor() {}
@@ -36,6 +37,7 @@ export class Congregation {
     cong.cong_sourceMaterial_draft = congSnap.data().cong_sourceMaterial_draft || [];
     cong.cong_schedule_draft = congSnap.data().cong_schedule_draft || [];
     cong.cong_swsPocket = congSnap.data().cong_swsPocket || [];
+    cong.cong_settings = congSnap.data().cong_settings || [];
     cong.members = [];
 
     const usersList = Users.list;
@@ -107,10 +109,10 @@ export class Congregation {
 
       const obj = {
         cong_persons: decryptedPersons,
-        cong_schedule: cong_schedule_draft,
-        cong_sourceMaterial: cong_sourceMaterial_draft,
-        cong_swsPocket: cong_swsPocket,
-        cong_settings: cong_settings,
+        cong_schedule: this.cong_schedule_draft,
+        cong_sourceMaterial: this.cong_sourceMaterial_draft,
+        cong_swsPocket: this.cong_swsPocket,
+        cong_settings: this.cong_settings,
       };
 
       return obj;

src/classes/Congregation.js

@@ -1,13 +1,13 @@
-import { getAuth } from 'firebase-admin/auth';
-import { getFirestore } from 'firebase-admin/firestore';
-import { decryptData } from '../utils/encryption-utils.js';
-import { sendVerificationEmail } from '../utils/sendEmail.js';
-import { User } from './User.js';
+import { getAuth } from "firebase-admin/auth";
+import { getFirestore } from "firebase-admin/firestore";
+import { decryptData } from "../utils/encryption-utils.js";
+import { sendVerificationEmail } from "../utils/sendEmail.js";
+import { User } from "./User.js";
 
 const db = getFirestore(); //get default database
 
 const getUsers = async () => {
-  const userRef = db.collection('users');
+  const userRef = db.collection("users");
   const snapshot = await userRef.get();
 
   const tmpUsers = [];
@@ -42,12 +42,12 @@ class clsUsers {
 
   findUserByEmail = (email) => {
     const found = this.list.find((user) => user.user_uid === email);
-    return { ...found };
+    return found;
   };
 
   findUserById = (id) => {
     const found = this.list.find((user) => user.id === id);
-    return { ...found };
+    return found;
   };
 
   findUserByOTPCode = (code) => {
@@ -73,7 +73,7 @@ class clsUsers {
 
   findPocketUser = (pocketId) => {
     const found = this.list.find((user) => user.pocket_local_id === pocketId);
-    return { ...found };
+    return found;
   };
 
   findPocketByVisitorId = async (visitorId) => {
@@ -110,18 +110,18 @@ class clsUsers {
     const data = {
       about: {
         name: fullname,
-        role: 'vip',
+        role: "vip",
         user_uid: userEmail,
       },
     };
 
-    await db.collection('users').add(data);
+    await db.collection("users").add(data);
 
     await this.loadAll();
   };
 
   delete = async (userId, authId) => {
-    await db.collection('users').doc(userId).delete();
+    await db.collection("users").doc(userId).delete();
 
     // remove from auth if qualified
     if (authId) await getAuth().deleteUser(authId);

src/classes/Users.js

@@ -39,7 +39,7 @@ export const updateTracker = () => {
 
           log.method = req.method;
           log.status = res.statusCode;
-          log.path = req.path;
+          log.path = req.headers['x-original-uri'];
           log.origin = req.headers.origin || req.hostname;
           if (clientIp) log.ip = clientIp;
           log.details = res.locals.message.replace(/\n|\r/g, "");
@@ -55,7 +55,7 @@ export const updateTracker = () => {
 
           log.method = req.method;
           log.status = res.statusCode;
-          log.path = req.path;
+          log.path = req.headers['x-original-uri'];
           log.origin = req.headers.origin || req.hostname;
           if (clientIp) log.ip = clientIp;
           log.details = "this request was aborted";

src/middleware/update-tracker.js

@@ -7,7 +7,7 @@ export const formatLog = (message, req, res) => {
     const clientIp = requestIp.getClientIp(req);
     log.method = req.method;
     log.status = res.statusCode;
-    log.path = res.originalUrl;
+    log.path = req.headers["x-original-uri"];
     log.origin = req.headers.origin || req.hostname;
     if (clientIp) log.ip = clientIp;
   }