Merge pull request #86 from microsoftgraph/Multipart-POST

Supporting multipart form-data payload for POST request

Author: muthurathinam

lib/graph-js-sdk-web.js

@@ -1,6 +1,6 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-// make MicrosoftGraph globally accessible
-// MicrosoftGraph.api() can be called directly
+// make MicrosoftGraph globally accessible
+// MicrosoftGraph.api() can be called directly
 window.MicrosoftGraph = require('./lib/src/index.js');
 },{"./lib/src/index.js":7}],2:[function(require,module,exports){
 (function (Buffer){
@@ -202,7 +202,7 @@ var GraphRequest = (function () {
         return this.sendRequestAndRouteResponse(new Request(url, {
             method: RequestMethod_1.RequestMethod.POST,
             body: GraphHelper_1.GraphHelper.serializeContent(content),
-            headers: new Headers({ 'Content-Type': 'application/json' })
+            headers: new Headers((content.constructor !== undefined && content.constructor.name === "FormData") ? {} : { 'Content-Type': 'application/json' })
         }), callback);
     };
     GraphRequest.prototype.put = function (content, callback) {

lib/src/GraphRequest.d.ts

@@ -14,7 +14,7 @@ export declare class GraphRequest {
         [key: string]: string | number;
     }): this;
     parsePath(rawPath: string): void;
-    private urlJoin(urlSegments);
+    private urlJoin;
     buildFullUrl(): string;
     version(v: string): GraphRequest;
     select(properties: string | string[]): GraphRequest;
@@ -26,7 +26,7 @@ export declare class GraphRequest {
     skipToken(token: string): GraphRequest;
     count(count: boolean): GraphRequest;
     responseType(responseType: string): GraphRequest;
-    private addCsvQueryParamater(propertyName, propertyValue, additionalProperties);
+    private addCsvQueryParamater;
     delete(callback?: GraphRequestCallback): Promise<any>;
     patch(content: any, callback?: GraphRequestCallback): Promise<any>;
     post(content: any, callback?: GraphRequestCallback): Promise<any>;
@@ -35,15 +35,15 @@ export declare class GraphRequest {
     update(content: any, callback?: GraphRequestCallback): Promise<any>;
     del(callback?: GraphRequestCallback): Promise<any>;
     get(callback?: GraphRequestCallback): Promise<any>;
-    private routeResponseToPromise(request);
-    private routeResponseToCallback(request, callback);
-    private sendRequestAndRouteResponse(request, callback?);
+    private routeResponseToPromise;
+    private routeResponseToCallback;
+    private sendRequestAndRouteResponse;
     getStream(callback: GraphRequestCallback): void;
     putStream(stream: any, callback: Function): void;
-    private configureRequest(request, accessToken);
+    private configureRequest;
     query(queryDictionaryOrString: string | {
         [key: string]: string | number;
     }): GraphRequest;
-    private createQueryString();
-    private convertResponseType(response);
+    private createQueryString;
+    private convertResponseType;
 }

lib/src/GraphRequest.js

@@ -3,5 +3,5 @@ export declare enum RequestMethod {
     PATCH = "PATCH",
     POST = "POST",
     PUT = "PUT",
-    DELETE = "DELETE",
+    DELETE = "DELETE"
 }

lib/src/GraphRequest.js.map

@@ -2,6 +2,8 @@ import { assert } from 'chai'
 
 import { getClient, randomString } from "./test-helper"
 import { Notebook, OnenoteSection, OnenotePage } from '@microsoft/microsoft-graph-types-beta'
+import * as fs from "fs";
+import * as FormData from "form-data";
 
 declare const describe, it;
 
@@ -59,4 +61,36 @@ describe('OneNote', function () {
                 return Promise.resolve();
             });
     });
-});
+    it("Create a OneNote page with html page content", () => {
+        let formData = new FormData();
+        formData.append('Presentation', fs.createReadStream('./spec/types/onenotepage.html'));
+        return getClient()
+            .api(`/me/onenote/sections/${section.id}/pages`)
+            .post(formData)
+            .then((json) => {
+                let createdPageFromHTML = json as OnenotePage;
+                assert.isDefined(createdPage.id);
+                assert.isDefined(createdPage.contentUrl);
+                assert.equal("New Page", createdPageFromHTML.title);
+                assert.isUndefined(createdPage['invalidPropertyName']);
+                return Promise.resolve();
+            });
+    });
+
+    it("create a OneNote page with html page content and file attachment", () => {
+        let formData = new FormData();
+        formData.append('Presentation', fs.createReadStream('./spec/types/onenotepage_fileattachment.html'));
+        formData.append("fileBlock1", fs.createReadStream("./sample.png"));
+        return getClient()
+            .api(`/me/onenote/sections/${section.id}/pages`)
+            .post(formData)
+            .then((json) => {
+                let createdPageFromHTML = json as OnenotePage;
+                assert.isDefined(createdPage.id);
+                assert.isDefined(createdPage.contentUrl);
+                assert.equal("A page with rendered file attachment", createdPageFromHTML.title);
+                assert.isUndefined(createdPage['invalidPropertyName']);
+                return Promise.resolve();
+            });
+    });
+});

lib/src/RequestMethod.d.ts

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>New Page</title>
+    </head>
+    <body>
+        <p>Created a OneNote page from <b>HTML</b></p>
+    </body>
+</html>

spec/types/OneNote.ts

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>A page with rendered file attachment</title>
+    </head>
+    <body>
+        <p>Here is an attached file:</p>
+        <object data-attachment="sample.png" data="name:fileBlock1" type="image/png" />
+    </body>
+</html>

spec/types/onenotepage.html

@@ -1,9 +1,11 @@
 {
   "devDependencies": {
+    "@microsoft/microsoft-graph-client": "^0.4.1",
     "@microsoft/microsoft-graph-types": "^1.0.0",
     "@microsoft/microsoft-graph-types-beta": "microsoftgraph/msgraph-typescript-typings#beta",
-    "@microsoft/microsoft-graph-client": "^0.4.1",
     "@types/chai": "^4.1.4",
-    "chai": "^4.1.2"
+    "@types/form-data": "^2.2.1",
+    "chai": "^4.1.2",
+    "form-data": "^2.3.2"
   }
 }