skapi-js 1.0.47 → 1.0.48

package/js/main/skapi.js

@@ -8,9 +8,9 @@ import SkapiError from './error';
 import validator from '../utils/validator';
 import { getRecords, postRecord, deleteRecords, getTables, getIndexes, getTags, uploadFiles, getFile, grantPrivateRecordAccess, removePrivateRecordAccess, listPrivateRecordAccess, requestPrivateRecordAccessKey, deleteFiles, normalizeRecord } from '../methods/database';
 import { connectRealtime, joinRealtime, postRealtime, closeRealtime, getRealtimeUsers, getRealtimeGroups } from '../methods/realtime';
-import { request, secureRequest, mock, getFormResponse, formHandler, getConnection } from '../methods/request';
+import { request, secureRequest, mock, getFormResponse, formHandler, getConnection, clientSecretRequest } from '../methods/request';
 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, releaseTicket, getTicketKey, jwtLogin, clientSecretRequest } from '../methods/user';
+import { checkAdmin, getProfile, logout, recoverAccount, resendSignupConfirmation, authentication, login, signup, disableAccount, resetPassword, verifyEmail, verifyPhoneNumber, forgotPassword, changePassword, updateProfile, getUsers, setUserPool, userPool, lastVerifiedEmail, requestUsernameChange, consumeTicket, releaseTicket, getTicketKey, jwtLogin } from '../methods/user';
 export default class Skapi {
     get user() {
         if (this.__user && Object.keys(this.__user).length) {
@@ -23,7 +23,7 @@ export default class Skapi {
     set user(value) {
     }
     constructor(service, owner, options, __etc) {
-        this.version = '1.0.47';
+        this.version = '1.0.48';
         this.session = null;
         this.connection = null;
         this.host = 'skapi';

package/js/methods/request.d.ts

@@ -10,6 +10,14 @@ export declare function request(url: string, data?: Form<any> | null, options?:
     responseType?: string;
     contentType?: string;
 }): Promise<any>;
+export declare function clientSecretRequest(params: {
+    url: string;
+    clientSecretName: string;
+    method: 'get' | 'post' | 'GET' | 'POST';
+    headers?: Record<string, string>;
+    data?: Record<string, string>;
+    params?: Record<string, string>;
+}): any;
 export declare function secureRequest<RequestParams = {
     url: string;
     data?: any;

package/js/methods/request.js

@@ -513,6 +513,50 @@ async function _get(url, params, option, progress, noParams) {
     return _fetch.bind(this)(url, opt, progress);
 }
 ;
+export function clientSecretRequest(params) {
+    let hasSecret = false;
+    let checkClientSecretPlaceholder = (v) => {
+        for (let k in v) {
+            if (typeof v[k] === 'string' && v[k].includes('$CLIENT_SECRET')) {
+                hasSecret = true;
+                break;
+            }
+        }
+    };
+    validator.Params(params, {
+        url: 'string',
+        clientSecretName: 'string',
+        method: ['get', 'post', 'GET', 'POST'],
+        headers: (v) => {
+            if (v && typeof v !== 'object') {
+                throw new SkapiError('"headers" should be type: <object>.', { code: 'INVALID_PARAMETER' });
+            }
+            checkClientSecretPlaceholder(v);
+            return v;
+        },
+        data: (v) => {
+            if (v && typeof v !== 'object') {
+                throw new SkapiError('"data" should be type: <object>.', { code: 'INVALID_PARAMETER' });
+            }
+            checkClientSecretPlaceholder(v);
+            return v;
+        },
+        params: (v) => {
+            if (v && typeof v !== 'object') {
+                throw new SkapiError('"params" should be type: <object>.', { code: 'INVALID_PARAMETER' });
+            }
+            checkClientSecretPlaceholder(v);
+            return v;
+        }
+    }, ['clientSecretName', 'method', 'url']);
+    if (!params.data && !params.params) {
+        throw new SkapiError(`${params.method.toLowerCase() === 'post' ? '"data"' : '"params"'} is required.`, { code: 'INVALID_PARAMETER' });
+    }
+    if (!hasSecret) {
+        throw new SkapiError(`At least one parameter value should include "$CLIENT_SECRET" in ${params.method.toLowerCase() === 'post' ? '"data"' : '"params"'} or "headers".`, { code: 'INVALID_PARAMETER' });
+    }
+    return request.bind(this)("client-secret-request", params);
+}
 export async function secureRequest(params) {
     await this.__connection;
     let paramsStruct = {

package/js/methods/user.d.ts

@@ -32,14 +32,6 @@ export declare function checkAdmin(): Promise<boolean>;
 export declare function logout(): Promise<'SUCCESS: The user has been logged out.'>;
 export declare function resendSignupConfirmation(redirect: string): Promise<'SUCCESS: Signup confirmation E-Mail has been sent.'>;
 export declare function recoverAccount(redirect?: boolean | string): Promise<"SUCCESS: Recovery e-mail has been sent.">;
-export declare function clientSecretRequest(params: {
-    url: string;
-    clientSecretName: string;
-    method: 'get' | 'post' | 'GET' | 'POST';
-    headers?: Record<string, string>;
-    data?: Record<string, string>;
-    params?: Record<string, string>;
-}): any;
 export declare function jwtLogin(params: {
     idToken: string;
     keyUrl: string;

package/js/methods/user.js

@@ -341,58 +341,6 @@ export async function recoverAccount(redirect = false) {
     this.__disabledAccount = null;
     return 'SUCCESS: Recovery e-mail has been sent.';
 }
-export function clientSecretRequest(params) {
-    validator.Params(params, {
-        url: 'string',
-        clientSecretName: 'string',
-        method: ['get', 'post', 'GET', 'POST'],
-        headers: (v) => v,
-        data: (v) => {
-            if (v && typeof v !== 'object') {
-                throw new SkapiError('"data" should be type: <object>.', { code: 'INVALID_PARAMETER' });
-            }
-            return v;
-        },
-        params: (v) => {
-            if (v && typeof v !== 'object') {
-                throw new SkapiError('"params" should be type: <object>.', { code: 'INVALID_PARAMETER' });
-            }
-            return v;
-        }
-    }, ['clientSecretName', 'method', 'url']);
-    let hasSecret = false;
-    if (!params.data && !params.params) {
-        throw new SkapiError(`${params.method.toLowerCase() === 'post' ? '"data"' : '"params"'} is required.`, { code: 'INVALID_PARAMETER' });
-    }
-    if (params.data) {
-        for (let k in params.data) {
-            if (typeof params.data[k] === 'string' && params.data[k].includes('$CLIENT_SECRET')) {
-                hasSecret = true;
-                break;
-            }
-        }
-    }
-    if (params.params) {
-        for (let k in params.params) {
-            if (typeof params.params[k] === 'string' && params.params[k].includes('$CLIENT_SECRET')) {
-                hasSecret = true;
-                break;
-            }
-        }
-    }
-    if (params.headers) {
-        for (let k in params.headers) {
-            if (typeof params.headers[k] === 'string' && params.headers[k].includes('$CLIENT_SECRET')) {
-                hasSecret = true;
-                break;
-            }
-        }
-    }
-    if (!hasSecret) {
-        throw new SkapiError(`At least one parameter value should include "$CLIENT_SECRET" in ${params.method.toLowerCase() === 'post' ? '"data"' : '"params"'} or "headers".`, { code: 'INVALID_PARAMETER' });
-    }
-    return request.bind(this)("client-secret-request", params);
-}
 export async function jwtLogin(params) {
     validator.Params(params, {
         idToken: 'string',

package/package.json

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