feat(public): update parser for source materials

Author: rhahao

CONTRIBUTING.md

@@ -59,10 +59,14 @@ Environment variables are required in order to locally run this API. Please find
 
 ### Starting the Development Server
 
-You are now ready to start the development server, and interact with the API.
+- Run `npm run dev` to start the development server, and interact with the API.
 
-- Run `npm run dev` to start the server.
-- Pleae note that when you are working with the front end applications, the congregation request is automatically approved.
+### Creating Your Congregation Account
+
+As each development server will start with a new and clean Firebase Emulator instance, you have to create your user and congregation account.
+
+- When creating user account, the use of authenticator app is optional. When required, the OTP code is printed on the dev console. If you still want to use authenticator app, you have to delete and create a new account each time you run the dev server.
+- The congregation request is automatically approved.
 
 ## Sending a Pull Request (PR)
 

README.md

@@ -13,7 +13,7 @@ Get active source materials using EPUB file downloaded on the fly from JW.ORG.
 
 #### `lang`
 
-Language code of the materials you want to fetch. Currently, only English (`e`) and Malagasy (`mg`) are supported.
+Language code of the materials you want to fetch.
 
 #### Response
 

package-lock.json

@@ -40,7 +40,7 @@
     "geoip-lite": "^1.4.6",
     "helmet": "^6.0.1",
     "is-online": "^10.0.0",
-    "jw-epub-parser": "^1.29.0",
+    "jw-epub-parser": "^1.30.0-alpha.7",
     "node-2fa": "^2.0.3",
     "node-fetch": "^3.3.0",
     "nodemailer": "^6.8.0",

package.json

@@ -24,46 +24,46 @@ import { errorHandler, getAppVersion, getRoot, invalidEndpointHandler } from './
 
 // allowed apps url
 const whitelist = [
-  'https://alpha-sws-pocket.web.app',
-  'https://alpha-sws-pocket.firebaseapp.com',
-  'https://sws-pocket.web.app',
-  'https://sws-pocket.firebaseapp.com',
-  'https://lmm-oa-sws.web.app',
-  'https://lmm-oa-sws.firebaseapp.com',
-  'https://sws-apps-dev.web.app',
-  'https://sws-apps-dev.firebaseapp.com',
-  'https://sws2apps-tools.web.app',
-  'https://sws2apps-tools.firebaseapp.com',
+	'https://alpha-sws-pocket.web.app',
+	'https://alpha-sws-pocket.firebaseapp.com',
+	'https://sws-pocket.web.app',
+	'https://sws-pocket.firebaseapp.com',
+	'https://lmm-oa-sws.web.app',
+	'https://lmm-oa-sws.firebaseapp.com',
+	'https://sws-apps-dev.web.app',
+	'https://sws-apps-dev.firebaseapp.com',
+	'https://sws2apps-tools.web.app',
+	'https://sws2apps-tools.firebaseapp.com',
 ];
 
 const allowedUri = ['/app-version', '/api/public/source-material'];
 
 const corsOptionsDelegate = function (req, callback) {
-  var corsOptions;
-
-  if (process.env.NODE_ENV === 'production') {
-    const reqOrigin = req.header('Origin');
-    if (reqOrigin) {
-      if (whitelist.indexOf(reqOrigin) !== -1) {
-        corsOptions = { origin: true }; // reflect (enable) the requested origin in the CORS response
-      } else {
-        const originalUri = req.headers['x-original-uri'];
-
-        if (originalUri === '/') {
-          corsOptions = { origin: true }; // allow CORS for index route
-        } else {
-          const allowed = allowedUri.find((uri) => uri.startsWith(originalUri)) ? true : false;
-          corsOptions = { origin: allowed };
-        }
-      }
-    } else {
-      corsOptions = { origin: false };
-    }
-  } else {
-    corsOptions = { origin: true }; // allow cors during dev
-  }
-
-  callback(null, corsOptions); // callback expects two parameters: error and options
+	var corsOptions;
+
+	if (process.env.NODE_ENV === 'production') {
+		const reqOrigin = req.header('Origin');
+		if (reqOrigin) {
+			if (whitelist.indexOf(reqOrigin) !== -1) {
+				corsOptions = { origin: true }; // reflect (enable) the requested origin in the CORS response
+			} else {
+				const originalUri = req.headers['x-original-uri'];
+
+				if (originalUri === '/') {
+					corsOptions = { origin: true }; // allow CORS for index route
+				} else {
+					const allowed = allowedUri.find((uri) => uri.startsWith(originalUri)) ? true : false;
+					corsOptions = { origin: allowed };
+				}
+			}
+		} else {
+			corsOptions = { origin: false };
+		}
+	} else {
+		corsOptions = { origin: true }; // allow cors during dev
+	}
+
+	callback(null, corsOptions); // callback expects two parameters: error and options
 };
 
 const app = express();
@@ -84,13 +84,13 @@ app.use(requestChecker());
 app.use(updateTracker());
 
 app.use(
-  rateLimit({
-    windowMs: 1000,
-    max: 20,
-    message: JSON.stringify({
-      message: 'TOO_MANY_REQUESTS',
-    }),
-  })
+	rateLimit({
+		windowMs: 1000,
+		max: 20,
+		message: JSON.stringify({
+			message: 'TOO_MANY_REQUESTS',
+		}),
+	})
 );
 
 app.use('/', authRoute);

src/app.js

