Implemented axios as default request library

# Conflicts:
#	bower.json
#	dist/vue-authenticate.common.js
#	dist/vue-authenticate.es2015.js
#	dist/vue-authenticate.js
#	dist/vue-authenticate.min.js
#	example/vue-authenticate.js
#	package.json

Author: dgrubelic

.editorconfig

@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1,3 @@
+flow
+dist
+packages

.eslintrc

@@ -0,0 +1,19 @@
+{
+  "root": true,
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "sourceType": "module"
+  },
+  "env": {
+    "browser": true,
+  },
+  "extends": "standard",
+  "plugins": [
+    "html"
+  ],
+  "rules": {
+    "arrow-parens": 0,
+    "generator-star-spacing': 0
+  }
+}
+

.gitignore

@@ -3,10 +3,21 @@
 node_modules
 bower_components
 
-# Editors
+Thumbs.db
+.DS_Store
+
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
 .idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
 *.iml
-
-# OS metadata
-.DS_Store
-Thumbs.db
+.vscode
+settings.json
+jsconfig.json

.tern-project

@@ -0,0 +1,13 @@
+{
+  "plugins": {
+    "es_modules": {},
+    "node": {}
+  },
+  "libs": [
+    "ecma5",
+    "ecma6",
+    "react",
+    "browser"
+  ],
+  "ecmaVersion": 6
+}

dist/vue-authenticate.common.js

@@ -451,10 +451,40 @@ var defaultOptions = {
   logoutUrl: null,
   storageType: 'localStorage',
   storageNamespace: 'vue-authenticate',
-  requestDataKey: 'body',
-  responseDataKey: 'body',
-  bindRequestInterceptor: null,
-  bindResponseInterceptor: null,
+  requestDataKey: 'data',
+  responseDataKey: 'data',
+
+  /**
+   * Default request interceptor for Axios library
+   * @context {VueAuthenticate}
+   */
+  bindRequestInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.request.use(function (config) {
+      if (this$1.isAuthenticated()) {
+        config.headers['Authorization'] = [
+          this$1.options.tokenType, this$1.getToken()
+        ].join(' ');
+      } else {
+        delete config.headers['Authorization'];
+      }
+      return config
+    });
+  },
+
+  /**
+   * Default response interceptor for Axios library
+   * @contect {VueAuthenticate}
+   */
+  bindResponseInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.response.use(function (response) {
+      this$1.setToken(response);
+      return response
+    });
+  },
 
   providers: {
     facebook: {
@@ -1032,8 +1062,6 @@ OAuth2.prototype._stringifyRequestParams = function _stringifyRequestParams () {
 };
 
 var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
-  var this$1 = this;
-
   var options = objectExtend({}, defaultOptions);
   options = objectExtend(options, overrideOptions);
   var storage = StorageFactory(options);
@@ -1075,28 +1103,7 @@ var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
     this.options.bindRequestInterceptor.call(this, this);
     this.options.bindResponseInterceptor.call(this, this);
   } else {
-    // By default, request and response interceptors are for vue-resource
-    this.$http.interceptors.push(function (request, next) {
-      if (this$1.isAuthenticated()) {
-        request.headers.set('Authorization', [
-          this$1.options.tokenType, this$1.getToken()
-        ].join(' '));
-      } else {
-        request.headers.delete('Authorization');
-      }
-        
-      next(function (response) {
-        try {
-          var responseJson = JSON.parse(response[this$1.options.responseDataKey]);
-          if (responseJson[this$1.options.tokenName]) {
-            this$1.setToken(responseJson);
-            delete responseJson[this$1.options.tokenName];
-            return responseJson
-          }
-        } catch(e) {}
-        return response
-      });
-    });
+    throw new Error('Both request and response interceptors must be functions')
   }
 };
 

dist/vue-authenticate.es2015.js

