@digione/node-custom-api 0.1.9-beta9 → 0.2.0-beta1

package/middlewares/paramQuery.d.ts

@@ -14,3 +14,6 @@ export declare const changeBodyParam: (value?: {}, { skipSystem, omit }?: {
     skipSystem?: boolean;
     omit?: any[];
 }) => (req: Request, res: Response, next: any) => any;
+export declare const changeConfigParam: (value?: {}, { skipSystem }?: {
+    skipSystem?: boolean;
+}) => (req: Request, res: Response, next: any) => any;

package/middlewares/paramQuery.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
+exports.changeConfigParam = exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
 const helper_1 = require("../utils/helper");
 const _ = require("lodash");
 const getAuthParam = (req, res, next) => {
@@ -127,6 +127,7 @@ const getQueryParam = (req, res, next) => {
 };
 exports.getQueryParam = getQueryParam;
 const getQueryParamCUD = (req, res, next) => {
+    let config = res.locals.config || {};
     res.locals.option = res.locals.option || {};
     if (req.query.include) {
         try {
@@ -144,7 +145,7 @@ const getQueryParamCUD = (req, res, next) => {
         res.locals.option['records'] = String(req.query.records).split(',');
     }
     if (req.query.ids) {
-        res.locals.option['ids'] = String(req.query.ids).split(',').slice(0, 25);
+        res.locals.option['ids'] = String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25));
     }
     return (0, exports.getAuthParam)(req, res, () => {
         if (req.query.lang_code) {
@@ -218,3 +219,13 @@ const changeBodyParam = (value = {}, { skipSystem = false, omit = [] } = {}) =>
     return next();
 };
 exports.changeBodyParam = changeBodyParam;
+const changeConfigParam = (value = {}, { skipSystem = false } = {}) => (req, res, next) => {
+    if (skipSystem && req.params.web_system_token) {
+        let bol = (typeof req.params.web != "undefined") || (req.params.web_system == req.params.web);
+        if (bol)
+            return next();
+    }
+    res.locals.config = Object.assign(Object.assign({}, res.locals.config || {}), value);
+    return next();
+};
+exports.changeConfigParam = changeConfigParam;

package/package.json

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

package/utils/auth.d.ts

@@ -3,8 +3,10 @@ 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, setting }?: {
         include?: {};
+        include_token?: {};
+        setting?: {};
     }): Promise<{
         refresh_token: string;
         access_token: string;

package/utils/auth.js

@@ -11,7 +11,7 @@ const authError_1 = require("../errors/authError");
 const jwt = require("jsonwebtoken");
 const signToken = (id, expIn, opt = {}) => {
     const date = (0, helper_1.getDateTime)();
-    return jwt.sign(Object.assign({ id: id, createAt: date, expAt: date.add(expIn, 'days') }, opt), (0, helper_1.getENV)('JWT_SECRET'));
+    return jwt.sign(Object.assign({ id: id, createAt: date, expAt: date.clone().add(expIn, 'days') }, opt), (0, helper_1.getENV)('JWT_SECRET'));
 };
 const getIdFromReq = (req) => {
     try {
@@ -30,14 +30,19 @@ class AuthUtil {
     constructor(ref) {
         this.ref = ref;
     }
-    create(id, { include = {} } = {}) {
+    create(id, { include = {}, include_token = {}, setting = {} } = {}) {
         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 rf_expire_in = Number(setting['expire_in'] || (0, helper_1.getENV)('REFRESH_TOKEN_AGE', 1));
+            let ac_expire_in = Number((0, helper_1.getENV)('ACCESS_TOKEN_AGE', 1));
+            if (rf_expire_in < ac_expire_in) {
+                ac_expire_in = rf_expire_in;
+            }
+            let input = Object.assign({ id: refreshTokenUUID, user_id: id, expired_at: (0, helper_1.getDateTime)().add(rf_expire_in, 'days'), token: signToken(id, rf_expire_in, Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)), accessToken: Object.assign({ user_id: id, expired_at: (0, helper_1.getDateTime)().add(ac_expire_in, 'days'), token: signToken(id, ac_expire_in, Object.assign({ refresh_token_id: refreshTokenUUID }, include_token)) }, include_access) }, include);
             yield refresh_token_1.RefreshTokenModel.schema(this.ref, "_").create(input, {
                 include: [
                     {

package/utils/db.js

@@ -32,12 +32,12 @@ const getWhereVal = (smth) => {
     return [key, value].join(` ${smth.comparator} `);
 };
 const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket = false } = {}) => {
-    as = as ? as + delimiter : as;
+    let keyPrefix = as ? "`" + as + "`" + delimiter : as;
     let symbolKeys = Object.getOwnPropertySymbols(where);
     let rawWhere = (Object.keys(where).concat(symbolKeys)).reduce((result, key) => {
         let value = where[key];
         if (typeof value !== 'undefined') {
-            key = typeof (value) == "string" ? `${as}${key}` : key;
+            key = typeof (key) == "string" ? keyPrefix + "`" + (key.split('.').join("`.`")) + "`" : key;
             if (typeof (value) == "string") {
                 value = SqlString.escape(value);
             }
@@ -48,7 +48,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                     result = `${result}( ${op}) AND `;
                 }
                 else {
-                    result = `${result + key} IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
+                    result = result + key + ` IN (${value.map(i => "'" + i + "'").join(',')}) AND `;
                 }
                 return result;
             }
@@ -62,7 +62,7 @@ const genWhere = (where = {}, { as = "", delimiter = ".", prefix = true, bracket
                 return result;
             }
             else if (typeof value == "object" && value['val']) {
-                result = `${result}${key}=${value['val']} AND `;
+                result = result + key + `=${value['val']} AND `;
                 return result;
             }
             result = result + key + "=" + value + " AND ";

package/utils/file.d.ts

@@ -191,7 +191,8 @@ export declare class FileUtil {
         width?: number;
         height?: number;
     }): any;
-    uploadRawFormat(files: Array<any>, { field }?: {
+    uploadRawFormat(files: Array<any>, { format, field }?: {
+        format?: boolean;
         field?: string[];
     }): Promise<any>;
     updateFile(id: string, input?: any, { paths }?: {

package/utils/file.js

@@ -133,6 +133,7 @@ class FileUtil {
             let reqs = [], results = [];
             for (let file of files) {
                 let extension = mime.extension(file.mimetype);
+                extension = extension ? extension : String(file.mimetype).split('/')[1];
                 let input = {
                     Bucket: this.bucket,
                     Key: this.ref + "/" + (0, helper_1.getDateTime)().format('X') + '.' + (0, helper_1.getSlug)(32) + '.' + extension,
@@ -256,7 +257,7 @@ class FileUtil {
                     result[width + 'x' + height] = thumb;
                     yield (0, db_1.update)(this.ref, file_1.FileModel.getTableName().toString(), { thumb: JSON.stringify(result) }, { where: { id: item['id'] } });
                 }
-                if (item['filename'] == path) {
+                if (thumb && item['filename'] == path) {
                     yield this.getStorage();
                     let data = yield this.afterQueryFile({ filename: thumb, path: thumb });
                     thumb = data.path;
@@ -406,6 +407,7 @@ class FileUtil {
                 let folder = yield this.createFolder(slug, { parent_id, root, name });
                 for (let file of req.files) {
                     let extension = mime.extension(file.mimetype);
+                    extension = extension ? extension : String(file.mimetype).split('/')[1];
                     let input = {
                         Bucket: this.bucket,
                         Key: this.ref + "/" + (0, helper_1.getDateTime)().format('X') + '.' + (0, helper_1.getSlug)(32) + '.' + extension,
@@ -579,6 +581,7 @@ class FileUtil {
                         path = (index < 0) ? protocol + path : path;
                     }
                     let extension = mime.extension(reqs[key].mimetype);
+                    extension = extension ? extension : String(reqs[key].mimetype).split('/')[1];
                     let item = Object.assign(Object.assign({}, input), { folder_id,
                         user_id,
                         organ_id,
@@ -639,10 +642,10 @@ class FileUtil {
             }
         });
     }
-    uploadRawFormat(files, { field = ['name', 'filename', 'path', 'mimetype', 'filesize', 'extension', 'type', 'height', 'width'] } = {}) {
+    uploadRawFormat(files, { format = false, field = ['name', 'filename', 'path', 'mimetype', 'filesize', 'extension', 'type', 'height', 'width'] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let query = yield this.uploadRaw(files);
-            return yield this.formatFile(0, 0, files, query, { format: true, field });
+            return yield this.formatFile(0, 0, files, query, { format, field });
         });
     }
     updateFile(id, input = {}, { paths = [] } = {}) {

package/utils/helper.d.ts

@@ -12,6 +12,10 @@ export declare const getDaysBetweenDates: (startDate: any, endDate: any, { utc }
 }) => any[];
 export declare const Joi_date: any;
 export declare const getENV: (str: string, def?: any) => any;
+export declare const getENVIndex: (index: string, { prefix, force }?: {
+    prefix?: string;
+    force?: boolean;
+}) => string;
 export declare const getSlug: (length?: number) => string;
 export declare const getDateMysql: (date?: any) => any;
 export declare const getTimestampMysql: (date?: any) => number;
@@ -50,6 +54,9 @@ export declare const removeHyphen: (str: string, replace?: string, { encode, rep
 export declare const getMobileNumber: (str: string, { prefix }?: {
     prefix?: string;
 }) => string;
+export declare const formatMobileNumber: (str: string, { prefix }?: {
+    prefix?: string;
+}) => string;
 export declare const removeSpace: (str: string, replace?: string) => string;
 export declare const removeAt: (str: string, replace?: string) => string;
 export declare const isNumber: (val: any, { negative }?: {
@@ -89,6 +96,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.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.getENVIndex = 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");
@@ -57,6 +57,13 @@ const getENV = (str, def) => {
     return process.env[str] || def;
 };
 exports.getENV = getENV;
+const getENVIndex = (index, { prefix = "dev", force = false } = {}) => {
+    if (process.env.NODE_ENV == "production" || force) {
+        return index;
+    }
+    return prefix + "_" + index;
+};
+exports.getENVIndex = getENVIndex;
 const getSlug = (length = 8) => {
     return new short_unique_id_1.default().randomUUID(length);
 };
@@ -154,14 +161,25 @@ exports.removeHyphen = removeHyphen;
 const getMobileNumber = (str, { prefix = "+66" } = {}) => {
     if (str) {
         str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "");
-        if (str.indexOf("+") == -1 && str.length == 10) {
-            str = str.substr(1);
+        if (str.indexOf("+") == -1 && (str.length == 10 || str.length == 9)) {
+            if (str.length == 10 && str[0] == "0")
+                str = str.substr(1);
             str = prefix + str;
         }
     }
     return str;
 };
 exports.getMobileNumber = getMobileNumber;
+const formatMobileNumber = (str, { prefix = "+66" } = {}) => {
+    if (str) {
+        str = str.replace(/_/g, "").replace(/-/g, "").replace(/ /g, "").replace(prefix, "");
+        if (str.length == 9) {
+            str = "0" + str;
+        }
+    }
+    return str;
+};
+exports.formatMobileNumber = formatMobileNumber;
 const removeSpace = (str, replace = "") => {
     return str ? str.replace(/ /g, replace) : "";
 };
@@ -355,6 +373,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.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] || "").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

@@ -783,7 +783,7 @@ class StreamUtil {
                 if (id_stream && (streams && streams.length)) {
                     let file_id = [];
                     yield Promise.all(streams.map(({ field_type, field_slug, field_data }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        if (field_type == "multiple" && field_data && field_data['choose_stream']) {
+                        if (field_type == "multiple" && field_data && field_data['choose_stream'] && field_data['self_table'] != "yes") {
                             let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_prefix'] });
                             let table_f = stream['stream_prefix'] ? stream['stream_prefix'] + stream['stream_slug'] : stream['stream_slug'];
                             yield (0, db_1.remove)(this.ref, `${table}_${table_f}`, { where: { row_id: id } });
@@ -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);
@@ -1925,11 +1932,13 @@ class StreamUtil {
                                 allow_type = new RegExp(/^(image.*)$/).test(file[field_slug]['mimetype']);
                                 if (!allow_type) {
                                     input[field_slug] = mime.extension(file[field_slug]['mimetype']);
+                                    input[field_slug] = input[field_slug] ? input[field_slug] : String(file[field_slug]['mimetype']).split('/')[1];
                                     field = Joi.string().valid('image/*');
                                 }
                             }
                             if (!allow_type && field_data['allowed_types']) {
                                 let extension = String(mime.extension(file[field_slug]['mimetype']));
+                                extension = extension ? extension : String(file[field_slug]['mimetype']).split('/')[1];
                                 if (!new RegExp(`^(${field_data['allowed_types']})$`).test(extension)) {
                                     input[field_slug] = extension;
                                     field = Joi.string().valid(...(field_data['allowed_types'].split('|') || []));

package/utils/user.d.ts

@@ -40,9 +40,9 @@ export declare const convertAddress: (data: any, { lang_code, transform }?: {
     lang_code?: string;
     transform?: boolean;
 }) => Promise<any>;
-export declare const getAddressIndex: (data: any, { condition, lang_code }?: {
+export declare const getAddressIndex: (data: any, { condition, where }?: {
     condition?: {};
-    lang_code?: string;
+    where?: {};
 }) => Promise<{}>;
 export declare const getCountry: (ref: string, { organ_id, lang_code, setting }?: {
     organ_id?: string;

package/utils/user.js

@@ -229,12 +229,11 @@ const convertAddress = (data, { lang_code = "en", transform = false } = {}) => t
     return data;
 });
 exports.convertAddress = convertAddress;
-const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    let result = {}, where = { lang_code: [lang_code, "en"] }, bol = false;
-    let order = [sequelize.literal(`FIELD(lang_code,${'\'' + where['lang_code'].join('\',\'') + '\''})`)];
+const getAddressIndex = (data, { condition = {}, where = {} } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let result = {}, bol = false;
     if (!bol && data['country'] && !condition['country_id']) {
         let country = yield country_1.CountryModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { country_name: data['country'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { country_name: data['country'] }), attributes: ['id']
         });
         if (country) {
             result['country_id'] = country['id'];
@@ -245,7 +244,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['state'] && !condition['state_id']) {
         let country_id = condition['country_id'] || null;
         let state = yield state_1.StateModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { country_id, state_name: data['state'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { country_id, state_name: data['state'] }), attributes: ['id']
         });
         if (state) {
             result['state_id'] = state['id'];
@@ -256,7 +255,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['city'] && !condition['city_id']) {
         let state_id = condition['state_id'] || null;
         let city = yield city_1.CityModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { state_id, city_name: data['city'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { state_id, city_name: data['city'] }), attributes: ['id']
         });
         if (city) {
             result['city_id'] = city['id'];
@@ -267,7 +266,7 @@ const getAddressIndex = (data, { condition = {}, lang_code = "en" } = {}) => tsl
     if (!bol && data['district']) {
         let city_id = condition['city_id'] || null;
         let district = yield district_1.DistrictModel.schema("core", "_").findOne({
-            raw: true, where: Object.assign(Object.assign({}, where), { city_id, district_name: data['district'] }), attributes: ['id'], order
+            raw: true, where: Object.assign(Object.assign({}, where), { city_id, district_name: data['district'] }), attributes: ['id']
         });
         if (district)
             result['district_id'] = district['id'];
@@ -318,9 +317,12 @@ const getGroupSetting = (ref, id, { attributes = ['id', 'shared', 'setting'] } =
 exports.getGroupSetting = getGroupSetting;
 const getGroupPermission = (ref, id, module, { permission = {}, group_shared = undefined, organ_id = 0, attributes = ['id', 'shared', 'setting'] } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (typeof group_shared == "undefined") {
-        let setting = yield (0, exports.getGroupSetting)(ref, id, { attributes });
-        if (setting)
-            group_shared = setting['shared'];
+        let group = yield (0, exports.getGroupSetting)(ref, id, { attributes });
+        if (group) {
+            permission['group_setting'] = group['setting'] || {};
+            permission['admin'] = group['shared'];
+            group_shared = group['shared'];
+        }
     }
     if (typeof group_shared != "undefined" && group_shared == 0) {
         let query = yield group_permission_1.UserGroupPermissionModel.schema(ref, "_").findOne({

package/utils/validator.js

@@ -105,7 +105,7 @@ const fileService = (setup, { userfiles = false, required = false, fileSize = 0,
     let option = setup(validate);
     let upload = userfiles ? option.array("userfiles", maxCount) : option.any();
     return upload(req, res, (err) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        return (0, exports.validateService)(Joi.object().keys({ tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) }).unknown())(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (0, exports.validateService)(Joi.object().keys({ tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) }).unknown(), { field_omit: [] })(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
             try {
                 let field = userfiles ? "userfiles" : undefined;
                 if (err) {
@@ -180,7 +180,7 @@ const multiService = ({ field = undefined, record = undefined, record_addition =
         schema['field'] = Joi.string().valid(...field);
         schema['value'] = value_schema;
     }
-    return (0, exports.validateService)(Joi.object().keys(Object.assign(Object.assign({}, schema), { records: Joi.array().items(Joi.object().keys(Object.assign({ id: Joi.number().required() }, record)).options({ stripUnknown: true })).min(1).required() })).options({ stripUnknown: true }));
+    return (0, exports.validateService)(Joi.object().keys(Object.assign(Object.assign({}, schema), { records: Joi.array().items(Joi.object().keys(Object.assign({ id: Joi.number().required() }, record)).options({ stripUnknown: true })).min(1).required() })).options({ stripUnknown: true }), { field_omit: [] });
 };
 exports.multiService = multiService;
 const streamService = ({ slug = "", name_space = "", param = "index" } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -207,7 +207,7 @@ const streamService = ({ slug = "", name_space = "", param = "index" } = {}) =>
 });
 exports.streamService = streamService;
 const importService = ({ import_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    return (0, exports.validateService)(Joi.object().keys(Object.assign({ import_type: Joi.string().valid(...import_type) }, schema)).unknown())(req, res, next);
+    return (0, exports.validateService)(Joi.object().keys(Object.assign({ import_type: Joi.string().valid(...import_type) }, schema)).unknown(), { field_omit: [] })(req, res, next);
 });
 exports.importService = importService;
 const exportService = ({ file_type = undefined, export_type = [], limit = 200, schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -240,8 +240,9 @@ const exportService = ({ file_type = undefined, export_type = [], limit = 200, s
 });
 exports.exportService = exportService;
 const printService = ({ print_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     if (req.query.ids) {
-        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',') });
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25)) });
     }
     if (print_type && !req.query.print_type) {
         req.query.print_type = print_type[0];
@@ -261,8 +262,9 @@ const printService = ({ print_type = [], schema = {} } = {}) => (req, res, next)
 });
 exports.printService = printService;
 const dataService = ({ schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     if (req.query.ids) {
-        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',') });
+        res.locals.option = Object.assign(Object.assign({}, (res.locals.option || {})), { ids: String(req.query.ids).split(',').slice(0, (config['maxQueryIds'] || 25)) });
     }
     let option = Object.keys(schema || {});
     if (option.length) {
@@ -288,11 +290,11 @@ const fieldService = ({ field = [], schema = {} } = {}) => (req, res, next) => t
 });
 exports.fieldService = fieldService;
 const convertService = ({ convert_type = [], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    return (0, exports.validateService)(Joi.object().keys(Object.assign({ ids: Joi.array().items(Joi.number()).min(1), convert_type: Joi.string().valid(...convert_type) }, schema)).unknown())(req, res, next);
+    return (0, exports.validateService)(Joi.object().keys(Object.assign({ ids: Joi.array().items(Joi.number()).min(1), convert_type: Joi.string().valid(...convert_type) }, schema)).unknown(), { field_omit: [] })(req, res, next);
 });
 exports.convertService = convertService;
 const entryValidateService = ({ module = ['contact'], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    return (0, exports.validateService)(Joi.object().keys(Object.assign({ module: Joi.string().valid(...module), entry_id: Joi.number().required() }, schema)).unknown())(req, res, next);
+    return (0, exports.validateService)(Joi.object().keys(Object.assign({ module: Joi.string().valid(...module), entry_id: Joi.number().required() }, schema)).unknown(), { field_omit: [] })(req, res, next);
 });
 exports.entryValidateService = entryValidateService;
 const entryParamService = ({ module = ['contact'], schema = {} } = {}) => (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {