@saihu/common 1.1.78 → 1.1.79

package/dist/auth/auth-guard.d.ts

@@ -1,5 +1,10 @@
+import { Reflector } from '@nestjs/core';
 declare const JwtAuthGuard_base: import("@nestjs/passport").Type<import("@nestjs/passport").IAuthGuard>;
 export declare class JwtAuthGuard extends JwtAuthGuard_base {
+    private readonly reflector;
+    constructor(reflector: Reflector);
+    canActivate(context: any): boolean | Promise<boolean> | import("rxjs").Observable<boolean>;
+    handleRequest(err: any, user: any): any;
 }
 export {};
 //# sourceMappingURL=auth-guard.d.ts.map

package/dist/auth/auth-guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-guard.d.ts","sourceRoot":"","sources":["../../src/auth/auth-guard.ts"],"names":[],"mappings":";AAGA,qBACa,YAAa,SAAQ,iBAAgB;CAAG"}
+{"version":3,"file":"auth-guard.d.ts","sourceRoot":"","sources":["../../src/auth/auth-guard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;AAIzC,qBACa,YAAa,SAAQ,iBAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAIjD,WAAW,CAAC,OAAO,EAAE,GAAG;IASxB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;CAMlC"}

package/dist/auth/auth-guard.js

@@ -5,13 +5,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JwtAuthGuard = void 0;
 const common_1 = require("@nestjs/common");
 const passport_1 = require("@nestjs/passport");
+const core_1 = require("@nestjs/core");
+const decorators_1 = require("./decorators");
+const dto_1 = require("../dto"); // or replace with your error type
 let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)('jwt') {
+    constructor(reflector) {
+        super();
+        this.reflector = reflector;
+    }
+    canActivate(context) {
+        const isPublic = this.reflector.getAllAndOverride(decorators_1.IS_PUBLIC_KEY, [
+            context.getHandler(),
+            context.getClass(),
+        ]);
+        if (isPublic)
+            return true;
+        return super.canActivate(context);
+    }
+    handleRequest(err, user) {
+        if (err || !user) {
+            throw new dto_1.BaseError(dto_1.BaseResponseDto.CODE_UNAUTHORIZED, '令牌无效或缺失');
+        }
+        return user; // becomes req.user for @User()
+    }
 };
 exports.JwtAuthGuard = JwtAuthGuard;
 exports.JwtAuthGuard = JwtAuthGuard = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [core_1.Reflector])
 ], JwtAuthGuard);

package/dist/auth/auth.types.d.ts

@@ -1,14 +1,9 @@
 export interface AuthUser {
-    /** JWT subject – the canonical user id across services */
     sub: string;
-    /** Optional common claims */
-    username?: string;
-    roles?: string[];
-    tenantId?: string;
-    orgId?: string;
-    /** Who minted the token / which side it’s for */
-    service?: 'im' | 'scm' | string;
-    /** Allow extra claims without breaking */
+    mobile?: string;
+    name?: string;
+    roles?: (string | number)[];
+    orgId?: string | number;
     [k: string]: unknown;
 }
 //# sourceMappingURL=auth.types.d.ts.map

package/dist/auth/auth.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../src/auth/auth.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC;IAEZ,6BAA6B;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,iDAAiD;IACjD,OAAO,CAAC,EAAE,IAAI,GAAG,KAAK,GAAG,MAAM,CAAC;IAEhC,0CAA0C;IAC1C,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB"}
+{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../src/auth/auth.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB"}

package/dist/auth/decorators.d.ts

@@ -1,9 +1,7 @@
-import { AuthUser } from './auth.types';
 export declare const IS_PUBLIC_KEY = "isPublic";
 export declare const Public: () => import("@nestjs/common").CustomDecorator<string>;
 export declare const PERMS_KEY = "perms";
 export declare const Perms: (perms: string[]) => import("@nestjs/common").CustomDecorator<string>;
 export declare const ROLES_KEY = "roles";
-export declare const Roles: (roles: string[]) => import("@nestjs/common").CustomDecorator<string>;
-export declare const User: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | keyof AuthUser | undefined)[]) => ParameterDecorator;
+export declare const Roles: (roles: (string | number)[]) => import("@nestjs/common").CustomDecorator<string>;
 //# sourceMappingURL=decorators.d.ts.map

