flamerest 1.0.67 → 1.0.69

package/REST.d.ts

@@ -129,6 +129,7 @@ type Authorized = {
     role: string
   };
   errors: { [key: string]: any };
+  token: string;
 }
 
 /**

package/REST.js

@@ -30,6 +30,12 @@ class FLAMEREST {
      */
     this.version = version ? version : 'v1';
 
+    /**
+     * Если авторизация по токену, то он сюда подставляется
+     */
+    this.isAuthByJWTQuery = true;
+    this.token = null;
+
   }
 
   install(Vue, options) {
@@ -44,7 +50,7 @@ class FLAMEREST {
    * @param {string} type Тип
    * @param {string} responseType Тип ответа: json или blob
    */
-  request(url, params, type = 'GET', responseType = 'json') {
+  request(url, params, type = 'GET', responseType = 'json', isNeedToken = true) {
 
     // Нормализуем параметры, если они есть
     if (typeof params === "object") {
@@ -60,6 +66,11 @@ class FLAMEREST {
 
         try {
 
+          // Авторизация
+          if (this.isAuthByJWTQuery && isNeedToken === true && this.token !== null) {
+            url = url + "?access-token=" + this.token;
+          }
+
           // Тело запроса
           let requestBody = {
             method: type,
@@ -468,20 +479,29 @@ class FLAMEREST {
       return new Promise((resolve, reject) => { resolve(JSON.parse(window.sessionStorage.getItem("crudschema"))) });
   }
 
-  async auth(username, password) {
+  async auth(username, password, isNeedToken) {
 
-    let resp = await this.request(this.SERVER + '/auth/auth', JSON.stringify({ login: username, password: password }), 'POST');
+    let resp = null;
+    if (this.token !== null && (username === null || username === undefined)) {
+      resp = await this.request(this.SERVER + '/auth/auth', JSON.stringify({}), 'POST', 'json', true);
+    }
+    else {
+      resp = await this.request(this.SERVER + '/auth/auth', JSON.stringify({ login: username, password: password }), 'POST', 'json', false);
+    }
 
     if (resp.errors) return resp;
     if (resp.data.length === 0) { resp.errors = []; return resp; }
 
+    // после успешной авторизации устанавливаем токен
+    if (typeof resp.token === 'string') this.token = resp.token;
+
     return resp.data;
 
   }
 
   async signup(email, username, password, name) {
 
-    let resp = await this.request(this.SERVER + '/auth/signup', JSON.stringify({ login: username, email: email, password: password, name: name }), 'POST');
+    let resp = await this.request(this.SERVER + '/auth/signup', JSON.stringify({ login: username, email: email, password: password, name: name }), 'POST', 'json', false);
 
     if (resp.errors) return resp;
     if (resp.data.length === 0) { resp.errors = []; return resp; }
@@ -553,14 +573,13 @@ class FLAMEREST {
             */
 
           if (values[val] instanceof Array) {
-            values[val].splice(valueKey);
+            values[val].splice(valueKey, 1);
             values[val].push(...newValues);
           }
           else {
             values[val] = newValues;
           }
 
-
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flamerest",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "",
   "main": "REST.js",
   "typings": "./REST.d.ts",