@@ -116,8 +116,10 @@ Congregation.prototype.saveBackup = async function (
 		this.cong_sourceMaterial_draft = cong_sourceMaterial;
 		this.cong_swsPocket = cong_swsPocket;
 		this.cong_settings = cong_settings;
-		this.last_backup.by = userInfo.username;
-		this.last_backup.date = data.last_backup.date;
+		this.last_backup = {
+			by: userInfo.username,
+			date: data.last_backup.date,
+		};
 	} catch (error) {
 		throw new Error(error.message);
 	}
@@ -148,6 +150,7 @@ Congregation.prototype.removeUser = async function (userId) {
 	user.cong_id = '';
 	user.cong_name = '';
 	user.cong_number = '';
+	user.cong_role = [];
 
 	// update congregation members
 	this.reloadMembers();

src/classes/Congregation.js

@@ -119,6 +119,28 @@ User.prototype.updatePocketMembers = async function (members) {
 	try {
 		await db.collection('users').doc(this.id).update({ 'congregation.pocket_members': members });
 		this.pocket_members = members;
+
+		// update cong members
+		const cong = congregations.findCongregationById(this.cong_id);
+		cong.reloadMembers();
+	} catch (error) {
+		throw new Error(error.message);
+	}
+};
+
+User.prototype.updatePocketLocalId = async function (id) {
+	try {
+		if (id !== '') {
+			await db.collection('users').doc(this.id).update({ 'congregation.local_id': id });
+		} else {
+			await db.collection('users').doc(this.id).update({ 'congregation.local_id': FieldValue.delete() });
+		}
+
+		this.pocket_local_id = id;
+
+		// update cong members
+		const cong = congregations.findCongregationById(this.cong_id);
+		cong.reloadMembers();
 	} catch (error) {
 		throw new Error(error.message);
 	}
@@ -212,7 +234,7 @@ User.prototype.adminLogout = async function () {
 User.prototype.generateSecret = async function () {
 	try {
 		const isProd = process.env.NODE_ENV === 'production';
-		
+
 		if (this.secret && this.secret !== '') {
 			const decryptedData = JSON.parse(decryptData(this.secret));
 			return decryptedData;
@@ -423,4 +445,10 @@ User.prototype.updateSessionsInfo = async function (visitorid) {
 	await db.collection('users').doc(this.id).update({ 'about.sessions': newSessions });
 
 	this.sessions = newSessions;
+
+	// update cong members
+	if (this.cong_id !== '') {
+		const cong = congregations.findCongregationById(this.cong_id);
+		cong.reloadMembers();
+	}
 };

src/classes/User.js

@@ -3,6 +3,8 @@ import { getFirestore } from 'firebase-admin/firestore';
 
 const db = getFirestore();
 
+const isTesting = process.env.NODE_ENV === 'testing';
+
 // create admin user
 export const createAdmin = async () => {
 	try {
@@ -20,7 +22,7 @@ export const createAdmin = async () => {
 				name: 'admin',
 				role: 'admin',
 				user_uid: '[email protected]',
-				mfaEnabled: true,
+				mfaEnabled: isTesting ? true : false,
 			},
 		};
 

src/config/mock.data.js

@@ -107,7 +107,7 @@ export const getAllAnnouncements = async (req, res, next) => {
 	}
 };
 
-export const saveAnnouncementDraft = async (req, res, next) => {
+export const handleAnnouncementAction = async (req, res, next) => {
 	try {
 		const errors = validationResult(req);
 
@@ -127,12 +127,24 @@ export const saveAnnouncementDraft = async (req, res, next) => {
 			return;
 		}
 
-		const { announcement } = req.body;
-		const list = await announcements.saveDraft({ ...announcement, isDraft: true });
+		let { action, announcement } = req.body;
+		if (action !== 'publish') action = 'save';
 
-		res.locals.type = 'info';
-		res.locals.message = 'draft announcement saved successfully';
-		res.status(200).json(list);
+		if (action === 'save') {
+			const list = await announcements.saveDraft(announcement);
+
+			res.locals.type = 'info';
+			res.locals.message = 'draft announcement saved successfully';
+			res.status(200).json(list);
+		}
+
+		if (action === 'publish') {
+			const list = await announcements.publish(announcement);
+
+			res.locals.type = 'info';
+			res.locals.message = 'announcement published successfully';
+			res.status(200).json(list);
+		}
 	} catch (err) {
 		next(err);
 	}
@@ -206,37 +218,6 @@ export const deleteAnnouncementAdmin = async (req, res, next) => {
 	}
 };
 
-export const publishAnnouncementAdmin = async (req, res, next) => {
-	try {
-		const errors = validationResult(req);
-
-		if (!errors.isEmpty()) {
-			let msg = '';
-			errors.array().forEach((error) => {
-				msg += `${msg === '' ? '' : ', '}${error.param}: ${error.msg}`;
-			});
-
-			res.locals.type = 'warn';
-			res.locals.message = `invalid input: ${msg}`;
-
-			res.status(400).json({
-				message: 'Bad request: provided inputs are invalid.',
-			});
-
-			return;
-		}
-
-		const { announcement } = req.body;
-		const list = await announcements.publish(announcement);
-
-		res.locals.type = 'info';
-		res.locals.message = 'announcement published successfully';
-		res.status(200).json(list);
-	} catch (err) {
-		next(err);
-	}
-};
-
 export const getAdminDashboard = async (req, res, next) => {
 	try {
 		const finalResult = congregationRequests.list;