package/dist/auth/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/auth/decorators.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,eAAO,MAAM,MAAM,wDAAyC,CAAC;AAG7D,eAAO,MAAM,SAAS,UAAU,CAAC;AACjC,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,qDAAkC,CAAC;AAExE,eAAO,MAAM,SAAS,UAAU,CAAC;AACjC,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,qDAAkC,CAAC;AAExE,eAAO,MAAM,IAAI,6MAShB,CAAC"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/auth/decorators.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,eAAO,MAAM,MAAM,wDAAyC,CAAC;AAE7D,eAAO,MAAM,SAAS,UAAU,CAAC;AACjC,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,qDAAkC,CAAC;AAExE,eAAO,MAAM,SAAS,UAAU,CAAC;AACjC,eAAO,MAAM,KAAK,GAAI,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,qDACjB,CAAC"}

package/dist/auth/decorators.js

@@ -1,22 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = exports.Roles = exports.ROLES_KEY = exports.Perms = exports.PERMS_KEY = exports.Public = exports.IS_PUBLIC_KEY = void 0;
+exports.Roles = exports.ROLES_KEY = exports.Perms = exports.PERMS_KEY = exports.Public = exports.IS_PUBLIC_KEY = void 0;
 const common_1 = require("@nestjs/common");
 exports.IS_PUBLIC_KEY = 'isPublic';
 const Public = () => (0, common_1.SetMetadata)(exports.IS_PUBLIC_KEY, true);
 exports.Public = Public;
-// 添加perms 和 roles 装饰器
 exports.PERMS_KEY = 'perms';
 const Perms = (perms) => (0, common_1.SetMetadata)(exports.PERMS_KEY, perms);
 exports.Perms = Perms;
 exports.ROLES_KEY = 'roles';
 const Roles = (roles) => (0, common_1.SetMetadata)(exports.ROLES_KEY, roles);
 exports.Roles = Roles;
-exports.User = (0, common_1.createParamDecorator)((data, ctx) => {
-    const req = ctx.switchToHttp().getRequest();
-    const user = req.user;
-    if (!user)
-        return undefined;
-    // Support both @User() and @User('orgId')
-    return data ? user[data] : user;
-});

package/dist/auth/index.d.ts

@@ -1,4 +1,7 @@
 export * from './auth-guard';
 export * from './decorators';
 export * from './auth.types';
+export * from './rbac.interface';
+export * from './rbac.guard';
+export * from './user.decorator';
 //# sourceMappingURL=index.d.ts.map

package/dist/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC"}

package/dist/auth/index.js

@@ -17,3 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth-guard"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./auth.types"), exports);
+__exportStar(require("./rbac.interface"), exports);
+__exportStar(require("./rbac.guard"), exports);
+__exportStar(require("./user.decorator"), exports);

package/dist/auth/rbac.guard.d.ts

@@ -0,0 +1,10 @@
+import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { PermissionEvaluator } from './rbac.interface';
+export declare class RbacGuard implements CanActivate {
+    private reflector;
+    private evaluator;
+    constructor(reflector: Reflector, evaluator: PermissionEvaluator);
+    canActivate(ctx: ExecutionContext): Promise<boolean>;
+}
+//# sourceMappingURL=rbac.guard.d.ts.map

package/dist/auth/rbac.guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rbac.guard.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAwB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,SAAS;IACa,OAAO,CAAC,SAAS;gBADvC,SAAS,EAAE,SAAS,EACU,SAAS,EAAE,mBAAmB;IAEhE,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAoB3D"}

package/dist/auth/rbac.guard.js

