Merge branch 'dev' into Calling_Pattern_Doc

Author: muthurathinam

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "@microsoft/microsoft-graph-client",
 	"//": "NOTE: The version here should match exactly the exported const PACKAGE_VERSION in Constants.ts. If you change it here, also change it there.",
-	"version": "1.6.0",
+	"version": "1.7.0-Preview.1",
 	"description": "Microsoft Graph Client Library",
 	"main": "lib/src/index.js",
 	"module": "lib/es/index.js",

package.json

@@ -30,29 +30,6 @@ describe("GraphErrorHandler.ts", () => {
 		});
 	});
 
-	describe("constructErrorFromRawResponse", async () => {
-		it("Should parse error from raw response", async () => {
-			const body = "unauthorized";
-			const statusCode = 401;
-			const errorResponse = new Response(body, {
-				status: statusCode,
-			});
-			const gError = await GraphErrorHandler["constructErrorFromRawResponse"](errorResponse, statusCode);
-			assert.equal(gError.statusCode, statusCode);
-			assert.equal(gError.body, body);
-		});
-
-		it("Should parse error without body", async () => {
-			const statusCode = 401;
-			const errorResponse = new Response(undefined, {
-				status: statusCode,
-			});
-			const gError = await GraphErrorHandler["constructErrorFromRawResponse"](errorResponse, statusCode);
-			assert.equal(gError.statusCode, statusCode);
-			assert.isNull(gError.body);
-		});
-	});
-
 	describe("constructErrorFromResponse", () => {
 		const statusCode = 400;
 		const error: any = {

spec/core/GraphErrorHandler.ts

@@ -158,17 +158,5 @@ describe("GraphResponseHandler.ts", () => {
 			const responseValue = await GraphResponseHandler.getResponse(response, ResponseType.TEXT);
 			assert.isDefined(responseValue);
 		});
-
-		it("Should parse from raw response for NOT OK response", async () => {
-			try {
-				const response = new Response("NOT OK", status500);
-				const responseValue = await GraphResponseHandler.getResponse(response, ResponseType.TEXT);
-				throw new Error("Something wrong with validating OK response");
-			} catch (error) {
-				assert.isDefined(error);
-				assert.isTrue(error instanceof Response);
-				assert.equal(error.status, 500);
-			}
-		});
 	});
 });

spec/core/GraphResponseHandler.ts

@@ -27,4 +27,4 @@ export const GRAPH_BASE_URL = "https://graph.microsoft.com/";
  * @NOTE: This should be kept up to date with the version used in package.json.
  * If you are changing this please ensure you are also changing it in package.json.
  */
-export const PACKAGE_VERSION = "1.6.0";
+export const PACKAGE_VERSION = "1.7.0-Preview.1";

src/Constants.ts

@@ -37,25 +37,6 @@ export class GraphErrorHandler {
 		return gError;
 	}
 
-	/**
-	 * @private
-	 * @static
-	 * @async
-	 * To construct error from the raw response
-	 * @param {Response} error - The error response
-	 * @param {number} statusCode - The status code of the response
-	 * @returns A promise that resolves to GraphError instance
-	 */
-	private static async constructErrorFromRawResponse(error: Response, statusCode: number): Promise<GraphError> {
-		const gError = new GraphError(statusCode);
-		try {
-			gError.body = await error.text();
-		} catch (error) {
-			// tslint:disable-line: no-empty
-		}
-		return gError;
-	}
-
 	/**
 	 * @private
 	 * @static
@@ -106,9 +87,7 @@ export class GraphErrorHandler {
 	 */
 	public static async getError(error: any = null, statusCode: number = -1, callback?: GraphRequestCallback): Promise<GraphError> {
 		let gError: GraphError;
-		if (error && (error.constructor.name === "Response" || error.constructor.name === "Body")) {
-			gError = await GraphErrorHandler.constructErrorFromRawResponse(error, statusCode);
-		} else if (error && error.error) {
+		if (error && error.error) {
 			gError = GraphErrorHandler.constructErrorFromResponse(error, statusCode);
 		} else if (error && error.constructor.name === "Error") {
 			gError = GraphErrorHandler.constructError(error, statusCode);

src/GraphErrorHandler.ts

@@ -188,7 +188,7 @@ export class GraphResponseHandler {
 				}
 			}
 		} catch (error) {
-			throw rawResponse.ok ? error : rawResponse;
+			throw error;
 		}
 	}
 }