laravel-request 1.1.8 → 1.1.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "laravel-request",
   "main": "src/index.js",
   "scripts": {},

package/src/Api.js

@@ -1,5 +1,5 @@
 import ApiRequest from "./ApiRequest";
-import $ from "jquery";
+import axios from "axios";
 
 export default class Api {
 
@@ -18,7 +18,7 @@ export default class Api {
    * @return {ApiRequest}
    */
   static create(target, focus, data = {}, method = 'GET') {
-    return this.requestClass(target, focus, data, method);
+    return new this.requestClass(target, focus, data, method);
   }
 
   /**
@@ -31,7 +31,7 @@ export default class Api {
    * @return {ApiRequest}
    */
   static createArg(target, focus, arg, data = {}, method = 'GET') {
-    return this.requestClass(target, focus, data, method).addArg(arg);
+    return new this.requestClass(target, focus, data, method).addArg(arg);
   }
 
   /**
@@ -78,7 +78,7 @@ export default class Api {
    */
   static getUrl(url, data = {})
   {
-    return (this.requestClass('', '', data, 'GET')).setUrl(url);
+    return (new this.requestClass('', '', data, 'GET')).setUrl(url);
   }
 
   /**
@@ -89,7 +89,7 @@ export default class Api {
    */
   static postUrl(url, data = {})
   {
-    return (this.requestClass('', '', data, 'POST')).setUrl(url);
+    return (new this.requestClass('', '', data, 'POST')).setUrl(url);
   }
 
   /**
@@ -100,7 +100,7 @@ export default class Api {
    */
   static putUrl(url, data = {})
   {
-    return (this.requestClass('', '', data, 'PUT')).setUrl(url);
+    return (new this.requestClass('', '', data, 'PUT')).setUrl(url);
   }
 
   /**
@@ -111,7 +111,7 @@ export default class Api {
    * @returns {ApiRequest}
    */
   static get(target, focus, data = {}) {
-    return this.requestClass(target, focus, data, 'GET');
+    return new this.requestClass(target, focus, data, 'GET');
   }
   /**
    *
@@ -121,7 +121,7 @@ export default class Api {
    * @returns {ApiRequest}
    */
   static post(target, focus, data = {}) {
-    return this.requestClass(target, focus, data, 'POST');
+    return new this.requestClass(target, focus, data, 'POST');
   }
   /**
    *
@@ -131,7 +131,7 @@ export default class Api {
    * @returns {ApiRequest}
    */
   static put(target, focus, data = {}) {
-    return this.requestClass(target, focus, data, 'PUT');
+    return new this.requestClass(target, focus, data, 'PUT');
   }
 
   /**
@@ -143,7 +143,7 @@ export default class Api {
    * @return {ApiRequest}
    */
   static delete(target, focus, id, data = {}) {
-    return this.requestClass(target, focus, data, 'DELETE').addArg(id);
+    return new this.requestClass(target, focus, data, 'DELETE').addArg(id);
   }
 
   /**
@@ -151,33 +151,85 @@ export default class Api {
    * @param obj
    * @return {*}
    */
-  static makeRequest(obj) {
-    obj.xhrFields = {withCredentials: true};
-
-    if (typeof obj["data"] === 'undefined') {
-      obj["data"] = {};
-    }
-    if (typeof obj["headers"] === 'undefined') {
-      obj["headers"] = {};
-    }
-
-
-    let api_token = localStorage.getItem('api_token');
-
-    if (api_token)
-    {
-      obj["headers"]["Authorization"] = api_token;
-    }
-
-    let one_time_token = localStorage.getItem('token');
-
-    if (one_time_token)
-    {
-      obj["data"]['token'] = one_time_token;
+  static async makeRequest({url, method, data, params, headers, success = () => {}, error = () => {}})
+  {
+    try {
+      if (typeof headers === 'undefined') {
+        headers = {};
+      }
+      if (typeof params === 'undefined') {
+        params = {};
+      }
+      if (typeof data === 'undefined') {
+        data = {};
+      }
+
+      headers['Content-Type'] = 'application/json';
+
+      let api_token = localStorage.getItem('api_token');
+      if (api_token)
+      {
+        headers["Authorization"] = api_token;
+      }
+
+      let response;
+      switch (method)
+      {
+        case 'GET':
+          data.timestamp = new Date().getTime();
+
+          response = await axios.request({
+            url: url,
+            method: method,
+            params: data,
+            headers: headers
+          });
+          break;
+        default:
+          params.timestamp = new Date().getTime();
+
+          response = await axios.request({
+            url: url,
+            method: method,
+            data: data,
+            params: params,
+            headers: headers
+          });
+          break;
+      }
+
+
+      // get status code
+      const statusCode = response.status;
+
+      // get full response object
+      const xhr = response;
+
+      const responseData = response.data;
+
+      success(responseData, statusCode, xhr);
+
+      return responseData;
+    } catch(e) {
+      console.error(`API request to ${url} failed: ${e}`);
+
+      const xhr = e.request;
+
+      //написано для обратной совместимости после перехода с jquery
+      try{
+        xhr.responseJSON = e.response.data;
+      }catch (errorJson){
+        console.log(errorJson)
+      }
+
+
+      // status code
+      const statusCode = e.response.status;
+
+      // status text
+      const statusText = e.response.statusText;
+
+      error(xhr, statusCode, statusText);
     }
-
-    // obj["data"]['debug'] = true;
-
-    return $.ajax(obj)
   }
 }

package/src/ApiRequest.js

@@ -1,6 +1,6 @@
+import Api from "./Api";
 import Builder from "./Builder";
 import Binding from "./Binding";
-import Api from "./Api";
 
 /**
  *
@@ -12,11 +12,6 @@ export default class ApiRequest {
    */
   url = '';
 
-  /**
-   *
-   * @type {XMLHttpRequest|null}
-   */
-  xhr = null;
 
   /**
    *
@@ -154,11 +149,18 @@ export default class ApiRequest {
    */
   call(successCallback = (r) => {
   }, errorCallback = () => {
-  }, params = {}, dataKey = 'data', argumentsKey = 'arguments', queryKey = 'query') {
+  }, params = {}, dataKey = 'data', argumentsKey = 'arguments', queryKey = 'query', byUrl = false) {
     let self = this;
     this.callSuccess = successCallback;
     this.callError = errorCallback;
 
+    let url = this.domain + '/api/v1/call/' + this.target + '/' + this.focus;
+
+    if(byUrl)
+    {
+      url = this.url;
+    }
+
     let notify = null;
 
     let data = {};
@@ -180,13 +182,11 @@ export default class ApiRequest {
       data = this.data;
     }
 
-
-    this.xhr = Api.makeRequest({
-      url: this.domain + '/api/v1/call/' + this.target + '/' + this.focus,
+    Api.makeRequest({
+      url: url,
       method: this.method,
       data: data,
-      ...params,
-      dataType: "json",
+      params: params,
       success: (response, status, xhr) => {
         if(response && response.result === 'success')
         {
@@ -212,6 +212,14 @@ export default class ApiRequest {
     return this;
   }
 
+  /**
+   *
+   * @param notify
+   * @param errorCallback
+   * @param xhr
+   * @param status
+   * @param errorText
+   */
   handleError(notify, errorCallback, xhr, status, errorText)
   {
     if (xhr.readyState === 4) {
@@ -266,63 +274,33 @@ export default class ApiRequest {
     errorCallback(xhr);
   }
 
+  /**
+   *
+   * @param successCallback
+   * @param errorCallback
+   * @return {ApiRequest}
+   */
   callSync(successCallback = (r) => {
   }, errorCallback = () => {
   }) {
     return this.call(successCallback, errorCallback, {async: false});
   }
 
+  /**
+   *
+   * @param successCallback
+   * @param errorCallback
+   * @param params
+   * @param dataKey
+   * @param argumentsKey
+   * @param queryKey
+   * @return {ApiRequest}
+   */
   callUrl(successCallback = (r) => {
   }, errorCallback = () => {
   }, params = {}, dataKey = 'data', argumentsKey = 'arguments', queryKey = 'query')
   {
-    let self = this;
-    this.callSuccess = successCallback;
-    this.callError = errorCallback;
-
-    let data = {};
-
-    if(argumentsKey)
-    {
-      data[argumentsKey] = this.arguments;
-    }
-
-    if(queryKey)
-    {
-      data[queryKey] = this.builder.toArray();
-    }
-
-    if(dataKey)
-    {
-      data[dataKey] = this.data;
-    }else{
-      data = this.data;
-    }
-
-    let notify = null;
-    Api.makeRequest({
-      url: this.url,
-      method: this.method,
-      data: data,
-      ...params,
-      success: (response, status, xhr) => {
-        if(response && response.result === 'success')
-        {
-          if (response.meta && response.meta.text)
-          {
-            notify = this.notify ? this.getNotifyManager().info('Успешно', response.meta.text) : null
-          }
-          self.toBind(response);
-          self.resetBindErrors();
-          successCallback(response, status, xhr);
-        }
-      },
-      error: (xhr, status, errorText) => {
-        this.handleError(notify, errorCallback, xhr, status, errorText);
-      }
-    });
-
-    return this;
+    return this.call(successCallback, errorCallback, params, dataKey, argumentsKey, queryKey, true)
   }
 
   /**

package/src/index.js

@@ -3,8 +3,6 @@ import ApiProxy from "./ApiProxy";
 import ApiRequest from "./ApiRequest";
 import Binding from "./Binding";
 import Builder from "./Builder";
-import NewApi from "./NewApi";
-import NewApiRequest from "./NewApiRequest";
 import UrlBind from "./UrlBind";
 
 
@@ -15,7 +13,5 @@ export {
   ApiRequest,
   Binding,
   Builder,
-  NewApi,
-  NewApiRequest,
   UrlBind,
 }

package/src/NewApi.js

@@ -1,63 +0,0 @@
-import NewApiRequest from "./NewApiRequest";
-import axios from 'axios';
-import Api from "./Api";
-
-export default class NewApi extends Api
-{
-  /**
-   *
-   * @type {ApiRequest}
-   */
-  static requestClass = NewApiRequest;
-
-  static async makeRequest({url, method, data, dataType, params, headers, success, error})
-  {
-    try {
-      if (typeof headers === 'undefined') {
-        headers = {};
-      }
-
-      if(dataType === 'json')
-      {
-        headers['Content-Type'] = 'application/json';
-      }
-
-      let api_token = localStorage.getItem('api_token');
-      if (api_token)
-      {
-        headers["Authorization"] = api_token;
-      }
-
-      const response = await axios({
-        url: url,
-        method: method,
-        data: data,
-        params: params,
-        headers: headers
-      });
-
-      // get status code
-      const statusCode = response.status;
-
-      // get full response object
-      const xhr = response;
-
-      const data = response.data;
-
-      success(data, statusCode, xhr);
-
-    } catch(e) {
-      throw new Error(`API request to ${url} failed: ${error}`);
-
-      const xhr = e.response;
-
-      // status code
-      const statusCode = e.response.status;
-
-      // status text
-      const statusText = e.response.statusText;
-
-      error(xhr, statusCode, statusText);
-    }
-  }
-}

package/src/NewApiRequest.js

@@ -1,9 +0,0 @@
-import ApiRequest from "./ApiRequest";
-
-/**
- *
- */
-export default class NewApiRequest extends ApiRequest
-{
-
-};