@nextage/nx-frame-be 1.0.21 → 1.0.26

package/build/common/base/base.model.d.ts

@@ -31,7 +31,7 @@ import { BaseMongoDoc, BaseMongoModel } from './base.interfaces';
 import { ArrayItemParams, ChangeStreamData } from './base.interfaces';
 import { CrudItemEvent, FilterParams } from './base.interfaces';
 import { QueryPagination } from './base.interfaces';
-import { ModelData, ModelDefParams } from './mongo.types';
+import { ModelData } from './mongo.types';
 export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel extends BaseMongoModel<TAttrs, TDoc>> extends EventEmitter {
     name: string;
     mgModel: TMongoModel;
@@ -58,7 +58,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
     /**
      * Get default parameters
      */
-    get modelParams(): ModelDefParams | null;
+    get modelParams(): any;
     /**
      *
      */
@@ -207,7 +207,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      *
      * @param {*} sort
      */
-    parseSortObject(sort: NxObject): NxObject;
+    parseSortObject(sort?: NxObject): NxObject;
     /**
      * Create document using Moongose wrapper method
      *

package/build/common/base/base.model.js

@@ -56,7 +56,7 @@ class BaseModel extends events_1.EventEmitter {
     get modelParams() {
         if (!this.defaultParams)
             return null;
-        return this.defaultParams;
+        return (0, utils_1.clone)(this.defaultParams);
     }
     /**
      *
@@ -153,8 +153,9 @@ class BaseModel extends events_1.EventEmitter {
             let options = {};
             if (offset || limit)
                 options = { skip: offset, limit: limit };
-            if (sort || this.defaultParams.sort)
-                options.sort = this.parseSortObject(sort || this.defaultParams.sort);
+            options.sort = this.parseSortObject(sort);
+            // if (sort || this.modelParams.sort)
+            //   options.sort = this.parseSortObject(sort || this.modelParams.sort!);
             // return await this.mgModel.find(filter, fields, options).sort(this.parseSortObject(sort || this.defaultParams.sort!));
             let query = this.mgModel.find(filter, fields, options);
             if (Array.isArray(queryActions.populate))
@@ -353,6 +354,9 @@ class BaseModel extends events_1.EventEmitter {
      * @param {*} sort
      */
     parseSortObject(sort) {
+        var _a;
+        sort !== null && sort !== void 0 ? sort : (sort = (_a = this.modelParams) === null || _a === void 0 ? void 0 : _a.sort);
+        sort !== null && sort !== void 0 ? sort : (sort = {});
         for (let k in sort) {
             if (sort[k] === 0)
                 sort[k] = -1;

package/build/common/crypto/crypto.utils.js

@@ -212,7 +212,13 @@ class CryptoUtils {
     decryptText(text, secret) {
         if (!text || !secret)
             return '';
-        return crypto_js_1.default.AES.decrypt(text, secret).toString(crypto_js_1.default.enc.Utf8);
+        try {
+            return crypto_js_1.default.AES.decrypt(text, secret).toString(crypto_js_1.default.enc.Utf8);
+        }
+        catch (e) {
+            this.logger.error(e, (0, utils_1.logClassCtx)(this, 'decryptText'));
+            return '';
+        }
     }
     /**
      * Encrypt plain text string to AES using CryptoJS
@@ -224,7 +230,13 @@ class CryptoUtils {
     encryptText(text, secret) {
         if (!text || !secret)
             return '';
-        return crypto_js_1.default.AES.encrypt(text, secret).toString();
+        try {
+            return crypto_js_1.default.AES.encrypt(text, secret).toString();
+        }
+        catch (e) {
+            this.logger.error(e, (0, utils_1.logClassCtx)(this, 'encryptText'));
+            return '';
+        }
     }
     /**
      * Generate an md5 hash from given string

package/build/common/utils.js

@@ -46,7 +46,7 @@ function generateJwt(sub, jti, iss, data, signOpts = {}, secret) {
     if (!signOpts)
         signOpts = {};
     if (!signOpts.expiresIn)
-        signOpts.expiresIn = process.env.TOKEN_VALIDITY_DAYS ? `${process.env.TOKEN_VALIDITY_DAYS}d` : `${process.env.JWT_VALIDITY || '8h'}`;
+        signOpts.expiresIn = process.env.JWT_VALIDITY ? `${process.env.JWT_VALIDITY || '8h'}` : `${process.env.TOKEN_VALIDITY_DAYS}d`;
     if (!signOpts.algorithm && process.env.JWT_ALGORITHM)
         signOpts.algorithm = process.env.JWT_ALGORITHM;
     if (!signOpts.algorithm)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextage/nx-frame-be",
-  "version": "1.0.21",
+  "version": "1.0.26",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",