fix(api): handle few undefined variables in classes

package.json

@@ -11,6 +11,11 @@
   "author": "",
   "license": "ISC",
   "type": "module",
+  "eslintConfig": {
+    "extends": [
+      "react-app"
+    ]
+  },
   "dependencies": {
     "@fingerprintjs/fingerprintjs-pro-server-api": "^1.4.0",
     "@logtail/node": "^0.1.14",
@@ -44,6 +49,8 @@
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.2",
     "@semantic-release/git": "^10.0.1",
+    "eslint": "^8.29.0",
+    "eslint-config-react-app": "^7.0.1",
     "find-unused-exports": "^5.0.0",
     "nodemon": "^2.0.20"
   }

src/classes/Announcements.js

@@ -80,7 +80,7 @@ class clsAnnouncements {
       await announcementRef.delete();
     }
 
-    const newList = list.filter((announcement) => announcement.id !== id);
+    const newList = this.list.filter((announcement) => announcement.id !== id);
     this.list = newList;
     return newList;
   };

src/classes/Congregation.js

@@ -1,6 +1,7 @@
 import { FieldValue, getFirestore } from "firebase-admin/firestore";
 import randomstring from "randomstring";
 import { decryptData, encryptData } from "../utils/encryption-utils.js";
+import { Congregations } from "./Congregations.js";
 import { Users } from "./Users.js";
 
 const db = getFirestore(); //get default database
@@ -125,7 +126,8 @@ export class Congregation {
     const userRef = db.collection("users").doc(userId);
     await userRef.update({ congregation: FieldValue.delete() });
 
-    await this.loadDetails();
+    await Users.loadAll()
+    await Congregations.loadAll()
   };
 
   addUser = async (userId) => {
@@ -138,7 +140,8 @@ export class Congregation {
 
     await db.collection("users").doc(userId).set(data, { merge: true });
 
-    await this.loadDetails();
+    await Users.loadAll()
+    await Congregations.loadAll()
   };
 
   updateUserRole = async (userId, userRole) => {
@@ -151,7 +154,8 @@ export class Congregation {
 
     await db.collection("users").doc(userId).set(data, { merge: true });
 
-    await this.loadDetails();
+    await Users.loadAll()
+    await Congregations.loadAll()
   };
 
   createPocketUser = async (pocketName, pocketId) => {
@@ -173,7 +177,8 @@ export class Congregation {
       },
     });
 
-    await this.loadDetails();
+    await Users.loadAll()
+    await Congregations.loadAll()
 
     return code;
   };
@@ -226,6 +231,7 @@ export class Congregation {
       cong_sourceMaterial: newSource,
     });
 
-    await this.loadDetails(this.id);
+    await Users.loadAll()
+    await Congregations.loadAll()
   };
 }

src/classes/User.js

@@ -3,7 +3,7 @@ import { FieldValue, getFirestore } from "firebase-admin/firestore";
 import * as OTPAuth from "otpauth";
 import randomstring from "randomstring";
 import { decryptData, encryptData } from "../utils/encryption-utils.js";
-import { sendUserResetPassword } from "../utils/sendEmail.js";
+import { sendUserResetPassword, sendVerificationEmail } from "../utils/sendEmail.js";
 import { Congregations } from "./Congregations.js";
 import { Users } from "./Users.js";
 
@@ -282,7 +282,8 @@ export class User {
   assignCongregation = async (congInfo) => {
     try {
       await db.collection("users").doc(this.id).set(congInfo, { merge: true });
-      await this.loadDetails(id);
+
+      await Users.loadAll()
       await Congregations.loadAll();
     } catch (err) {
       throw new Error(err.message);
@@ -309,7 +310,7 @@ export class User {
 
   resetPassword = async () => {
     const resetLink = await getAuth().generatePasswordResetLink(this.user_uid);
-    sendUserResetPassword(this.user_uid, user.username, resetLink);
+    sendUserResetPassword(this.user_uid, this.username, resetLink);
   };
 
   revokeToken = async () => {
@@ -341,7 +342,7 @@ export class User {
     };
     await db.collection("users").doc(this.id).update(data);
 
-    await this.loadDetails();
+    await Users.loadAll();
   };
 
   makeAdmin = async () => {
@@ -369,8 +370,7 @@ export class User {
 
     await db.collection("users").doc(this.id).update({ "congregation.devices": updatedDevices });
 
-    await this.loadDetails();
-
+    await Users.loadAll()
     await Congregations.loadAll();
   };
 

src/middleware/sws-pocket-auth-checker.js

@@ -1,5 +1,5 @@
-// dependencies
 import { check, validationResult } from "express-validator";
+import { Users } from "../classes/Users.js";
 
 export const pocketAuthChecker = () => {
   return async (req, res, next) => {

src/middleware/visitor-checker.js

@@ -27,7 +27,7 @@ export const visitorChecker = () => {
       const user = await Users.findUserByEmail(email);
 
       if (user) {
-        const { id, disabled } = user;
+        const { disabled } = user;
 
         // remove expired sessions
         await user.removeExpiredSession();

src/routes/public.js

@@ -1,5 +1,4 @@
 import express from "express";
-import { check } from "express-validator";
 import { getSchedules } from "../controllers/public-controller.js";
 
 const router = express.Router();