refactor(plugins): merge doc-to-txt and docx-to-txt plugins

src/plugins/doc-to-txt/index.js

@@ -4,7 +4,7 @@ const WordExtractor = require("word-extractor");
 /**
  * @author Frazer Smith
  * @description Pre-handler plugin that uses Word-Extractor to convert Buffer containing
- * DOC file in `req.body` to TXT.
+ * a DOC or DOCX file in `req.body` to TXT.
  * `req` object is decorated with `conversionResults.body` holding the converted document.
  * @param {object} server - Fastify instance.
  */
@@ -29,7 +29,7 @@ async function plugin(server) {
 			res.type("text/plain; charset=utf-8");
 		} catch {
 			/**
-			 * Word-Extractor will throw if the .doc file provided
+			 * Word-Extractor will throw if the .doc or .docx file provided
 			 * by client is malformed, thus client error code
 			 */
 			throw server.httpErrors.badRequest();

src/plugins/doc-to-txt/plugin.test.js

@@ -15,6 +15,11 @@ describe("DOC-to-TXT conversion plugin", () => {
 			{ parseAs: "buffer" },
 			async (_req, payload) => payload
 		);
+		server.addContentTypeParser(
+			"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+			{ parseAs: "buffer" },
+			async (_req, payload) => payload
+		);
 
 		await server.register(sensible).register(plugin);
 
@@ -31,16 +36,29 @@ describe("DOC-to-TXT conversion plugin", () => {
 		await server.close();
 	});
 
-	it("Converts DOC file to TXT", async () => {
-		const response = await server.inject({
-			method: "POST",
-			url: "/",
-			body: await fs.readFile(
-				"./test_resources/test_files/valid_doc.doc"
-			),
+	it.each([
+		{
+			testName: "DOC file to TXT",
 			headers: {
 				"content-type": "application/msword",
 			},
+			readFile: "./test_resources/test_files/valid_doc.doc",
+		},
+		{
+			testName: "DOCX file to TXT",
+			headers: {
+				"content-type":
+					"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+			},
+			readFile: "./test_resources/test_files/valid_docx.docx",
+		},
+	])("Converts $testName", async ({ headers, readFile }) => {
+		const response = await server.inject({
+			method: "POST",
+			url: "/",
+			// eslint-disable-next-line security/detect-non-literal-fs-filename
+			body: await fs.readFile(readFile),
+			headers,
 		});
 
 		const { body } = JSON.parse(response.payload);
@@ -66,22 +84,28 @@ describe("DOC-to-TXT conversion plugin", () => {
 		{ testName: "is missing" },
 		{
 			testName: "is not a valid DOC file",
-			readFile: true,
+			headers: {
+				"content-type": "application/msword",
+			},
+			readFile: "./test_resources/test_files/invalid_doc.doc",
+		},
+		{
+			testName: "is not a valid DOCX file",
+			headers: {
+				"content-type":
+					"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+			},
+			readFile: "./test_resources/test_files/invalid_docx.docx",
 		},
 	])(
-		"Returns HTTP status code 400 if DOC file $testName",
-		async ({ readFile }) => {
+		"Returns HTTP status code 400 if file $testName",
+		async ({ headers, readFile }) => {
 			const response = await server.inject({
 				method: "POST",
 				url: "/",
-				headers: {
-					"content-type": "application/msword",
-				},
-				body: readFile
-					? await fs.readFile(
-							"./test_resources/test_files/invalid_doc.doc"
-					  )
-					: undefined,
+				headers,
+				// eslint-disable-next-line security/detect-non-literal-fs-filename
+				body: readFile ? await fs.readFile(readFile) : undefined,
 			});
 
 			expect(JSON.parse(response.payload)).toEqual({

src/routes/docx/txt/index.js

@@ -2,7 +2,7 @@ const { fromBuffer } = require("file-type");
 
 // Import plugins
 const cors = require("@fastify/cors");
-const docxToTxt = require("../../../plugins/docx-to-txt");
+const docxToTxt = require("../../../plugins/doc-to-txt");
 
 const { docxToTxtPostSchema } = require("./schema");