skapi-js 1.0.62 → 1.0.63-beta.0

package/js/main/skapi.d.ts

@@ -1,4 +1,5 @@
 import { DatabaseResponse, Connection, ProgressCallback, GetRecordQuery, FetchOptions, RecordData, Condition, UserAttributes, UserProfile, Newsletters, Form, PostRecordConfig, PublicUser } from '../Types';
+import { extractFormData } from '../utils/utils';
 export default class Skapi {
     version: string;
     service: string;
@@ -26,6 +27,7 @@ export default class Skapi {
         birthdate(val: string): boolean;
         email(val: string): boolean;
     };
+    extractFormData: typeof extractFormData;
     private __connection;
     private __authConnection;
     private __socket;

package/js/main/skapi.js

@@ -12,6 +12,7 @@ import { secureRequest, mock, clientSecretRequest } from '../methods/request';
 import { request, getFormResponse, formHandler, uploadFiles, hostFiles, } from '../utils/network';
 import { subscribe, unsubscribe, blockSubscriber, unblockSubscriber, getSubscriptions, subscribeNewsletter, getNewsletters, unsubscribeNewsletter, getNewsletterSubscription } from '../methods/subscription';
 import { checkAdmin, getProfile, logout, recoverAccount, resendSignupConfirmation, authentication, login, signup, disableAccount, resetPassword, verifyEmail, verifyPhoneNumber, forgotPassword, changePassword, updateProfile, getUsers, setUserPool, userPool, lastVerifiedEmail, requestUsernameChange, consumeTicket, getConsumedTickets, getTickets, registerTicket, unregisterTicket, jwtLogin } from '../methods/user';
+import { extractFormData } from '../utils/utils';
 export default class Skapi {
     get user() {
         if (this.__user && Object.keys(this.__user).length) {
@@ -24,7 +25,7 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service, owner, options, __etc) {
-        this.version = '1.0.62';
+        this.version = '1.0.63';
         this.session = null;
         this.connection = null;
         this.host = 'skapi';
@@ -84,6 +85,7 @@ export default class Skapi {
                 }
             }
         };
+        this.extractFormData = extractFormData;
         this.checkAdmin = checkAdmin.bind(this);
         this.request = request.bind(this);
         this.registerTicket = registerTicket.bind(this);

package/js/methods/user.js

@@ -66,10 +66,10 @@ export async function getConsumedTickets(params, fetchOptions) {
     return tickets;
 }
 export async function registerTicket(params) {
-    return this.request('register-ticket', Object.assign({ exec: 'reg' }, params), { auth: true });
+    return request.bind(this)('register-ticket', Object.assign({ exec: 'reg' }, params), { auth: true });
 }
 export async function unregisterTicket(params) {
-    return this.request('register-ticket', Object.assign({ exec: 'unreg' }, params), { auth: true });
+    return request.bind(this)('register-ticket', Object.assign({ exec: 'unreg' }, params), { auth: true });
 }
 export function authentication() {
     if (!userPool)

package/js/utils/network.d.ts

@@ -1,10 +1,10 @@
 import { Form, FetchOptions, ProgressCallback } from '../Types';
-export declare function request(url: string, data?: Form<any> | null, options?: {
+export declare function request(url: string, data?: Form<any>, options?: {
     fetchOptions?: FetchOptions;
     auth?: boolean;
     method?: string;
     bypassAwaitConnection?: boolean;
-    responseType?: 'json' | 'blob' | 'text' | 'arrayBuffer' | 'formData' | 'document' | null;
+    responseType?: 'json' | 'blob' | 'text' | 'arrayBuffer' | 'formData' | 'document';
     contentType?: string;
 }): Promise<any>;
 export declare function hostFiles(fileList: FormData, params: {

package/js/utils/utils.js

@@ -168,11 +168,11 @@ function extractFormData(form) {
     function appendData(data, key, val) {
         let keys = key.split('[').map(k => {
             let key = k.replace(']', '');
-            if (key.match(/\d+/)) {
+            if (key.match(/\d+/) && !key.includes('.')) {
                 key = Number(key);
             }
             else if (key[0] === '"' && key[key.length - 1] === '"' || key[0] === "'" && key[key.length - 1] === "'") {
-                key = key.replace(/"/g, '');
+                key = key.replace(/"/g, '').replace(/'/g, '');
             }
             return key;
         });

package/package.json

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