Merge branch 'master' into master

Author: KaniRobinson

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "@vuex-orm/plugin-axios",
-  "version": "0.2.3",
+  "version": "0.5.0",
   "description": "Vuex-ORM Plugin to sync the data against a RESTful API.",
   "main": "dist/index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@vuex-orm/core": "^0.26.2",
+    "@vuex-orm/core": "^0.31.6",
     "axios": "^0.18.0",
     "lodash": "^4.17.11"
   },

package.json

@@ -61,4 +61,15 @@ export default class Action {
     if (config.query) endpoint += `?${Object.keys(config.query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(config.query[k])}`).join('&')}`;
     return endpoint;
   }
+
+   /**
+   * Get appropriate methods
+   * @param {string} type
+   * @param {object} model
+   * @param {string} defaultMethod
+   */
+  static getMethod(type, model, defaultMethod) {
+    const customMethod = model.methodConf.methods[type].http.method;
+    return (customMethod) ? customMethod : defaultMethod;
+  }
 }

src/actions/Action.js

@@ -17,7 +17,8 @@ export default class Create extends Action {
     const model = context.getModelFromState(state);
     const endpoint = Action.transformParams('$create', model, params);
     const axios =  new Axios(model.methodConf.http);
-    const request = axios.post(endpoint, params.data);
+    const method = Action.getMethod('$create', model, 'post');
+    const request = axios[method](endpoint, params.data);
 
     this.onRequest(commit);
     request

src/actions/Create.js

@@ -13,7 +13,8 @@ export default class Delete extends Action {
     const model = context.getModelFromState(state);
     const endpoint = Action.transformParams('$delete', model, params);
     const axios =  new Axios(model.methodConf.http);
-    const request = axios.delete(endpoint);
+    const method = Action.getMethod('$delete', model, 'delete');
+    const request = axios[method](endpoint);
 
     this.onRequest(model, params);
     request

src/actions/Delete.js

@@ -13,7 +13,8 @@ export default class Fetch extends Action {
     const model = context.getModelFromState(state);
     const endpoint = Action.transformParams('$fetch', model, params);
     const axios =  new Axios(model.methodConf.http);
-    const request = axios.get(endpoint);
+    const method = Action.getMethod('$fetch', model, 'get');
+    const request = axios[method](endpoint);
 
     this.onRequest(commit);
     request

src/actions/Fetch.js

@@ -13,7 +13,8 @@ export default class Get extends Action {
     const model = context.getModelFromState(state);
     const endpoint = Action.transformParams('$get', model, params);
     const axios =  new Axios(model.methodConf.http);
-    const request = axios.get(endpoint);
+    const method = Action.getMethod('$get', model, 'get');
+    const request = axios[method](endpoint);
 
     this.onRequest(commit);
     request

src/actions/Get.js

@@ -18,7 +18,8 @@ export default class Update extends Action {
     const model = context.getModelFromState(state);
     const endpoint = Action.transformParams('$update', model, params);
     const axios =  new Axios(model.methodConf.http);
-    const request = axios.put(endpoint, params.data);
+    const method = Action.getMethod('$update', model, 'put');
+    const request = axios[method](endpoint, params.data);
 
     this.onRequest(model, params);
     request

src/actions/Update.js

@@ -3,10 +3,7 @@ import axios from 'axios';
 export default class Axios {
   constructor(http) {
     this.instance = http.axios || axios.create(http);
-
-    if(http.access_token) {
-      this.instance.defaults.headers.common['Authorization'] = `Bearer ${http.access_token}`;
-    }
+    this.setAuthentication(http.access_token);
 
     this.instance.interceptors.response.use(
       response => http.onResponse(response, this.instance),
@@ -16,6 +13,15 @@ export default class Axios {
     return this.instance;
   }
 
+  setAuthentication(token) {
+    if (!token) return;
+    const isFunction = typeof token 
+    "function";
+    const tokenStr = isFunction ? token() : token;
+
+    this.instance.defaults.headers.common['Authorization'] = `Bearer ${tokenStr}`;
+  }
+
   /**
    * Head Request
    * @param {string} url

src/orm/axios.js

@@ -136,24 +136,18 @@ export const AxiosRequestConfig = {
    * @param {object} error
    */
   onError(error) {
-    switch (error.response.status) {
-      case 401:
-        this.onUnauthorised(error);
-        break;
-      case 404:
-        this.onNotFound(error);
-        break;
-      case 422:
-        this.onValidationError(error);
-        break;
-      case 500:
-        this.onServerError(error);
-        break;
-      default:
-        this.onGenericError(error);
-        break;
+    const { response } = error;
+    const errorTypes = {
+      401: this.onUnauthorised,
+      404: this.onNotFound,
+      422: this.onValidationError,
+      500: this.onServerError
+    }
+    if (response && response.status in errorTypes) {
+      errorTypes[response.status](error);
+    } else {
+      this.onGenericError(error);
     }
-
     return Promise.reject(error);
   },
 };