Fixing requestHeaders.Authorization (#3287)

Allanbcruz · web-flow · commit 04d45f20911a · 2020-09-20T10:19:48.000+08:00
diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js
@@ -30,7 +30,7 @@ module.exports = function xhrAdapter(config) {
     // HTTP basic authentication
     if (config.auth) {
       var username = config.auth.username || '';
-      var password = unescape(encodeURIComponent(config.auth.password)) || '';
+      var password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : '';
       requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password);
     }
 
diff --git a/test/specs/__helpers.js b/test/specs/__helpers.js
@@ -76,6 +76,21 @@ setupBasicAuthTest = function setupBasicAuthTest() {
     }, 100);
   });
 
+  it('should accept HTTP Basic auth credentials without the password parameter', function (done) {
+    axios('/foo', {
+      auth: {
+        username: 'Aladdin'
+      }
+    });
+
+    setTimeout(function () {
+      var request = jasmine.Ajax.requests.mostRecent();
+
+      expect(request.requestHeaders['Authorization']).toEqual('Basic QWxhZGRpbjo=');
+      done();
+    }, 100);
+  });
+
   it('should accept HTTP Basic auth credentials with non-Latin1 characters in password', function (done) {
     axios('/foo', {
       auth: {
@@ -86,7 +101,6 @@ setupBasicAuthTest = function setupBasicAuthTest() {
 
     setTimeout(function () {
       var request = jasmine.Ajax.requests.mostRecent();
-      console.log(request.requestHeaders['Authorization'], '\n\n\n');
 
       expect(request.requestHeaders['Authorization']).toEqual('Basic QWxhZGRpbjpvcGVuIMOfw6fCo+KYg3Nlc2FtZQ==');
       done();

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ module.exports = function xhrAdapter(config) {`
`30`	`30`	`// HTTP basic authentication`
`31`	`31`	`if (config.auth) {`
`32`	`32`	`var username = config.auth.username \|\| '';`
`33`		`- var password = unescape(encodeURIComponent(config.auth.password)) \|\| '';`
	`33`	`+ var password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : '';`
`34`	`34`	`requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password);`
`35`	`35`	`}`
`36`	`36`