@digione/node-custom-api 0.1.9 → 0.2.0-alpha10

package/middlewares/paramQuery.d.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
 export declare const getAuthParam: (req: Request, res: Response, next: any) => void;
 export declare const getStremParam: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParam: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParam: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const getQueryParamCUD: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParamFile: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParamFile: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const changeQueryParam: (value?: {}, { skipSystem }?: {
     skipSystem?: boolean;
 }) => (req: Request, res: Response, next: any) => any;
@@ -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,7 +1,9 @@
 "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 tslib_1 = require("tslib");
 const helper_1 = require("../utils/helper");
+const errors_1 = require("../errors");
 const _ = require("lodash");
 const getAuthParam = (req, res, next) => {
     res.locals.option['hostname'] = ((0, helper_1.getENV)('NODE_ENV') == 'development' ? 'http' : 'https') + '://' + req.get('host');
@@ -77,7 +79,8 @@ const getStremParam = (req, res, next) => {
     });
 };
 exports.getStremParam = getStremParam;
-const getQueryParam = (req, res, next) => {
+const getQueryParam = (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     res.locals.option = res.locals.option || {};
     res.locals.option['lang_code'] = 'en';
     res.locals.option['currency'] = 'thb';
@@ -93,8 +96,20 @@ const getQueryParam = (req, res, next) => {
     else {
         res.locals.include = {};
     }
+    if (config['maxQueryLimit']) {
+        req.query.limit = req.query.limit || config['maxQueryLimit'];
+    }
     if (req.query.limit) {
         res.locals.option['limit'] = Number(req.query.limit);
+        if (config['maxQueryLimit'] && res.locals.option['limit'] > config['maxQueryLimit']) {
+            try {
+                yield (0, errors_1.paramError)(`"limit" must be less than or equal to ${config['maxQueryLimit']}`, { field: "limit" });
+            }
+            catch (err) {
+                let error = new errors_1.CustomError(err);
+                return res.status(error.code).send(error);
+            }
+        }
     }
     if (req.query.offset) {
         res.locals.option['offset'] = Number(req.query.offset);
@@ -124,9 +139,10 @@ const getQueryParam = (req, res, next) => {
         }
         return 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 +160,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 +234,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/models/system/file.d.ts

@@ -90,6 +90,7 @@ export declare const FileAttr: {
     upload: sequelize.TinyIntegerDataType;
     custom: sequelize.AbstractDataTypeConstructor;
     tags: sequelize.AbstractDataTypeConstructor;
+    group: sequelize.StringDataType;
     file_link: sequelize.EnumDataType<"no" | "yes">;
     file_id: sequelize.StringDataType;
     uid: sequelize.StringDataType;

package/models/system/file.js

@@ -95,6 +95,7 @@ exports.FileAttr = {
     upload: sequelize.TINYINT({ length: 1 }),
     custom: sequelize.JSON,
     tags: sequelize.JSON,
+    group: sequelize.STRING({ length: 20 }),
     file_link: sequelize.ENUM('no', 'yes'),
     file_id: sequelize.STRING({ length: 15 }),
     uid: sequelize.STRING({ length: 100 })

package/models/user/user.d.ts

@@ -50,9 +50,6 @@ export declare const UserAttr: {
     organ_id: {
         type: sequelize.IntegerDataType;
     };
-    member_id: {
-        type: sequelize.StringDataType;
-    };
     provider: sequelize.StringDataType;
     mobile: sequelize.StringDataType;
     mobile_code: sequelize.StringDataType;

package/models/user/user.js

@@ -58,10 +58,6 @@ exports.UserAttr = {
     organ_id: {
         type: sequelize.INTEGER({ length: 11 })
     },
-    // points:sequelize.INTEGER({length:11}),
-    member_id: {
-        type: sequelize.STRING(100)
-    },
     provider: sequelize.STRING(40),
     mobile: sequelize.STRING(20),
     mobile_code: sequelize.STRING(10)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digione/node-custom-api",
-  "version": "0.1.9",
+  "version": "0.2.0-alpha10",
   "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

@@ -62,16 +62,23 @@ export declare class FileUtil {
         width?: number;
         height?: number;
     }): Promise<any>;
-    beforeFindFile(where?: {}, { tags, group }?: {
+    beforeFindFile(where?: {}, { attributes, tags, group, verify }?: {
+        attributes?: any;
         tags?: TagFile;
         group?: any;
-    }): {};
-    findAllFile({ where, folder, full, file_link, thumb, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
+        verify?: boolean;
+    }): {
+        where: {};
+        attributes: any;
+        order: any[];
+    };
+    findAllFile({ where, folder, full, file_link, thumb, verify, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
         where?: {};
         folder?: boolean;
         full?: boolean;
         file_link?: boolean;
         thumb?: boolean;
+        verify?: boolean;
         width?: number;
         height?: number;
         parent_folder?: string;
@@ -82,6 +89,12 @@ export declare class FileUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<any[]>;
+    countFileByFolder(slug: string, { where, parent_folder, tags, group }?: {
+        where?: {};
+        parent_folder?: string;
+        tags?: any[];
+        group?: any;
+    }): Promise<number>;
     findAndCountAllFileByFolder(slug: string, { where, file_link, parent_folder, limit, offset, tag, tags, group }?: {
         where?: {};
         file_link?: boolean;
@@ -124,11 +137,12 @@ export declare class FileUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<any>;
-    uploadByReq(req: Request, slug: string, user_id: any, { parent_id, parent_slug, name, root, thumb, width, height, input, is_hidden, tags, group }?: {
+    uploadByReq(req: Request, slug: string, user_id: any, { parent_id, parent_slug, name, root, format, thumb, width, height, input, is_hidden, tags, group }?: {
         parent_id?: number;
         parent_slug?: string;
         name?: any;
         root?: boolean;
+        format?: boolean;
         thumb?: boolean;
         width?: number;
         height?: number;
@@ -146,7 +160,7 @@ export declare class FileUtil {
         hidden?: number;
         input?: {};
     }): Promise<any>;
-    createFileByPath(files: Array<string>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
+    createFileByPath(files: Array<any>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
         parent_slug?: string;
         type?: string;
         name?: any;
@@ -156,7 +170,8 @@ export declare class FileUtil {
         group?: any;
     }): Promise<any>;
     allowedFileType(extension: any): Promise<any>;
-    formatFile(folder_id: any, user_id: any, reqs: Array<any>, files: Array<any>, { use_id, field, formatDateTime, input, is_hidden, tags, group }?: {
+    formatFile(folder_id: any, user_id: any, reqs: Array<any>, files: Array<any>, { format, use_id, field, formatDateTime, input, is_hidden, tags, group }?: {
+        format?: boolean;
         use_id?: boolean;
         field?: any[];
         formatDateTime?: string;
@@ -169,7 +184,7 @@ export declare class FileUtil {
         user_id: any;
         organ_id: any;
         organ_by: any;
-        sort: string;
+        sort: any;
         date_added: string;
         name: any;
         filename: any;
@@ -179,15 +194,18 @@ export declare class FileUtil {
         extension: string;
         type: any;
         is_hidden: any;
-        tags: TagFile;
+        tags: any;
+        custom: any;
         group: any;
     }[]>;
-    insertFileUnique(results: Array<any>, { thumb, width, height }?: {
+    insertFileUnique(results: Array<any>, { format, thumb, width, height }?: {
+        format?: boolean;
         thumb?: boolean;
         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 }?: {