skapi-js 1.0.62-beta.12 → 1.0.62-beta.13

package/js/methods/database.js

@@ -468,7 +468,7 @@ export async function getRecords(query, fetchOptions) {
             private_key: 'string'
         };
         let isAdmin = await this.checkAdmin();
-        validator.Params(query || {}, struct, ref_user || isAdmin ? [] : ['table']);
+        query = validator.Params(query || {}, struct, ref_user || isAdmin ? [] : ['table']);
     }
     let result = await request.bind(this)('get-records', query, {
         fetchOptions,
@@ -492,7 +492,6 @@ export async function postRecord(form, config) {
     if (!this.user) {
         throw new SkapiError('Login is required.', { code: 'INVALID_REQUEST' });
     }
-    let fetchOptions = {};
     if (typeof config.table === 'string') {
         config.table = {
             name: config.table
@@ -506,7 +505,7 @@ export async function postRecord(form, config) {
             record_id: config.reference
         };
     }
-    validator.Params(config || {}, {
+    let _config = validator.Params(config || {}, {
         record_id: ['string', () => {
                 if (!config.table || !config.table.name) {
                     throw new SkapiError('"table.name" is required.', { code: 'INVALID_PARAMETER' });
@@ -525,9 +524,8 @@ export async function postRecord(form, config) {
                     if (!config.record_id && !config.table.access_group || config.table.access_group === 0 || config.table.access_group === 'public') {
                         throw new SkapiError('Public records cannot require subscription.', { code: 'INVALID_REQUEST' });
                     }
-                    delete config.table.subscription;
-                    Object.assign(config.table, { subscription_group: 1 });
                 }
+                return v;
             },
             access_group: v => {
                 if (typeof v === 'string') {
@@ -648,7 +646,11 @@ export async function postRecord(form, config) {
         progress: 'function',
     });
     let progress = config.progress || null;
-    delete config.progress;
+    if (config.table.hasOwnProperty('subscription')) {
+        _config.table.subscription_group = config.table.subscription ? 1 : null;
+        delete _config.table.subscription;
+    }
+    delete _config.progress;
     let options = { auth: true };
     let postData = null;
     let to_bin = null;
@@ -657,11 +659,12 @@ export async function postRecord(form, config) {
         if (extractedForm.files.length) {
             to_bin = extractedForm.files;
         }
-        postData = Object.assign({ data: extractedForm.data }, config);
+        postData = Object.assign({ data: extractedForm.data }, _config);
     }
     else {
-        postData = Object.assign({ data: form }, config);
+        postData = Object.assign({ data: form }, _config);
     }
+    let fetchOptions = {};
     if (typeof progress === 'function') {
         fetchOptions.progress = progress;
     }
@@ -678,8 +681,8 @@ export async function postRecord(form, config) {
             record_id: rec.rec,
             progress
         };
-        if (config.hasOwnProperty('service')) {
-            uploadFileParams['service'] = config.service;
+        if (_config.hasOwnProperty('service')) {
+            uploadFileParams['service'] = _config.service;
         }
         let { bin_endpoints } = await uploadFiles.bind(this)(bin_formData, uploadFileParams);
         if (!rec.bin) {
@@ -820,9 +823,6 @@ export async function deleteRecords(params) {
     }
     else {
         if (!params?.table) {
-            if (isAdmin) {
-                return null;
-            }
             throw new SkapiError('Either "table" or "record_id" is required.', { code: 'INVALID_PARAMETER' });
         }
         let struct = {
@@ -844,38 +844,31 @@ export async function deleteRecords(params) {
             },
             name: 'string',
             subscription: (v) => {
-                if (isAdmin && typeof params?.table?.subscription === 'string') {
-                    return validator.UserId(v, 'User ID in "table.subscription"');
-                }
                 if (typeof v === 'boolean') {
                     if (v) {
-                        return this.__user.user_id;
-                    }
-                    else {
-                        return null;
+                        v = this.__user.user_id;
+                        return v;
                     }
                 }
-                throw new SkapiError('"table.subscription" is an invalid parameter key.', { code: 'INVALID_PARAMETER' });
-            },
-        };
-        let table_p = validator.Params(params.table || {}, struct, isAdmin ? [] : ['name']);
-        if (table_p.hasOwnProperty('subscription')) {
-            if (table_p.subscription === null) {
-                delete table_p.subscription;
-            }
-            else {
-                if (!table_p.hasOwnProperty('access_group')) {
+                if (!params.table.hasOwnProperty('access_group')) {
                     throw new SkapiError('"table.access_group" is required for subscription records.', { code: 'INVALID_PARAMETER' });
                 }
-                else if (table_p.access_group === 0) {
+                else if (params.table.access_group === 0) {
                     throw new SkapiError('Public tables does not hold subscription records.', { code: 'INVALID_REQUEST' });
                 }
-                table_p.subscription_group = 1;
+                if (isAdmin && typeof v === 'string') {
+                    return validator.UserId(v, 'User ID in "table.subscription"');
+                }
+                throw new SkapiError('"table.subscription" is an invalid parameter key.', { code: 'INVALID_PARAMETER' });
             }
+        };
+        let table = validator.Params(params.table || {}, struct, isAdmin ? [] : ['name']);
+        if (table.subscription) {
+            table.subscription_group = 1;
         }
-        params.table = table_p;
+        let toDelete = Object.assign({}, params, { table });
+        return await request.bind(this)('del-records', toDelete, { auth: true });
     }
-    return await request.bind(this)('del-records', params, { auth: true });
 }
 export function grantPrivateRecordAccess(params) {
     if (!params.record_id) {

package/js/methods/user.js

@@ -49,7 +49,6 @@ export async function consumeTicket(params) {
         throw new SkapiError('Ticket ID is required.', { code: 'INVALID_PARAMETER' });
     }
     let ticket_id = params.ticket_id;
-    delete params.ticket_id;
     await this.__connection;
     let resp = await request.bind(this)(`https://${this.service.slice(0, 4)}.skapi.dev/auth/consume/${this.service}/${this.owner}/${ticket_id}`, params, { auth: true });
     return map_ticket_obj(resp);

package/js/utils/validator.js

@@ -149,11 +149,20 @@ function specialChars(string, p = 'parameter', allowPeriods = false, allowWhiteS
     return string;
 }
 function Params(params, struct, required = []) {
-    struct.service = 'string';
-    struct.owner = 'string';
     let p = extractFormData(params)?.data || params;
+    let toCheck = {};
+    for (let s in struct) {
+        if (p.hasOwnProperty(s)) {
+            try {
+                toCheck[s] = JSON.parse(JSON.stringify(p[s]));
+            }
+            catch (err) {
+                toCheck[s] = p[s];
+            }
+        }
+    }
     try {
-        return checkParams(p, struct, required);
+        return checkParams(toCheck, struct, required);
     }
     catch (err) {
         throw new SkapiError(err, { code: 'INVALID_PARAMETER' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skapi-js",
-  "version": "1.0.62-beta.12",
+  "version": "1.0.62-beta.13",
   "description": "Skapi: Backend API Library for HTML frontend.",
   "main": "js/Main.js",
   "types": "js/Main.d.ts",