@digione/node-custom-api 0.1.9-beta17 → 0.1.9-beta19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digione/node-custom-api",
-  "version": "0.1.9-beta17",
+  "version": "0.1.9-beta19",
   "description": "Typescript node digione-api",
   "author": "Monchai Jirayupong <monchai.j@seven.co.th>",
   "license": "MIT",

package/utils/auth.d.ts

@@ -3,8 +3,9 @@ export declare const getTokenFromReq: (req: any) => any;
 export declare class AuthUtil {
     ref: string;
     constructor(ref: string);
-    create(id: any, { include }?: {
+    create(id: any, { include, include_token }?: {
         include?: {};
+        include_token?: {};
     }): Promise<{
         refresh_token: string;
         access_token: string;

package/utils/auth.js

@@ -30,14 +30,14 @@ class AuthUtil {
     constructor(ref) {
         this.ref = ref;
     }
-    create(id, { include = {} } = {}) {
+    create(id, { include = {}, include_token = {} } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let refreshTokenUUID = (0, helper_1.getUUID)();
             let include_access = {};
             if (Object.keys(include).length) {
                 include_access['setting'] = JSON.stringify(include);
             }
-            let input = Object.assign({ id: refreshTokenUUID, user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('REFRESH_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('REFRESH_TOKEN_AGE'), { refresh_token_id: refreshTokenUUID }), accessToken: Object.assign({ user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('ACCESS_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('ACCESS_TOKEN_AGE'), { refresh_token_id: refreshTokenUUID }) }, include_access) }, include);
+            let input = Object.assign({ id: refreshTokenUUID, user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('REFRESH_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('REFRESH_TOKEN_AGE'), Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)), accessToken: Object.assign({ user_id: id, expired_at: (0, helper_1.getDateTime)().add((0, helper_1.getENV)('ACCESS_TOKEN_AGE'), 'days'), token: signToken(id, (0, helper_1.getENV)('ACCESS_TOKEN_AGE'), Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)) }, include_access) }, include);
             yield refresh_token_1.RefreshTokenModel.schema(this.ref, "_").create(input, {
                 include: [
                     {

package/utils/helper.d.ts

@@ -92,6 +92,7 @@ export declare const slugify: (string?: any, { lowercase }?: {
 }) => any;
 export declare const slugifyField: (string?: any) => any;
 export declare const stripHtml: (string: string) => string;
+export declare const stripEmoji: (string: string) => string;
 export declare const replaceColon: (string: string, { decode }?: {
     decode?: boolean;
 }) => string;

package/utils/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
+exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
 const tslib_1 = require("tslib");
 const crypto = require("crypto");
 const dotenv = require("dotenv");
@@ -366,6 +366,10 @@ const stripHtml = (string) => {
         .replace(/\n/g, '');
 };
 exports.stripHtml = stripHtml;
+const stripEmoji = (string) => {
+    return String(string).replace(/(?![*#0-9]+)[\p{Emoji}\p{Emoji_Modifier}\p{Emoji_Component}\p{Emoji_Modifier_Base}\p{Emoji_Presentation}]/gu, '').trim();
+};
+exports.stripEmoji = stripEmoji;
 const replaceColon = (string, { decode = false } = {}) => {
     if (!string || typeof (string) != 'string') {
         return string;

package/utils/metadata.js

@@ -27,11 +27,11 @@ class MetadataUtil {
                 let value = {}, type = types;
                 if (_.isObject(input[key])) {
                     let val = {};
-                    _.each(input[key], (v, k) => { val['value_' + k] = (0, helper_1.stripHtml)(v ? v.replace(/[^\p{L}\p{N}\p{P}\p{Z}^$\n]/gu, '').substring(0, str_length) : ""); });
+                    _.each(input[key], (v, k) => { val['value_' + k] = v ? (0, helper_1.stripEmoji)((0, helper_1.stripHtml)(v)).substring(0, str_length) : ""; });
                     value = val;
                 }
                 else {
-                    value = { value_en: (0, helper_1.stripHtml)(String(input[key] || "").replace(/[^\p{L}\p{N}\p{P}\p{Z}^$\n]/gu, '').substring(0, str_length)) };
+                    value = { value_en: (0, helper_1.stripEmoji)((0, helper_1.stripHtml)(String(input[key] || "")).substring(0, str_length)) };
                 }
                 if (autoType && !items[key]) {
                     let str = key.split(":");

package/utils/stream.d.ts

@@ -170,6 +170,14 @@ export declare class StreamUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<{}>;
+    upsertBySlugField(fields: Array<any>, index: string, { ref, req, parent_slug, input, tags, group }?: {
+        ref?: string;
+        req?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+        parent_slug?: string;
+        input?: {};
+        tags?: TagFile;
+        group?: any;
+    }): Promise<{}>;
     findStream(slug: string, namespace: string, { result, lang_code, field_exclude, multiple, relationship, file, image, is_lang, stream, use_param }?: {
         result?: any[];
         lang_code?: string;

package/utils/stream.js

@@ -938,7 +938,14 @@ class StreamUtil {
     }
     upsertBySlug(slug, namespace, index, { ref = "", req = {}, parent_slug = "", input = {}, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let fields = yield this.getBuilder(slug, namespace, { index: "fields" }), where_folder = {};
+            let fields = yield this.getBuilder(slug, namespace, { index: "fields" });
+            return yield this.upsertBySlugField(fields, index, { ref, req, parent_slug, input, tags, group });
+        });
+    }
+    upsertBySlugField(fields, index, { ref = "", req = {}, parent_slug = "", input = {}, tags = [], group = undefined } = {}) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            fields = fields || [];
+            let where_folder = {};
             ref = ref || this.ref;
             let files = (req.file ? [req.file] : (req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {});
             let id_files = {}, fileUtil = new file_2.FileUtil(ref, this.option);