Skip to content

Master #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Master #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01dff1c
strip away version from batch request url
gabrielhandeland Feb 16, 2023
e27f44e
set url to stripped path
gabrielhandeland Feb 17, 2023
9b1c563
test a batch request with full url
gabrielhandeland Feb 17, 2023
4c275d1
replace host stripping block with regex based replace
gabrielhandeland Feb 17, 2023
e20b099
Merge pull request #1179 from ghandeland/ghandeland/batch-path-parsing
koros May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/content/BatchRequestContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,10 @@ 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) => {
Expand Down
8 changes: 8 additions & 0 deletions test/common/content/BatchRequestContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,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" + req.request.url);
const batchReq = new BatchRequestContent([req]);
const content = await batchReq.getContent();
assert.equal(content.requests[0].url, "/me/drive/root/children");
});
});

describe("removeDependency", function() {
Expand Down