Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

feat(http): add config parameter to headers functions #7235

Closed
wants to merge 1 commit into from
Closed

feat(http): add config parameter to headers functions #7235

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ng/http.js
View file
Open in desktop
Expand Up @@ -487,7 +487,7 @@ function $HttpProvider() {
* - **data** – `{string|Object}` – Data to be sent as the request message data.
* - **headers** – `{Object}` – Map of strings or functions which return strings representing
* HTTP headers to send to the server. If the return value of a function is null, the
* header will not be sent.
* header will not be sent. Functions take the config object as argument.
* - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
* - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
* - **transformRequest** –
Expand Down Expand Up @@ -717,15 +717,15 @@ function $HttpProvider() {
}

// execute if header value is a function for merged headers
execHeaders(reqHeaders);
execHeaders(reqHeaders, config);
return reqHeaders;

function execHeaders(headers) {
function execHeaders(headers, data) {
var headerContent;

forEach(headers, function(headerFn, header) {
if (isFunction(headerFn)) {
headerContent = headerFn();
headerContent = headerFn(data);
if (headerContent != null) {
headers[header] = headerContent;
} else {
Expand Down
18 changes: 10 additions & 8 deletions test/ng/httpSpec.js
View file
Open in desktop
Expand Up @@ -755,17 +755,19 @@ describe('$http', function() {
}));

it('should send execute result if header value is function', inject(function() {
var headerConfig = {'Accept': function() { return 'Rewritten'; }};
var headerConfig = {'Accept': function(config) { return 'Rewritten-' + config.method; }};

function checkHeaders(headers) {
return headers['Accept'] == 'Rewritten';
function checkHeaders(method) {
return function(headers) {
return headers['Accept'] == 'Rewritten-' + method;
};
}

$httpBackend.expect('GET', '/url', undefined, checkHeaders).respond('');
$httpBackend.expect('POST', '/url', undefined, checkHeaders).respond('');
$httpBackend.expect('PUT', '/url', undefined, checkHeaders).respond('');
$httpBackend.expect('PATCH', '/url', undefined, checkHeaders).respond('');
$httpBackend.expect('DELETE', '/url', undefined, checkHeaders).respond('');
$httpBackend.expect('GET', '/url', undefined, checkHeaders('GET')).respond('');
$httpBackend.expect('POST', '/url', undefined, checkHeaders('POST')).respond('');
$httpBackend.expect('PUT', '/url', undefined, checkHeaders('PUT')).respond('');
$httpBackend.expect('PATCH', '/url', undefined, checkHeaders('PATCH')).respond('');
$httpBackend.expect('DELETE', '/url', undefined, checkHeaders('DELETE')).respond('');

$http({url: '/url', method: 'GET', headers: headerConfig});
$http({url: '/url', method: 'POST', headers: headerConfig});
Expand Down