@saihu/common 1.1.77 → 1.1.79

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,12 +1,10 @@
1
- import { CanActivate, ExecutionContext } from '@nestjs/common';
2
- import { JwtService } from '@nestjs/jwt';
3
1
  import { Reflector } from '@nestjs/core';
4
- export declare class AuthGuard implements CanActivate {
5
- private jwtService;
6
- private readonly jwtSecret;
7
- private reflector;
8
- constructor(jwtService: JwtService, jwtSecret: string, reflector: Reflector);
9
- canActivate(context: ExecutionContext): Promise<boolean>;
10
- private extractTokenFromHeader;
2
+ declare const JwtAuthGuard_base: import("@nestjs/passport").Type<import("@nestjs/passport").IAuthGuard>;
3
+ export declare class JwtAuthGuard extends JwtAuthGuard_base {
4
+ private readonly reflector;
5
+ constructor(reflector: Reflector);
6
+ canActivate(context: any): boolean | Promise<boolean> | import("rxjs").Observable<boolean>;
7
+ handleRequest(err: any, user: any): any;
11
8
  }
9
+ export {};
12
10
  //# sourceMappingURL=auth-guard.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth-guard.d.ts","sourceRoot":"","sources":["../../src/auth/auth-guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAIjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,UAAU;IACI,OAAO,CAAC,QAAQ,CAAC,SAAS;IAChD,OAAO,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACS,SAAS,EAAE,MAAM,EAChD,SAAS,EAAE,SAAS;IAGxB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9D,OAAO,CAAC,sBAAsB;CAI/B"}
1
+ {"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"}
@@ -8,58 +8,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.AuthGuard = void 0;
12
+ exports.JwtAuthGuard = void 0;
16
13
  const common_1 = require("@nestjs/common");
17
- const jwt_1 = require("@nestjs/jwt");
14
+ const passport_1 = require("@nestjs/passport");
18
15
  const core_1 = require("@nestjs/core");
19
16
  const decorators_1 = require("./decorators");
20
- const dto_1 = require("../dto");
21
- let AuthGuard = class AuthGuard {
22
- constructor(jwtService, jwtSecret, reflector) {
23
- this.jwtService = jwtService;
24
- this.jwtSecret = jwtSecret;
17
+ const dto_1 = require("../dto"); // or replace with your error type
18
+ let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)('jwt') {
19
+ constructor(reflector) {
20
+ super();
25
21
  this.reflector = reflector;
26
22
  }
27
- async canActivate(context) {
23
+ canActivate(context) {
28
24
  const isPublic = this.reflector.getAllAndOverride(decorators_1.IS_PUBLIC_KEY, [
29
25
  context.getHandler(),
30
26
  context.getClass(),
31
27
  ]);
32
- if (isPublic) {
33
- // 💡 See this condition
28
+ if (isPublic)
34
29
  return true;
35
- }
36
- const request = context.switchToHttp().getRequest();
37
- const token = this.extractTokenFromHeader(request);
38
- if (!token) {
39
- throw new dto_1.BaseError(dto_1.BaseResponseDto.CODE_NOT_FOUND, '令牌缺失');
40
- }
41
- try {
42
- const payload = await this.jwtService.verifyAsync(token, {
43
- secret: this.jwtSecret,
44
- });
45
- // 💡 We're assigning the payload to the request object here
46
- // so that we can access it in our route handlers
47
- request.user = payload;
48
- }
49
- catch (_a) {
50
- throw new dto_1.BaseError(dto_1.BaseResponseDto.CODE_UNAUTHORIZED, '令牌无效');
51
- }
52
- return true;
30
+ return super.canActivate(context);
53
31
  }
54
- extractTokenFromHeader(request) {
55
- var _a, _b;
56
- const [type, token] = (_b = (_a = request.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')) !== null && _b !== void 0 ? _b : [];
57
- return type === 'Bearer' ? token : undefined;
32
+ handleRequest(err, user) {
33
+ if (err || !user) {
34
+ throw new dto_1.BaseError(dto_1.BaseResponseDto.CODE_UNAUTHORIZED, '令牌无效或缺失');
35
+ }
36
+ return user; // becomes req.user for @User()
58
37
  }
59
38
  };
60
- exports.AuthGuard = AuthGuard;
61
- exports.AuthGuard = AuthGuard = __decorate([
39
+ exports.JwtAuthGuard = JwtAuthGuard;
40
+ exports.JwtAuthGuard = JwtAuthGuard = __decorate([
62
41
  (0, common_1.Injectable)(),
63
- __param(1, (0, common_1.Inject)('JWT_SECRET')),
64
- __metadata("design:paramtypes", [jwt_1.JwtService, String, core_1.Reflector])
65
- ], AuthGuard);
42
+ __metadata("design:paramtypes", [core_1.Reflector])
43
+ ], JwtAuthGuard);
@@ -0,0 +1,9 @@
1
+ export interface AuthUser {
2
+ sub: string;
3
+ mobile?: string;
4
+ name?: string;
5
+ roles?: (string | number)[];
6
+ orgId?: string | number;
7
+ [k: string]: unknown;
8
+ }
9
+ //# sourceMappingURL=auth.types.d.ts.map
@@ -0,0 +1 @@
1
+ {"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"}
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
@@ -3,5 +3,5 @@ export declare const Public: () => import("@nestjs/common").CustomDecorator<stri
3
3
  export declare const PERMS_KEY = "perms";
4
4
  export declare const Perms: (perms: string[]) => import("@nestjs/common").CustomDecorator<string>;
5
5
  export declare const ROLES_KEY = "roles";
6
- export declare const Roles: (roles: string[]) => import("@nestjs/common").CustomDecorator<string>;
6
+ export declare const Roles: (roles: (string | number)[]) => import("@nestjs/common").CustomDecorator<string>;
7
7
  //# sourceMappingURL=decorators.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/auth/decorators.ts"],"names":[],"mappings":"AAEA,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"}
1
+ {"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"}
@@ -5,7 +5,6 @@ const common_1 = require("@nestjs/common");
5
5
  exports.IS_PUBLIC_KEY = 'isPublic';
6
6
  const Public = () => (0, common_1.SetMetadata)(exports.IS_PUBLIC_KEY, true);
7
7
  exports.Public = Public;
8
- // 添加perms 和 roles 装饰器
9
8
  exports.PERMS_KEY = 'perms';
10
9
  const Perms = (perms) => (0, common_1.SetMetadata)(exports.PERMS_KEY, perms);
11
10
  exports.Perms = Perms;
@@ -1,5 +1,7 @@
1
- export * from "./auth-guard";
2
- export * from "./custom-request";
3
- export * from "./guards/permission.guard";
4
- export { Public, Perms, Roles } from "./decorators";
1
+ export * from './auth-guard';
2
+ export * from './decorators';
3
+ export * from './auth.types';
4
+ export * from './rbac.interface';
5
+ export * from './rbac.guard';
6
+ export * from './user.decorator';
5
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC"}
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;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC"}
@@ -14,11 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.Roles = exports.Perms = exports.Public = void 0;
18
17
  __exportStar(require("./auth-guard"), exports);
19
- __exportStar(require("./custom-request"), exports);
20
- __exportStar(require("./guards/permission.guard"), exports);
21
- var decorators_1 = require("./decorators");
22
- Object.defineProperty(exports, "Public", { enumerable: true, get: function () { return decorators_1.Public; } });
23
- Object.defineProperty(exports, "Perms", { enumerable: true, get: function () { return decorators_1.Perms; } });
24
- Object.defineProperty(exports, "Roles", { enumerable: true, get: function () { return decorators_1.Roles; } });
18
+ __exportStar(require("./decorators"), exports);
19
+ __exportStar(require("./auth.types"), exports);
20
+ __exportStar(require("./rbac.interface"), exports);
21
+ __exportStar(require("./rbac.guard"), exports);
22
+ __exportStar(require("./user.decorator"), exports);
@@ -0,0 +1,10 @@
1
+ import { CanActivate, ExecutionContext } from '@nestjs/common';
2
+ import { Reflector } from '@nestjs/core';
3
+ import { PermissionEvaluator } from './rbac.interface';
4
+ export declare class RbacGuard implements CanActivate {
5
+ private reflector;
6
+ private evaluator;
7
+ constructor(reflector: Reflector, evaluator: PermissionEvaluator);
8
+ canActivate(ctx: ExecutionContext): Promise<boolean>;
9
+ }
10
+ //# sourceMappingURL=rbac.guard.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ 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;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ var __param = (this && this.__param) || function (paramIndex, decorator) {
12
+ return function (target, key) { decorator(target, key, paramIndex); }
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.RbacGuard = void 0;
16
+ const common_1 = require("@nestjs/common");
17
+ const core_1 = require("@nestjs/core");
18
+ const decorators_1 = require("./decorators");
19
+ const rbac_interface_1 = require("./rbac.interface");
20
+ let RbacGuard = class RbacGuard {
21
+ constructor(reflector, evaluator) {
22
+ this.reflector = reflector;
23
+ this.evaluator = evaluator;
24
+ }
25
+ async canActivate(ctx) {
26
+ var _a, _b, _c, _d, _e, _f;
27
+ const h = ctx.getHandler(), c = ctx.getClass();
28
+ const reqPerms = (_a = this.reflector.getAllAndOverride(decorators_1.PERMS_KEY, [h, c])) !== null && _a !== void 0 ? _a : [];
29
+ const reqRoles = (_b = this.reflector.getAllAndOverride(decorators_1.ROLES_KEY, [
30
+ h,
31
+ c,
32
+ ])) !== null && _b !== void 0 ? _b : [];
33
+ if (!reqPerms.length && !reqRoles.length)
34
+ return true;
35
+ const req = ctx.switchToHttp().getRequest();
36
+ const user = req.user;
37
+ if (!user)
38
+ return false;
39
+ if (reqRoles.length && !(await ((_d = (_c = this.evaluator).hasRoles) === null || _d === void 0 ? void 0 : _d.call(_c, user, reqRoles))))
40
+ return false;
41
+ if (reqPerms.length && !(await ((_f = (_e = this.evaluator).hasPerms) === null || _f === void 0 ? void 0 : _f.call(_e, user, reqPerms))))
42
+ return false;
43
+ return true;
44
+ }
45
+ };
46
+ exports.RbacGuard = RbacGuard;
47
+ exports.RbacGuard = RbacGuard = __decorate([
48
+ (0, common_1.Injectable)(),
49
+ __param(1, (0, common_1.Inject)(rbac_interface_1.PERMISSION_EVALUATOR)),
50
+ __metadata("design:paramtypes", [core_1.Reflector, Object])
51
+ ], RbacGuard);
@@ -0,0 +1,6 @@
1
+ export interface PermissionEvaluator {
2
+ hasRoles?(user: any, required: (string | number)[]): Promise<boolean> | boolean;
3
+ hasPerms?(user: any, required: string[]): Promise<boolean> | boolean;
4
+ }
5
+ export declare const PERMISSION_EVALUATOR: unique symbol;
6
+ //# sourceMappingURL=rbac.interface.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,4 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PERMISSION_EVALUATOR = void 0;
4
+ exports.PERMISSION_EVALUATOR = Symbol('PERMISSION_EVALUATOR');
@@ -0,0 +1,3 @@
1
+ import { AuthUser } from './auth.types';
2
+ 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;
3
+ //# sourceMappingURL=user.decorator.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,9 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.User = void 0;
4
+ const common_1 = require("@nestjs/common");
5
+ exports.User = (0, common_1.createParamDecorator)((data, ctx) => {
6
+ const req = ctx.switchToHttp().getRequest();
7
+ const u = req.user;
8
+ return data ? (u ? u[data] : undefined) : u;
9
+ });
@@ -4,7 +4,7 @@ export interface Operlog {
4
4
  request_method: string;
5
5
  user_agent: string;
6
6
  oper_name: string;
7
- dept_name: string;
7
+ org_id: string;
8
8
  oper_url: string;
9
9
  oper_ip: string;
10
10
  oper_param: string;
@@ -1 +1 @@
1
- {"version":3,"file":"operlog.dto.d.ts","sourceRoot":"","sources":["../../src/dto/operlog.dto.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IAEtB,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,MAAM,CAAC;IAEf,cAAc,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAElB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAE,MAAM,CAAC;IAEnB,WAAW,EAAE,MAAM,CAAC;IAEpB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;CACnB"}
1
+ {"version":3,"file":"operlog.dto.d.ts","sourceRoot":"","sources":["../../src/dto/operlog.dto.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IAEtB,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,MAAM,CAAC;IAEf,cAAc,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAE,MAAM,CAAC;IAEnB,WAAW,EAAE,MAAM,CAAC;IAEpB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;CACnB"}
@@ -34,6 +34,7 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
34
34
  }
35
35
  }
36
36
  intercept(context, next) {
37
+ var _a;
37
38
  if (!this.isEnabled) {
38
39
  return next.handle();
39
40
  }
@@ -66,8 +67,8 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
66
67
  method: controllerClass + '.' + handler.name,
67
68
  request_method: method,
68
69
  user_agent: userAgent,
69
- oper_name: (user === null || user === void 0 ? void 0 : user.name) || (user === null || user === void 0 ? void 0 : user.moniker) || '',
70
- dept_name: (user === null || user === void 0 ? void 0 : user.dept_id) || '',
70
+ oper_name: (user === null || user === void 0 ? void 0 : user.name) || '',
71
+ org_id: ((_a = user === null || user === void 0 ? void 0 : user.orgId) === null || _a === void 0 ? void 0 : _a.toString()) || '',
71
72
  oper_url: url,
72
73
  oper_ip: clientIp,
73
74
  oper_param: JSON.stringify(requestParams),
@@ -1,5 +1,5 @@
1
- import { DynamicModule } from "@nestjs/common";
2
- import { CommonModuleAsyncOptions, CommonModuleOptions } from "./interfaces/options.interface";
1
+ import { DynamicModule } from '@nestjs/common';
2
+ import { CommonModuleAsyncOptions, CommonModuleOptions } from './interfaces/options.interface';
3
3
  export declare class SaihuCommonModule {
4
4
  static forRoot(options: CommonModuleOptions): DynamicModule;
5
5
  static forRootAsync(options: CommonModuleAsyncOptions): DynamicModule;
@@ -1 +1 @@
1
- {"version":3,"file":"saihu-common.module.d.ts","sourceRoot":"","sources":["../src/saihu-common.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAY,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAYxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IAmC3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IAgCrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}
1
+ {"version":3,"file":"saihu-common.module.d.ts","sourceRoot":"","sources":["../src/saihu-common.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAY,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAWxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IA6B3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IA0BrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}
@@ -14,7 +14,6 @@ const common_consts_1 = require("./consts/common.consts");
14
14
  const rabbitmq_service_1 = require("./services/rabbitmq.service");
15
15
  const core_1 = require("@nestjs/core");
16
16
  const interceptors_1 = require("./interceptors");
17
- const auth_1 = require("./auth");
18
17
  const config_1 = require("@nestjs/config");
19
18
  let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
20
19
  static forRoot(options) {
@@ -31,7 +30,6 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
31
30
  provide: common_consts_1.RABBITMQ_SERVICE,
32
31
  useClass: rabbitmq_service_1.RabbitmqServiceImpl,
33
32
  },
34
- auth_1.PermissionGuard,
35
33
  ];
36
34
  const useOperlog = options.useOperlog !== false;
37
35
  if (useOperlog) {
@@ -43,12 +41,7 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
43
41
  return {
44
42
  module: SaihuCommonModule_1,
45
43
  providers,
46
- exports: [
47
- common_consts_1.COMMON_MODULE_OPTIONS,
48
- auth_1.PermissionGuard,
49
- common_consts_1.REDIS_SERVICE,
50
- common_consts_1.RABBITMQ_SERVICE,
51
- ],
44
+ exports: [common_consts_1.COMMON_MODULE_OPTIONS, common_consts_1.REDIS_SERVICE, common_consts_1.RABBITMQ_SERVICE],
52
45
  global: true,
53
46
  };
54
47
  }
@@ -67,18 +60,12 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
67
60
  provide: common_consts_1.RABBITMQ_SERVICE,
68
61
  useClass: rabbitmq_service_1.RabbitmqServiceImpl,
69
62
  },
70
- auth_1.PermissionGuard,
71
63
  ];
72
64
  return {
73
65
  module: SaihuCommonModule_1,
74
66
  imports: [config_1.ConfigModule, ...(options.imports || [])],
75
67
  providers,
76
- exports: [
77
- common_consts_1.COMMON_MODULE_OPTIONS,
78
- auth_1.PermissionGuard,
79
- common_consts_1.REDIS_SERVICE,
80
- common_consts_1.RABBITMQ_SERVICE,
81
- ],
68
+ exports: [common_consts_1.COMMON_MODULE_OPTIONS, common_consts_1.REDIS_SERVICE, common_consts_1.RABBITMQ_SERVICE],
82
69
  global: true, // 设置为全局模块
83
70
  };
84
71
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@saihu/common",
3
- "version": "1.1.77",
3
+ "version": "1.1.79",
4
4
  "description": "Common utilities for NestJS applications",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -26,6 +26,7 @@
26
26
  "@types/amqplib": "^0.10.7",
27
27
  "@types/express": "^5.0.1",
28
28
  "@types/node": "^22.14.1",
29
+ "@types/passport": "^1.0.17",
29
30
  "typescript": "^5.8.3"
30
31
  },
31
32
  "dependencies": {
@@ -34,6 +35,7 @@
34
35
  "@nestjs/core": "^11.1.1",
35
36
  "@nestjs/jwt": "^11.0.0",
36
37
  "@nestjs/microservices": "^11.1.6",
38
+ "@nestjs/passport": "^11.0.5",
37
39
  "amqp-connection-manager": "^5.0.0",
38
40
  "amqplib": "^0.10.9",
39
41
  "class-transformer": "^0.5.1",