Adding formdata to the node project, setting the esModuleInterop config as true for allowing import of npm modules, adding unit test for application/xhtml+xml content type post

nikithauc · nikithauc · commit d5bb8c412ee7 · 2020-08-04T00:01:29.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,8 +20,9 @@
 		"@babel/plugin-transform-runtime": "^7.4.4",
 		"@babel/preset-env": "^7.4.4",
 		"@types/mocha": "^5.2.6",
-		"@types/node": "^12.0.10",
+		"@types/node": "^12.12.53",
 		"chai": "^4.2.0",
+		"form-data": "^3.0.0",
 		"gulp": "^4.0.2",
 		"husky": "^2.2.0",
 		"isomorphic-fetch": "^2.2.1",
diff --git a/spec/development/workload/OneNote.ts b/spec/development/workload/OneNote.ts
@@ -85,6 +85,23 @@ describe("OneNote", function() {
 		}
 	});
 
+	it("Create a OneNote page with application/xhtml+xml page content", async () => {
+		try {
+			const body = "<!DOCTYPE html><html><head><title>A page with a block of HTML</title></head><body><p>This page contains some <i>formatted</i> <b>text</b>.</p></body></html>";
+			const json = await client
+				.api(`/me/onenote/sections/${section.id}/pages`)
+				.header("content-type", "application/xhtml+xml")
+				.post(body);
+			const createdPageFromHTML = json as OnenotePage;
+			console.log(json);
+			assert.isDefined(createdPage.id);
+			assert.isDefined(createdPage.contentUrl);
+			assert.isUndefined(createdPage["random fake property that should be null"]);
+		} catch (error) {
+			throw error;
+		}
+	});
+
 	it("create a OneNote page with html page content and file attachment", async () => {
 		try {
 			const formData = new FormData();
diff --git a/src/GraphRequest.ts b/src/GraphRequest.ts
@@ -9,6 +9,8 @@
  * @module GraphRequest
  */
 
+import FormData from "form-data";
+
 import { GraphError } from "./GraphError";
 import { GraphErrorHandler } from "./GraphErrorHandler";
 import { oDataQueryNames, serializeContent, urlJoin } from "./GraphRequestUtil";
@@ -22,7 +24,6 @@ import { MiddlewareControl } from "./middleware/MiddlewareControl";
 import { MiddlewareOptions } from "./middleware/options/IMiddlewareOptions";
 import { RequestMethod } from "./RequestMethod";
 import { ResponseType } from "./ResponseType";
-
 /**
  * @interface
  * Signature to representing key value pairs
@@ -573,8 +574,9 @@ export class GraphRequest {
 			method: RequestMethod.POST,
 			body: serializeContent(content),
 		};
-		if (typeof FormData !== "undefined" && content instanceof FormData) {
-			options.headers = {};
+		const className: string = content === undefined || content === null ? undefined : content.constructor.name;
+		if (typeof FormData !== "undefined" && className === "FormData") {
+			options.headers = content.getHeaders();
 		} else {
 			this.buildHeaders();
 			options.headers = this._headers;
diff --git a/tsconfig-cjs.json b/tsconfig-cjs.json
@@ -4,7 +4,8 @@
 		"module": "commonjs",
 		"target": "es5",
 		"lib": ["dom", "esnext"],
-		"outDir": "lib"
+		"outDir": "lib",
+		"esModuleInterop": true
 	},
 	"exclude": ["node_modules", "lib", "samples", "spec/development"],
 	"include": ["./src/**/*.ts", "./spec/**/*.ts"]
diff --git a/tsconfig-es.json b/tsconfig-es.json
@@ -1,10 +1,11 @@
 {
 	"extends": "./tsconfig-base.json",
 	"compilerOptions": {
-		"module": "es6",
+		"module": "CommonJS",
 		"target": "es6",
 		"lib": ["dom", "esnext"],
-		"outDir": "lib/es"
+		"outDir": "lib/es",
+		"esModuleInterop": true
 	},
 	"exclude": ["node_modules", "lib", "samples", "spec/**"],
 	"include": ["./src/**/*.ts"]