@@ -0,0 +1,51 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RbacGuard = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
+const decorators_1 = require("./decorators");
+const rbac_interface_1 = require("./rbac.interface");
+let RbacGuard = class RbacGuard {
+    constructor(reflector, evaluator) {
+        this.reflector = reflector;
+        this.evaluator = evaluator;
+    }
+    async canActivate(ctx) {
+        var _a, _b, _c, _d, _e, _f;
+        const h = ctx.getHandler(), c = ctx.getClass();
+        const reqPerms = (_a = this.reflector.getAllAndOverride(decorators_1.PERMS_KEY, [h, c])) !== null && _a !== void 0 ? _a : [];
+        const reqRoles = (_b = this.reflector.getAllAndOverride(decorators_1.ROLES_KEY, [
+            h,
+            c,
+        ])) !== null && _b !== void 0 ? _b : [];
+        if (!reqPerms.length && !reqRoles.length)
+            return true;
+        const req = ctx.switchToHttp().getRequest();
+        const user = req.user;
+        if (!user)
+            return false;
+        if (reqRoles.length && !(await ((_d = (_c = this.evaluator).hasRoles) === null || _d === void 0 ? void 0 : _d.call(_c, user, reqRoles))))
+            return false;
+        if (reqPerms.length && !(await ((_f = (_e = this.evaluator).hasPerms) === null || _f === void 0 ? void 0 : _f.call(_e, user, reqPerms))))
+            return false;
+        return true;
+    }
+};
+exports.RbacGuard = RbacGuard;
+exports.RbacGuard = RbacGuard = __decorate([
+    (0, common_1.Injectable)(),
+    __param(1, (0, common_1.Inject)(rbac_interface_1.PERMISSION_EVALUATOR)),
+    __metadata("design:paramtypes", [core_1.Reflector, Object])
+], RbacGuard);

package/dist/auth/rbac.interface.d.ts

@@ -0,0 +1,6 @@
+export interface PermissionEvaluator {
+    hasRoles?(user: any, required: (string | number)[]): Promise<boolean> | boolean;
+    hasPerms?(user: any, required: string[]): Promise<boolean> | boolean;
+}
+export declare const PERMISSION_EVALUATOR: unique symbol;
+//# sourceMappingURL=rbac.interface.d.ts.map

package/dist/auth/rbac.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rbac.interface.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,CACP,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC9B,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACtE;AACD,eAAO,MAAM,oBAAoB,eAAiC,CAAC"}

package/dist/auth/rbac.interface.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PERMISSION_EVALUATOR = void 0;
+exports.PERMISSION_EVALUATOR = Symbol('PERMISSION_EVALUATOR');

package/dist/auth/user.decorator.d.ts

@@ -0,0 +1,3 @@
+import { AuthUser } from './auth.types';
+export declare const User: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | keyof AuthUser | undefined)[]) => ParameterDecorator;
+//# sourceMappingURL=user.decorator.d.ts.map

package/dist/auth/user.decorator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.decorator.d.ts","sourceRoot":"","sources":["../../src/auth/user.decorator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,IAAI,6MAMhB,CAAC"}

package/dist/auth/user.decorator.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.User = void 0;
+const common_1 = require("@nestjs/common");
+exports.User = (0, common_1.createParamDecorator)((data, ctx) => {
+    const req = ctx.switchToHttp().getRequest();
+    const u = req.user;
+    return data ? (u ? u[data] : undefined) : u;
+});

package/dist/interceptors/operlog.interceptor.js

@@ -34,6 +34,7 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
         }
     }
     intercept(context, next) {
+        var _a;
         if (!this.isEnabled) {
             return next.handle();
         }
@@ -66,8 +67,8 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
             method: controllerClass + '.' + handler.name,
             request_method: method,
             user_agent: userAgent,
-            oper_name: (user === null || user === void 0 ? void 0 : user.username) || '',
-            org_id: (user === null || user === void 0 ? void 0 : user.orgId) || '',
+            oper_name: (user === null || user === void 0 ? void 0 : user.name) || '',
+            org_id: ((_a = user === null || user === void 0 ? void 0 : user.orgId) === null || _a === void 0 ? void 0 : _a.toString()) || '',
             oper_url: url,
             oper_ip: clientIp,
             oper_param: JSON.stringify(requestParams),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saihu/common",
-  "version": "1.1.78",
+  "version": "1.1.79",
   "description": "Common utilities for NestJS applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",