Fix: Issues with xml2json convertor

Author: ChakshuGautam

packages/enketo-express/package-lock.json

@@ -66,6 +66,7 @@
         "jstransformer-markdown-it": "^2.1.0",
         "jszip": "^3.7.1",
         "jwt-simple": "^0.5.6",
+        "libxslt": "^0.10.1",
         "load-grunt-tasks": "^5.1.0",
         "lodash": "^4.17.21",
         "morgan": "^1.10.0",

packages/enketo-express/package.json

@@ -64,7 +64,7 @@ export class FormController {
         // execute method string
         if (functionString) {
             //TODO: fix this with a sandbox
-            return eval(functionString)(this.formData);
+            return (0, eval)(functionString)(this.formData);
         } else {
             throw new Error('No function string provided');
         }
@@ -75,10 +75,8 @@ export class FormController {
     }
 
     async processForm(formData) {
-        console.log({ formData });
-        console.log(xml2json(formData).data);
         const doc = this._parser.parseFromString(formData, 'text/xml');
-        this.formData = doc;
+        this.formData = (await fetch('http://localhost:3002/form/parse/' + encodeURIComponent(formData)).then(res => res.json())).data;
         if (await this.formSpec.isSuccessExecute() === true) {
             this._state = 'FORM_SUCCESS';
             this._onFormSuccessData = await this.formSpec.onFormSuccessExecute();

packages/enketo-express/public/js/src/module/form-controller.js

@@ -9,7 +9,7 @@
     "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
+    "start": "nest start --watch",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
@@ -28,7 +28,8 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
     "webpack": "^5.74.0",
-    "xmldom": "^0.6.0"
+    "xmldom": "^0.6.0",
+    "xml2json": "^0.12.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^8.0.0",
@@ -70,4 +71,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

packages/form-manager/package-lock.json

@@ -1,6 +1,9 @@
 import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { AppService } from './app.service';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const parser = require('xml2json');
+
 type PrefillDto = {
   form: string;
   onFormSuccessData: any;
@@ -53,4 +56,9 @@ export class AppController {
   getForm(@Param('id') id): string {
     return this.appService.getForm(id);
   }
+
+  @Get('form/parse/:xml')
+  parseXML(@Param('xml') xml): any {
+    return parser.toJson(xml);
+  }
 }