fix: axios common headers set

Author: mathieu-gilloots

dist/drivers/auth/basic.common.js

@@ -14,7 +14,7 @@ var basic = {
   },
   response: function (res) {
     var headers = this.drivers.http.getHeaders.call(this, res),
-        token = headers.Authorization || headers.authorization;
+      token = headers.Authorization || headers.authorization;
     return token;
   }
 };

dist/drivers/auth/basic.esm.js

@@ -12,7 +12,7 @@ var basic = {
   },
   response: function (res) {
     var headers = this.drivers.http.getHeaders.call(this, res),
-        token = headers.Authorization || headers.authorization;
+      token = headers.Authorization || headers.authorization;
     return token;
   }
 };

dist/drivers/auth/basic.js

@@ -18,7 +18,7 @@
       },
       response: function (res) {
         var headers = this.drivers.http.getHeaders.call(this, res),
-            token = headers.Authorization || headers.authorization;
+          token = headers.Authorization || headers.authorization;
         return token;
       }
     };

dist/drivers/auth/bearer.common.js

@@ -14,8 +14,7 @@ var bearer = {
   },
   response: function (res) {
     var headers = this.drivers.http.getHeaders.call(this, res),
-        token = headers.Authorization || headers.authorization;
-
+      token = headers.Authorization || headers.authorization;
     if (token) {
       token = token.split(/Bearer:?\s?/i);
       return token[token.length > 1 ? 1 : 0].trim();

dist/drivers/auth/bearer.esm.js

@@ -12,8 +12,7 @@ var bearer = {
   },
   response: function (res) {
     var headers = this.drivers.http.getHeaders.call(this, res),
-        token = headers.Authorization || headers.authorization;
-
+      token = headers.Authorization || headers.authorization;
     if (token) {
       token = token.split(/Bearer:?\s?/i);
       return token[token.length > 1 ? 1 : 0].trim();

dist/drivers/auth/bearer.js

@@ -18,8 +18,7 @@
       },
       response: function (res) {
         var headers = this.drivers.http.getHeaders.call(this, res),
-            token = headers.Authorization || headers.authorization;
-
+          token = headers.Authorization || headers.authorization;
         if (token) {
           token = token.split(/Bearer:?\s?/i);
           return token[token.length > 1 ? 1 : 0].trim();

dist/drivers/auth/devise.common.js

@@ -10,7 +10,7 @@ var devise = {
   tokens: ['Token-Type', 'Access-Token', 'Client', 'Uid', 'Expiry', 'token-type', 'access-token', 'client', 'uid', 'expiry'],
   request: function (req, token) {
     var headers = {},
-        tokens = token.split('|');
+      tokens = token.split('|');
     var auth = this.drivers.deviseAuth || this.drivers.auth;
     auth.tokens.forEach(function (tokenName, index) {
       if (tokens[index]) {
@@ -21,16 +21,16 @@ var devise = {
   },
   response: function (res) {
     var token = [],
-        headers = this.drivers.http.getHeaders.call(this, res);
-
+      headers = this.drivers.http.getHeaders.call(this, res);
     if (headers['access-token'] || headers['Access-Token']) {
       var auth = this.drivers.deviseAuth || this.drivers.auth;
       auth.tokens.forEach(function (tokenName) {
         if (headers[tokenName]) {
           token.push(headers[tokenName]);
         }
-      }); // Check if access-token more recent than last one
+      });
 
+      // Check if access-token more recent than last one
       if (!this.token() || parseInt(token[4], 10) >= parseInt(this.token().split('|')[4], 10)) {
         return token.join('|');
       }

dist/drivers/auth/devise.esm.js

@@ -8,7 +8,7 @@ var devise = {
   tokens: ['Token-Type', 'Access-Token', 'Client', 'Uid', 'Expiry', 'token-type', 'access-token', 'client', 'uid', 'expiry'],
   request: function (req, token) {
     var headers = {},
-        tokens = token.split('|');
+      tokens = token.split('|');
     var auth = this.drivers.deviseAuth || this.drivers.auth;
     auth.tokens.forEach(function (tokenName, index) {
       if (tokens[index]) {
@@ -19,16 +19,16 @@ var devise = {
   },
   response: function (res) {
     var token = [],
-        headers = this.drivers.http.getHeaders.call(this, res);
-
+      headers = this.drivers.http.getHeaders.call(this, res);
     if (headers['access-token'] || headers['Access-Token']) {
       var auth = this.drivers.deviseAuth || this.drivers.auth;
       auth.tokens.forEach(function (tokenName) {
         if (headers[tokenName]) {
           token.push(headers[tokenName]);
         }
-      }); // Check if access-token more recent than last one
+      });
 
+      // Check if access-token more recent than last one
       if (!this.token() || parseInt(token[4], 10) >= parseInt(this.token().split('|')[4], 10)) {
         return token.join('|');
       }

dist/drivers/auth/devise.js

@@ -14,7 +14,7 @@
       tokens: ['Token-Type', 'Access-Token', 'Client', 'Uid', 'Expiry', 'token-type', 'access-token', 'client', 'uid', 'expiry'],
       request: function (req, token) {
         var headers = {},
-            tokens = token.split('|');
+          tokens = token.split('|');
         var auth = this.drivers.deviseAuth || this.drivers.auth;
         auth.tokens.forEach(function (tokenName, index) {
           if (tokens[index]) {
@@ -25,16 +25,16 @@
       },
       response: function (res) {
         var token = [],
-            headers = this.drivers.http.getHeaders.call(this, res);
-
+          headers = this.drivers.http.getHeaders.call(this, res);
         if (headers['access-token'] || headers['Access-Token']) {
           var auth = this.drivers.deviseAuth || this.drivers.auth;
           auth.tokens.forEach(function (tokenName) {
             if (headers[tokenName]) {
               token.push(headers[tokenName]);
             }
-          }); // Check if access-token more recent than last one
+          });
 
+          // Check if access-token more recent than last one
           if (!this.token() || parseInt(token[4], 10) >= parseInt(this.token().split('|')[4], 10)) {
             return token.join('|');
           }

dist/drivers/http/axios.1.x.common.js

@@ -14,7 +14,6 @@ var axios_1_x = {
   },
   interceptor: function (req, res) {
     var _this = this;
-
     if (req) {
       this.plugins.http.interceptors.request.use(function (request) {
         req.call(_this, request);
@@ -24,7 +23,6 @@ var axios_1_x = {
         return Promise.reject(error);
       });
     }
-
     if (res) {
       this.plugins.http.interceptors.response.use(function (response) {
         res.call(_this, response);
@@ -33,7 +31,6 @@ var axios_1_x = {
         if (error && error.response) {
           res.call(_this, error.response);
         }
-
         return Promise.reject(error);
       });
     }
@@ -53,7 +50,7 @@ var axios_1_x = {
     return res.headers;
   },
   setHeaders: function (req, headers) {
-    req.headers.common = Object.assign({}, req.headers.common, headers);
+    req.headers = Object.assign({}, req.headers, headers);
   }
 };