skapi-js 1.0.24 → 1.0.27

package/js/main/skapi.js

@@ -23,7 +23,7 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service, owner, options, __etc) {
-        this.version = '1.0.24';
+        this.version = '1.0.27';
         this.session = null;
         this.connection = null;
         this.host = 'skapi';

package/js/methods/database.js

@@ -796,19 +796,14 @@ export async function postRecord(form, config) {
             to_bin = formMeta.to_bin;
         }
         if (formMeta.files.length) {
-            let formData = new FormData();
-            for (let f of formMeta.files) {
-                formData.append(f.name, f.file, f.file.name);
+            if (!to_bin) {
+                to_bin = [];
             }
-            options.meta = config;
-            if (Object.keys(formMeta.meta).length) {
-                options.meta.data = formMeta.meta;
+            for (let f of formMeta.files) {
+                to_bin.push(f);
             }
-            postData = formData;
-        }
-        else {
-            postData = Object.assign({ data: formMeta.meta }, config);
         }
+        postData = Object.assign({ data: formMeta.meta }, config);
     }
     else {
         postData = Object.assign({ data: form }, config);

package/js/methods/user.js

@@ -12,19 +12,19 @@ export function consumeTicket(params) {
     if (!params.ticket_id) {
         throw new SkapiError('Ticket ID is required.', { code: 'INVALID_PARAMETER' });
     }
-    return request.bind(this)('ticket', { ticket_id: params, exec: 'consume' }, { auth: true });
+    return request.bind(this)('ticket', { ticket_id: params.ticket_id, exec: 'consume' }, { auth: true });
 }
 export function releaseTicket(params) {
     if (!params.ticket_id) {
         throw new SkapiError('Ticket ID is required.', { code: 'INVALID_PARAMETER' });
     }
-    return request.bind(this)('ticket', { ticket_id: params, exec: 'release' }, { auth: true });
+    return request.bind(this)('ticket', { ticket_id: params.ticket_id, exec: 'release' }, { auth: true });
 }
 export function getTicketKey(params) {
     if (!params.ticket_id) {
         throw new SkapiError('Ticket ID is required.', { code: 'INVALID_PARAMETER' });
     }
-    return request.bind(this)('ticket', { ticket_id: params, exec: 'request' }, { auth: true });
+    return request.bind(this)('ticket', { ticket_id: params.ticket_id, exec: 'request' }, { auth: true });
 }
 export function authentication() {
     if (!userPool)
@@ -160,14 +160,26 @@ export function authentication() {
                     rej(new SkapiError('Current session does not exist.', { code: 'INVALID_REQUEST' }));
                     return;
                 }
+                let respond = (session) => {
+                    let idToken = session.getIdToken().payload;
+                    if (idToken['custom:service'] !== this.service) {
+                        cognitoUser.signOut();
+                        this.session = null;
+                        rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
+                        return;
+                    }
+                    this.session = session;
+                    normalizeUserAttributes(idToken);
+                    res(session);
+                };
                 if (refreshToken || !session.isValid()) {
                     cognitoUser.refreshSession(session.getRefreshToken(), (refreshErr, refreshedSession) => {
                         if (refreshErr) {
                             rej(refreshErr);
                         }
                         else {
-                            if (!refreshedSession.isValid()) {
-                                session = refreshedSession;
+                            if (refreshedSession.isValid()) {
+                                return respond(refreshedSession);
                             }
                             else {
                                 rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
@@ -176,16 +188,9 @@ export function authentication() {
                         }
                     });
                 }
-                let idToken = session.getIdToken().payload;
-                if (idToken['custom:service'] !== this.service) {
-                    cognitoUser.signOut();
-                    this.session = null;
-                    rej(new SkapiError('Invalid session.', { code: 'INVALID_REQUEST' }));
-                    return;
+                else {
+                    return respond(session);
                 }
-                this.session = session;
-                normalizeUserAttributes(idToken);
-                res(session);
             });
         });
     };
@@ -701,6 +706,7 @@ export async function getUsers(params, fetchOptions) {
         'address': 'string',
         'gender': 'string',
         'birthdate': (v) => validator.Birthdate(v),
+        'subscribers': 'number',
         'timestamp': 'number',
         'access_group': 'number',
         'approved': (v) => {
@@ -758,9 +764,6 @@ export async function getUsers(params, fetchOptions) {
     if (params.searchFor === 'user_id' && params.condition !== '=') {
         throw new SkapiError(`Conditions are not allowed on "user_id"`, { code: 'INVALID_PARAMETER' });
     }
-    if (params.searchFor === 'access_group') {
-        params.searchFor = 'group';
-    }
     if (typeof params?.value === 'string' && !params?.value) {
         throw new SkapiError('Value should not be an empty string.', { code: 'INVALID_PARAMETER' });
     }

package/js/utils/utils.js

@@ -1,3 +1,4 @@
+import SkapiError from "../main/error";
 class MD5 {
     static hash(str) {
         if (typeof str !== 'string') {
@@ -279,6 +280,12 @@ function extractFormMeta(form) {
                 }
             }
         }
+        function sizeof(object) {
+            return new Blob([JSON.stringify(object)]).size;
+        }
+        if (sizeof(meta) > 2 * 1024 * 1024) {
+            throw new SkapiError('JSON Data should not exceed 2MB', { code: 'INVALID_REQUEST' });
+        }
         return { meta, files, to_bin };
     }
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skapi-js",
-  "version": "1.0.24",
+  "version": "1.0.27",
   "description": "Skapi: JS Backend API with no deployment required.",
   "main": "./dist/skapi.module.js",
   "types": "./js/Main.d.ts",