fix(xsrf): overwrite already set xsrf header

Hacklone · vsavkin · commit b4265e0685cb · 2016-10-26T14:55:24.000-07:00
diff --git a/modules/@angular/http/src/backends/xhr_backend.ts b/modules/@angular/http/src/backends/xhr_backend.ts
@@ -187,7 +187,7 @@ export class CookieXSRFStrategy implements XSRFStrategy {
 
   configureRequest(req: Request) {
     let xsrfToken = __platform_browser_private__.getDOM().getCookie(this._cookieName);
-    if (xsrfToken && !req.headers.has(this._headerName)) {
+    if (xsrfToken) {
       req.headers.set(this._headerName, xsrfToken);
     }
   }
diff --git a/modules/@angular/http/test/backends/xhr_backend_spec.ts b/modules/@angular/http/test/backends/xhr_backend_spec.ts
@@ -124,11 +124,11 @@ export function main() {
           backend.createConnection(sampleRequest);
           expect(sampleRequest.headers.get('X-XSRF-TOKEN')).toBe('magic XSRF value');
         });
-        it('respects existing headers', () => {
+        it('should allow overwriting of existing headers', () => {
           getDOM().setCookie('XSRF-TOKEN', 'magic XSRF value');
           sampleRequest.headers.set('X-XSRF-TOKEN', 'already set');
           backend.createConnection(sampleRequest);
-          expect(sampleRequest.headers.get('X-XSRF-TOKEN')).toBe('already set');
+          expect(sampleRequest.headers.get('X-XSRF-TOKEN')).toBe('magic XSRF value');
         });
 
         describe('configuration', () => {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ export class CookieXSRFStrategy implements XSRFStrategy {`
`187`	`187`
`188`	`188`	`configureRequest(req: Request) {`
`189`	`189`	`let xsrfToken = __platform_browser_private__.getDOM().getCookie(this._cookieName);`
`190`		`- if (xsrfToken && !req.headers.has(this._headerName)) {`
	`190`	`+ if (xsrfToken) {`
`191`	`191`	`req.headers.set(this._headerName, xsrfToken);`
`192`	`192`	`}`
`193`	`193`	`}`