Merge pull request #1462 from microsoftgraph/feature/missing-commits

set url to stripped path

Author: baywet

src/content/BatchRequestContent.ts

@@ -198,9 +198,8 @@ export class BatchRequestContent {
 		const requestData: RequestData = {
 			url: "",
 		};
-		const hasHttpRegex = new RegExp("^https?://");
 		// Stripping off hostname, port and url scheme
-		requestData.url = hasHttpRegex.test(request.url) ? "/" + request.url.split(/.*?\/\/.*?\//)[1] : request.url;
+		requestData.url = request.url.replace(/^(?:http)?s?:?(?:\/\/)?[^/]+\/(?:v1.0|beta)?/i, ""); // replaces <scheme>?<?>?<//><hostname:port>+</>?<version>+ by an empty string
 		requestData.method = request.method;
 		const headers = {};
 		request.headers.forEach((value, key) => {

test/common/content/BatchRequestContent.ts

@@ -17,8 +17,9 @@ const folderDetails = {
 	name: folderName,
 	folder: {},
 };
+const driveRootChildrenPath = "/me/drive/root/children";
 
-const createFolderRequest = new Request(DUMMY_BASE_URL + "/me/drive/root/children", {
+const createFolderRequest = new Request(DUMMY_BASE_URL + driveRootChildrenPath, {
 	method: "POST",
 	headers: {
 		"Content-type": "application/json",
@@ -213,6 +214,14 @@ describe("BatchRequestContent.ts", () => {
 			assert.isDefined(content.requests[0].body);
 			assert.equal(typeof content.requests[0].body, "object");
 		});
+
+		it("Should parse path with url", async () => {
+			const req = getCreateFolderRequestCopy();
+			req.request = new Request("https://graph.microsoft.com/v1.0" + driveRootChildrenPath);
+			const batchReq = new BatchRequestContent([req]);
+			const content = await batchReq.getContent();
+			assert.equal(content.requests[0].url, "/me/drive/root/children");
+		});
 	});
 
 	describe("removeDependency", function() {