@nest-omni/core 1.0.29 → 1.0.31

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,37 @@
 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'])) {
+    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' || process.env.NODE_ENV === 'uat') {
             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 {
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "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

@@ -51,6 +51,9 @@ class ContextProvider {
     static getAuthUserField(field) {
         var _a;
         const auth = (_a = ContextProvider.get(ContextProvider.authUserKey)) !== null && _a !== void 0 ? _a : {};
+        if (!auth) {
+            throw new Error('User information not found.');
+        }
         return auth[field];
     }
     static getAuthUser() {
@@ -59,6 +62,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

@@ -22,7 +22,6 @@ const common_1 = require("@nestjs/common");
 const nestjs_sentry_1 = require("@ntegral/nestjs-sentry");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const crud_1 = require("@dataui/crud");
-const auth_user_interceptor_1 = require("../interceptors/auth-user.interceptor");
 const nestjs_cls_1 = require("nestjs-cls");
 crud_1.CrudConfigService.load({
     auth: {
@@ -69,7 +68,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 __1.LanguageInterceptor(), 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 __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor(), new nestjs_sentry_1.SentryInterceptor({
             filters: [
                 {
                     type: common_1.HttpException,