@@ -449,10 +449,40 @@ var defaultOptions = {
   logoutUrl: null,
   storageType: 'localStorage',
   storageNamespace: 'vue-authenticate',
-  requestDataKey: 'body',
-  responseDataKey: 'body',
-  bindRequestInterceptor: null,
-  bindResponseInterceptor: null,
+  requestDataKey: 'data',
+  responseDataKey: 'data',
+
+  /**
+   * Default request interceptor for Axios library
+   * @context {VueAuthenticate}
+   */
+  bindRequestInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.request.use(function (config) {
+      if (this$1.isAuthenticated()) {
+        config.headers['Authorization'] = [
+          this$1.options.tokenType, this$1.getToken()
+        ].join(' ');
+      } else {
+        delete config.headers['Authorization'];
+      }
+      return config
+    });
+  },
+
+  /**
+   * Default response interceptor for Axios library
+   * @contect {VueAuthenticate}
+   */
+  bindResponseInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.response.use(function (response) {
+      this$1.setToken(response);
+      return response
+    });
+  },
 
   providers: {
     facebook: {
@@ -1030,8 +1060,6 @@ OAuth2.prototype._stringifyRequestParams = function _stringifyRequestParams () {
 };
 
 var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
-  var this$1 = this;
-
   var options = objectExtend({}, defaultOptions);
   options = objectExtend(options, overrideOptions);
   var storage = StorageFactory(options);
@@ -1073,28 +1101,7 @@ var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
     this.options.bindRequestInterceptor.call(this, this);
     this.options.bindResponseInterceptor.call(this, this);
   } else {
-    // By default, request and response interceptors are for vue-resource
-    this.$http.interceptors.push(function (request, next) {
-      if (this$1.isAuthenticated()) {
-        request.headers.set('Authorization', [
-          this$1.options.tokenType, this$1.getToken()
-        ].join(' '));
-      } else {
-        request.headers.delete('Authorization');
-      }
-        
-      next(function (response) {
-        try {
-          var responseJson = JSON.parse(response[this$1.options.responseDataKey]);
-          if (responseJson[this$1.options.tokenName]) {
-            this$1.setToken(responseJson);
-            delete responseJson[this$1.options.tokenName];
-            return responseJson
-          }
-        } catch(e) {}
-        return response
-      });
-    });
+    throw new Error('Both request and response interceptors must be functions')
   }
 };
 

dist/vue-authenticate.js

@@ -455,10 +455,40 @@ var defaultOptions = {
   logoutUrl: null,
   storageType: 'localStorage',
   storageNamespace: 'vue-authenticate',
-  requestDataKey: 'body',
-  responseDataKey: 'body',
-  bindRequestInterceptor: null,
-  bindResponseInterceptor: null,
+  requestDataKey: 'data',
+  responseDataKey: 'data',
+
+  /**
+   * Default request interceptor for Axios library
+   * @context {VueAuthenticate}
+   */
+  bindRequestInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.request.use(function (config) {
+      if (this$1.isAuthenticated()) {
+        config.headers['Authorization'] = [
+          this$1.options.tokenType, this$1.getToken()
+        ].join(' ');
+      } else {
+        delete config.headers['Authorization'];
+      }
+      return config
+    });
+  },
+
+  /**
+   * Default response interceptor for Axios library
+   * @contect {VueAuthenticate}
+   */
+  bindResponseInterceptor: function () {
+    var this$1 = this;
+
+    this.$http.interceptors.response.use(function (response) {
+      this$1.setToken(response);
+      return response
+    });
+  },
 
   providers: {
     facebook: {
@@ -1036,8 +1066,6 @@ OAuth2.prototype._stringifyRequestParams = function _stringifyRequestParams () {
 };
 
 var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
-  var this$1 = this;
-
   var options = objectExtend({}, defaultOptions);
   options = objectExtend(options, overrideOptions);
   var storage = StorageFactory(options);
@@ -1079,28 +1107,7 @@ var VueAuthenticate = function VueAuthenticate($http, overrideOptions) {
     this.options.bindRequestInterceptor.call(this, this);
     this.options.bindResponseInterceptor.call(this, this);
   } else {
-    // By default, request and response interceptors are for vue-resource
-    this.$http.interceptors.push(function (request, next) {
-      if (this$1.isAuthenticated()) {
-        request.headers.set('Authorization', [
-          this$1.options.tokenType, this$1.getToken()
-        ].join(' '));
-      } else {
-        request.headers.delete('Authorization');
-      }
-        
-      next(function (response) {
-        try {
-          var responseJson = JSON.parse(response[this$1.options.responseDataKey]);
-          if (responseJson[this$1.options.tokenName]) {
-            this$1.setToken(responseJson);
-            delete responseJson[this$1.options.tokenName];
-            return responseJson
-          }
-        } catch(e) {}
-        return response
-      });
-    });
+    throw new Error('Both request and response interceptors must be functions')
   }
 };
 

dist/vue-authenticate.min.js

@@ -41,6 +41,17 @@
     .button--linkedin  { color: #0077b5; border: 1px solid #0077b5; }
     .button--live  { color: #f65314; border: 1px solid #f65314; }
 
+    .authentication-status {
+      background-color: #42b983;
+      color: #fff;
+      left: 0;
+      padding: 16px 32px;
+      position: fixed;
+      right: 0;
+      text-align: center;
+      top: 0;
+    }
+
     hr {
       border: 0;
       border-bottom: 1px solid #ddd;
@@ -50,6 +61,7 @@
     #app {
       margin: 32px auto;
       max-width: 640px;
+      padding-top: 53px;
       word-break: break-all;
     }
   </style>
@@ -61,8 +73,9 @@
 
   <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
   <script src="https://unpkg.com/[email protected]/dist/vue-router.min.js"></script>
-  <script src="https://unpkg.com/[email protected]/dist/vue-resource.min.js"></script>
+  <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+  <script src="https://unpkg.com/[email protected]/dist/vue-axios.min.js"></script>
   <script src="/vue-authenticate.js"></script>
   <script src="/index.js"></script>
 </body>
-</html>
+</html>