Merge pull request #120 from microsoftgraph/Bug-Fixes

Bug fixes

Author: muthurathinam

CHANGELOG.md

@@ -13,6 +13,7 @@ Bug Fixes
 
 ### 1.2.0
 Updates
+
 * Two output js files, one with polyfills for Fetch-API and ES6-Promises ([lib/graph-js-sdk-web.js](./lib/graph-js-sdk-web.js)) and one without ([lib/graph-js-sdk-core.js](./lib/graph-js-sdk-core.js))
 [Refer [README.md](https://github.com/microsoftgraph/msgraph-sdk-javascript#browser) for usage]
 * Enum for ResponseType, which lists down the available ResponseType options in autocomplete

README.md

@@ -223,15 +223,15 @@ client
 ````
 
 ### $search
-Pass a search string to `.search()` for searching message and person collections.
-````js
+Pass a search query string to `.search()` for searching in collections. Calling search multiple times will override previous search query. Refer graph [documentation](https://developer.microsoft.com/en-us/graph/docs/concepts/query_parameters#search-parameter) for more.
+```js
 client
-    .api("/users")
-    .search("Irene McGowen")
+    .api("/me/messages")
+    .search("from:admin")
     .get((err, res) => {
-        console.log(res)
-    })
-````
+        console.log(res);
+    });
+```
 
 ## Other API methods
 

lib/graph-js-sdk-core.js

@@ -89,5 +89,6 @@ export declare class GraphRequest {
         [key: string]: string | number;
     }): GraphRequest;
     private createQueryString;
+    private parseDocumentResponse;
     private convertResponseType;
 }

lib/graph-js-sdk-web.js

@@ -14,7 +14,7 @@ export declare const PACKAGE_VERSION = "1.3.0";
  * @callback - The anonymous callback function
  */
 export interface AuthProviderCallback {
-    (error: any, accessToken: string): void;
+    (error: any, accessToken: string | null): void;
 }
 /**
  * @interface {@link https://github.com/bitinn/node-fetch/#options}

lib/src/GraphRequest.d.ts

@@ -163,6 +163,10 @@ export class GraphRequest {
         return this;
     }
 
+    search(searchStr: string): GraphRequest {
+        this.urlComponents.oDataQueryParams["$search"] = `"${searchStr}"`;
+        return this;
+    }
 
     search(searchStr: string): GraphRequest {
         this.urlComponents.oDataQueryParams["$search"] = searchStr;
@@ -448,21 +452,39 @@ export class GraphRequest {
         return "";
     }
 
+    private parseDocumentResponse(response, type): Promise<any> {
+        if (typeof DOMParser !== "undefined") {
+            return new Promise((resolve, reject) => {
+                response.text().then((xmlString) => {
+                    try {
+                        let parser = new DOMParser(),
+                            xmlDoc = parser.parseFromString(xmlString, type);
+                        resolve(xmlDoc);
+                    } catch (error) {
+                        reject(error);
+                    }
+                });
+            });
+        } else {
+            return Promise.resolve(response.body);
+        }
+    }
+
     private convertResponseType(response: Response): Promise<any> {
-        let responseValue: any;
-        if (!this._responseType) {
-            this._responseType = '';
+        let self = this,
+            responseValue: any;
+        if (!self._responseType) {
+            self._responseType = '';
         }
-        switch (this._responseType.toLowerCase()) {
+        switch (self._responseType.toLowerCase()) {
             case ResponseType.ARRAYBUFFER:
                 responseValue = response.arrayBuffer();
                 break;
             case ResponseType.BLOB:
                 responseValue = response.blob();
                 break;
             case ResponseType.DOCUMENT:
-                // XMLHTTPRequest only :(
-                responseValue = response.json();
+                responseValue = self.parseDocumentResponse(response, "text/xml");
                 break;
             case ResponseType.JSON:
                 responseValue = response.json();
@@ -474,7 +496,29 @@ export class GraphRequest {
                 responseValue = response.text();
                 break;
             default:
-                responseValue = response.json();
+                let contentType = response.headers.get("Content-type");
+                if (contentType !== null) {
+                    let mimeType = contentType.split(";")[0],
+                        documentContentTypes = ["text/html", "text/xml", "application/xml", "application/xhtml+xml"];
+                    if (documentContentTypes.includes(mimeType)) {
+                        responseValue = self.parseDocumentResponse(response, mimeType);
+                    } else {
+                        responseValue = response.json();
+                    }
+                } else {
+                    /**
+                     * RFC specification {@link https://tools.ietf.org/html/rfc7231#section-3.1.1.5} says:
+                     *  A sender that generates a message containing a payload body SHOULD
+                     *  generate a Content-Type header field in that message unless the
+                     *  intended media type of the enclosed representation is unknown to the
+                     *  sender.  If a Content-Type header field is not present, the recipient
+                     *  MAY either assume a media type of "application/octet-stream"
+                     *  ([RFC2046], Section 4.5.1) or examine the data to determine its type.
+                     * 
+                     *  So assuming it as a stream type so returning the body.
+                     */
+                    responseValue = Promise.resolve(response.body);
+                }
                 break;
         }
         return responseValue;

lib/src/GraphRequest.js

@@ -22,7 +22,7 @@ oDataQueryNames = oDataQueryNames.concat(oDataQueryNames.map((s) => "$" + s));
  * @callback - The anonymous callback function
  */
 export interface AuthProviderCallback {
-    (error: any, accessToken: string): void
+    (error: any, accessToken: string | null): void
 }
 
 /**