@nest-omni/core 1.0.28 → 1.0.30

package/constants/language-code.d.ts

@@ -1,5 +1,5 @@
 export declare enum LanguageCode {
-    en_US = "en_US",
-    zh_CN = "zh_CN"
+    en_US = "en-US",
+    zh_CN = "zh-CN"
 }
 export declare const supportedLanguageCount: number;

package/constants/language-code.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportedLanguageCount = exports.LanguageCode = void 0;
 var LanguageCode;
 (function (LanguageCode) {
-    LanguageCode["en_US"] = "en_US";
-    LanguageCode["zh_CN"] = "zh_CN";
+    LanguageCode["en_US"] = "en-US";
+    LanguageCode["zh_CN"] = "zh-CN";
 })(LanguageCode || (exports.LanguageCode = LanguageCode = {}));
 exports.supportedLanguageCount = Object.values(LanguageCode).length;

package/decorators/api-page-ok-response.decorator.d.ts

@@ -1,5 +1,5 @@
 import type { Type } from '@nestjs/common';
-export declare function ApiPageOkResponse<T extends Type>(options: {
+export declare function ApiPageResponse<T extends Type>(options: {
     type: T;
     description?: string;
 }): MethodDecorator;

package/decorators/api-page-ok-response.decorator.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiPageOkResponse = void 0;
+exports.ApiPageResponse = void 0;
 const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const page_dto_1 = require("../common/dto/page.dto");
-function ApiPageOkResponse(options) {
+function ApiPageResponse(options) {
     return (0, common_1.applyDecorators)((0, swagger_1.ApiExtraModels)(page_dto_1.PageDto), (0, swagger_1.ApiExtraModels)(options.type), (0, swagger_1.ApiOkResponse)({
         description: options.description,
         schema: {
@@ -22,4 +22,4 @@ function ApiPageOkResponse(options) {
         },
     }));
 }
-exports.ApiPageOkResponse = ApiPageOkResponse;
+exports.ApiPageResponse = ApiPageResponse;

package/decorators/field.decorators.d.ts

@@ -66,6 +66,6 @@ export declare function DateField(options?: Omit<ApiPropertyOptions, 'type'> & I
 export declare function DateFieldOptional(options?: Omit<ApiPropertyOptions, 'type' | 'required'> & IDateFieldOptions): PropertyDecorator;
 export declare function IpFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IIPFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function IpField(options: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
-export declare function ObjectField(options: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
+export declare function ObjectField(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function ObjectFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export {};

package/decorators/field.decorators.js

@@ -421,7 +421,7 @@ function IpField(options) {
     return (0, common_1.applyDecorators)(...decorators);
 }
 exports.IpField = IpField;
-function ObjectField(options) {
+function ObjectField(options = {}) {
     const decorators = [
         (0, class_transformer_1.Type)(() => Object),
         (0, class_validator_1.IsObject)({

package/decorators/omni-auth.decorator.d.ts

@@ -1,8 +1,12 @@
 export interface IOmniAuth {
-    uid: number;
+    uid: string;
     username: string;
     tenantId: string;
     appId: string;
+    admin: boolean;
+    role: string;
 }
-export declare const OmniAuth: (...dataOrPipes: (string | import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
-export declare function getOmniAuthData(req: any, data?: string): IOmniAuth;
+export declare const OmniAuth: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | keyof IOmniAuth)[]) => ParameterDecorator;
+export declare function getOmniAuthData<T extends keyof IOmniAuth>(request: {
+    headers: Record<string, string>;
+}, key?: T): IOmniAuth[T] | IOmniAuth;

package/decorators/omni-auth.decorator.js

@@ -2,34 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOmniAuthData = exports.OmniAuth = void 0;
 const common_1 = require("@nestjs/common");
-const lodash = require("lodash");
+const lodash_1 = require("lodash");
 const config_1 = require("@nestjs/config");
-exports.OmniAuth = (0, common_1.createParamDecorator)((field, ctx) => {
-    return getOmniAuthData(ctx.switchToHttp().getRequest(), field);
+exports.OmniAuth = (0, common_1.createParamDecorator)((key, ctx) => {
+    return getOmniAuthData(ctx.switchToHttp().getRequest(), key);
 });
-function getOmniAuthData(req, data) {
-    const headers = req.headers;
+function getOmniAuthData(request, key) {
+    const headers = request.headers;
     let user;
-    const configService = new config_1.ConfigService(req);
-    if (lodash.isEmpty(headers['x-userid']) ||
-        lodash.isEmpty(headers['x-username'])) {
-        if (process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'uat') {
+    const configService = new config_1.ConfigService(request);
+    if ((0, lodash_1.isEmpty)(headers['x-userid']) || (0, lodash_1.isEmpty)(headers['x-username'])) {
+        if (process.env.NODE_ENV === 'dev') {
             user = {
                 uid: configService.get('MOCK_UID'),
                 username: configService.get('MOCK_USERNAME'),
                 appId: configService.get('MOCK_APP_ID'),
                 tenantId: configService.get('MOCK_TENANT_ID'),
+                admin: configService.get('MOCK_ADMIN', false),
+                role: configService.get('MOCK_ROLE', ''),
             };
         }
+        else {
+            throw new Error('User information not found in headers.');
+        }
     }
     else {
         user = {
-            uid: headers['x-userid'],
-            username: headers['x-username'],
-            appId: headers['x-appid'],
-            tenantId: headers['x-tenantid'],
+            uid: headers['x-userid'] || '',
+            username: headers['x-username'] || '',
+            appId: headers['x-appid'] || '',
+            tenantId: headers['x-tenantid'] || '',
+            admin: headers['x-admin'] === '1',
+            role: headers['x-role'] || '',
         };
     }
-    return data ? user[data] : user;
+    return key ? user[key] : user;
 }
 exports.getOmniAuthData = getOmniAuthData;

package/decorators/transform.decorators.js

@@ -2,28 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhoneNumberSerializer = exports.S3UrlParser = exports.ToUpperCase = exports.ToLowerCase = exports.ToArray = exports.ToInt = exports.ToBoolean = exports.Trim = void 0;
 const class_transformer_1 = require("class-transformer");
+const libphonenumber_js_1 = require("libphonenumber-js");
 const lodash_1 = require("lodash");
 const providers_1 = require("../providers");
-const libphonenumber_js_1 = require("libphonenumber-js");
 function Trim() {
     return (0, class_transformer_1.Transform)((params) => {
         const value = params.value;
         if ((0, lodash_1.isArray)(value)) {
-            return (0, lodash_1.map)(value, (v) => (0, lodash_1.trim)(v).replace(/\s\s+/g, ' '));
+            return (0, lodash_1.map)(value, (v) => (0, lodash_1.trim)(v).replaceAll(/\s\s+/g, ' '));
         }
-        return (0, lodash_1.trim)(value).replace(/\s\s+/g, ' ');
+        return (0, lodash_1.trim)(value).replaceAll(/\s\s+/g, ' ');
     });
 }
 exports.Trim = Trim;
 function ToBoolean() {
     return (0, class_transformer_1.Transform)((params) => {
         switch (params.value) {
-            case 'true':
+            case 'true': {
                 return true;
-            case 'false':
+            }
+            case 'false': {
                 return false;
-            default:
+            }
+            default: {
                 return params.value;
+            }
         }
     }, { toClassOnly: true });
 }
@@ -38,8 +41,8 @@ exports.ToInt = ToInt;
 function ToArray() {
     return (0, class_transformer_1.Transform)((params) => {
         const value = params.value;
-        if ((0, lodash_1.isNil)(value)) {
-            return [];
+        if (!value) {
+            return value;
         }
         return (0, lodash_1.castArray)(value);
     }, { toClassOnly: true });
@@ -79,12 +82,15 @@ function S3UrlParser() {
     return (0, class_transformer_1.Transform)((params) => {
         const key = params.value;
         switch (params.type) {
-            case class_transformer_1.TransformationType.CLASS_TO_PLAIN:
+            case class_transformer_1.TransformationType.CLASS_TO_PLAIN: {
                 return providers_1.GeneratorProvider.getS3PublicUrl(key);
-            case class_transformer_1.TransformationType.PLAIN_TO_CLASS:
+            }
+            case class_transformer_1.TransformationType.PLAIN_TO_CLASS: {
                 return providers_1.GeneratorProvider.getS3Key(key);
-            default:
+            }
+            default: {
                 return key;
+            }
         }
     });
 }

package/i18n/en_US/validation.json

@@ -34,5 +34,6 @@
     "IS_UNIQUE": "{property} with the same value `{value}` exists",
     "IS_EXISTS": "{property} value `{value}` does not exists",
     "IS_FQDN": "{property} value `{value}` not a valid FQDN",
-    "IS_IP": "{property} value `{value}` not a valid IP"
+    "IS_IP": "{property} value `{value}` not a valid IP",
+    "IS_OBJECT": "{property} value `{value}` not a valid Object"
 }

package/i18n/zh_CN/validation.json

@@ -33,6 +33,7 @@
     "IS_NOT_EMPTY": "{property}不能为空",
     "IS_UNIQUE": "存在相同值为`{value}`的{property}",
     "IS_EXISTS": "{property}值`{value}`不存在",
-    "IS_FQDN": "{property} value `{value}` 必须是有效域名",
-    "IS_IP": "{property} value `{value}` 必须是有效IP"
+    "IS_FQDN": "{property} 值 `{value}` 必须是有效域名",
+    "IS_IP": "{property} 值 `{value}` 必须是有效IP",
+    "IS_OBJECT": "{property} 值 `{value}` 必须是有效对象"
 }

package/interceptors/language-interceptor.service.js

@@ -12,11 +12,11 @@ const constants_1 = require("../constants");
 const providers_1 = require("../providers");
 let LanguageInterceptor = class LanguageInterceptor {
     intercept(context, next) {
+        var _a;
         const request = context.switchToHttp().getRequest();
-        const language = request.headers['x-language-code'];
-        if (constants_1.LanguageCode[language]) {
-            providers_1.ContextProvider.setLanguage(language);
-        }
+        const language = request.headers['accept-language'];
+        const lang = (_a = constants_1.LanguageCode[language]) !== null && _a !== void 0 ? _a : constants_1.LanguageCode.en_US;
+        providers_1.ContextProvider.setLanguage(lang);
         return next.handle();
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",

package/providers/context.provider.d.ts

@@ -28,5 +28,7 @@ export declare class ContextProvider {
     static getAuthUserField<T extends keyof IOmniAuth>(field: T): IOmniAuth[T];
     static getAuthUser(): IOmniAuth;
     static getAppId(): string;
+    static getRole(): string;
+    static getAdmin(): boolean;
     static getTenantId(): string;
 }

package/providers/context.provider.js

@@ -59,6 +59,12 @@ class ContextProvider {
     static getAppId() {
         return ContextProvider.getAuthUserField('appId');
     }
+    static getRole() {
+        return ContextProvider.getAuthUserField('role');
+    }
+    static getAdmin() {
+        return ContextProvider.getAuthUserField('admin');
+    }
     static getTenantId() {
         return ContextProvider.getAuthUserField('tenantId');
     }

package/setup/bootstrap.setup.js

@@ -69,7 +69,7 @@ function bootstrapSetup(AppModule, SetupSwagger) {
             limit: '50mb',
         }), new nestjs_cls_1.ClsMiddleware({}).use, (0, __1.RequestIdMiddleware)(), (0, __1.PowerByMiddleware)(), (0, __1.OmniAuthMiddleware)());
         app.useStaticAssets('public', { prefix: '/' });
-        app.useGlobalInterceptors(new auth_user_interceptor_1.AuthUserInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor(), new nestjs_sentry_1.SentryInterceptor({
+        app.useGlobalInterceptors(new __1.LanguageInterceptor(), new auth_user_interceptor_1.AuthUserInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor(), new nestjs_sentry_1.SentryInterceptor({
             filters: [
                 {
                     type: common_1.HttpException,

package/shared/services/api-config.service.js

@@ -117,6 +117,12 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             logging: this.getBoolean('DB_LOG_ENABLED'),
             maxQueryExecutionTime: 3000,
             namingStrategy: new common_2.SnakeNamingStrategy(),
+            cache: this.getBoolean('DB_CACHE_ENABLED')
+                ? {
+                    type: 'ioredis',
+                    options: this.ioRedisConfig,
+                }
+                : false,
         };
     }
     get awsS3Config() {
@@ -218,6 +224,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     get isRedisEnabled() {
         return (this.getBoolean('BULL_ENABLED') ||
             this.getBoolean('CACHE_ENABLED') ||
+            this.getBoolean('DB_CACHE_ENABLED') ||
             (this.sessionEnabled && this.getBoolean('SESSION_REDIS_ENABLED')));
     }
     get bullConfig() {