Skip to content

feat: allow cors header to be excluded from request headers #489

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

Merged
Parent: Bug bounty test - PLEASE DO NOT APPROVE. jfsyew
merged 1 commit into from
Jan 20, 2022
Merged

feat: allow cors header to be excluded from request headers #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 0 deletions src/xhr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ var Request = function (url, data, headers) {
this.headers = headers;
};

const CORS_HEADER = 'Cross-Origin-Resource-Policy';

function setHeaders(xhr, headers) {
for (const header in headers) {
if (header === CORS_HEADER && !headers[header]) {
continue;
}
xhr.setRequestHeader(header, headers[header]);
}
}
Expand Down
37 changes: 37 additions & 0 deletions test/amplitude-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,13 +1690,50 @@ describe('AmplitudeClient', function () {
assert.equal(server.requests[0].requestHeaders['Content-Type'], 'application/json;charset=utf-8');
});

it('should send request with no cors header when passed an empty string', function () {
amplitude.init(apiKey, null, {
headers: { 'Cross-Origin-Resource-Policy': '' },
});
amplitude.logEvent('Event Type 1');
assert.lengthOf(server.requests, 1);
assert.notExists(server.requests[0].requestHeaders['Cross-Origin-Resource-Policy']);
});

it('should send request with no cors header when passed undefined', function () {
amplitude.init(apiKey, null, {
headers: { 'Cross-Origin-Resource-Policy': undefined },
});
amplitude.logEvent('Event Type 1');
assert.lengthOf(server.requests, 1);
assert.notExists(server.requests[0].requestHeaders['Cross-Origin-Resource-Policy']);
});

it('should send request with no cors header when passed null', function () {
amplitude.init(apiKey, null, {
headers: { 'Cross-Origin-Resource-Policy': null },
});
amplitude.logEvent('Event Type 1');
assert.lengthOf(server.requests, 1);
assert.notExists(server.requests[0].requestHeaders['Cross-Origin-Resource-Policy']);
});

it('should send request with custom cors header', function () {
amplitude.init(apiKey, null, {
headers: { 'Cross-Origin-Resource-Policy': 'same-site' },
});
amplitude.logEvent('Event Type 1');
assert.lengthOf(server.requests, 1);
assert.equal(server.requests[0].requestHeaders['Cross-Origin-Resource-Policy'], 'same-site');
});

it('should send https request', function () {
amplitude.options.forceHttps = true;
amplitude.logEvent('Event Type 1');
assert.lengthOf(server.requests, 1);
assert.equal(server.requests[0].url, 'https://api.amplitude.com');
assert.equal(server.requests[0].method, 'POST');
assert.equal(server.requests[0].async, true);
assert.equal(server.requests[0].requestHeaders['Cross-Origin-Resource-Policy'], 'cross-origin');
});

it('should send https request by configuration', function () {
Expand Down