@saihu/common 1.4.4 → 1.4.6

package/dist/auth/index.d.ts

@@ -4,4 +4,5 @@ export * from './auth.types';
 export * from './rbac.interface';
 export * from './rbac.guard';
 export * from './user.decorator';
+export * from './redis-permission.evaluator';
 //# 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;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,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;AACjC,cAAc,8BAA8B,CAAC"}

package/dist/auth/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./auth.types"), exports);
 __exportStar(require("./rbac.interface"), exports);
 __exportStar(require("./rbac.guard"), exports);
 __exportStar(require("./user.decorator"), exports);
+__exportStar(require("./redis-permission.evaluator"), exports);

package/dist/auth/redis-permission.evaluator.d.ts

@@ -0,0 +1,10 @@
+import { PermissionEvaluator } from './rbac.interface';
+import { RedisService } from '../interfaces/service.interface';
+export declare class RedisPermissionEvaluator implements PermissionEvaluator {
+    private readonly redis;
+    constructor(redis: RedisService);
+    hasPerms(user: {
+        sub: number;
+    }, required: string[]): Promise<boolean>;
+}
+//# sourceMappingURL=redis-permission.evaluator.d.ts.map

package/dist/auth/redis-permission.evaluator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-permission.evaluator.d.ts","sourceRoot":"","sources":["../../src/auth/redis-permission.evaluator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBACa,wBAAyB,YAAW,mBAAmB;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEjE,QAAQ,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAQ5E"}

package/dist/auth/redis-permission.evaluator.js

@@ -0,0 +1,36 @@
+"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.RedisPermissionEvaluator = void 0;
+const common_1 = require("@nestjs/common");
+const common_consts_1 = require("../consts/common.consts");
+let RedisPermissionEvaluator = class RedisPermissionEvaluator {
+    constructor(redis) {
+        this.redis = redis;
+    }
+    async hasPerms(user, required) {
+        if (!required.length)
+            return true;
+        const cached = await this.redis.get(`auth:perms:staff:${user.sub}`);
+        if (!cached)
+            return false;
+        return required.every((p) => cached.includes(p));
+    }
+};
+exports.RedisPermissionEvaluator = RedisPermissionEvaluator;
+exports.RedisPermissionEvaluator = RedisPermissionEvaluator = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(common_consts_1.REDIS_SERVICE)),
+    __metadata("design:paramtypes", [Object])
+], RedisPermissionEvaluator);

package/dist/saihu-common.module.d.ts.map

@@ -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;AAWxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IA6B3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IAiCrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}
+{"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;AAaxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IAqC3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IAwCrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}

package/dist/saihu-common.module.js

@@ -15,6 +15,8 @@ const rabbitmq_service_1 = require("./services/rabbitmq.service");
 const core_1 = require("@nestjs/core");
 const interceptors_1 = require("./interceptors");
 const config_1 = require("@nestjs/config");
+const redis_permission_evaluator_1 = require("./auth/redis-permission.evaluator");
+const rbac_interface_1 = require("./auth/rbac.interface");
 let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
     static forRoot(options) {
         const providers = [
@@ -33,15 +35,23 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
             // Add OperlogInterceptor as a regular provider so it can be used manually
             interceptors_1.OperlogInterceptor,
         ];
+        const exports = [
+            common_consts_1.COMMON_MODULE_OPTIONS,
+            common_consts_1.REDIS_SERVICE,
+            common_consts_1.RABBITMQ_SERVICE,
+            interceptors_1.OperlogInterceptor,
+        ];
+        if (options.usePerms) {
+            providers.push({
+                provide: rbac_interface_1.PERMISSION_EVALUATOR,
+                useClass: redis_permission_evaluator_1.RedisPermissionEvaluator,
+            });
+            exports.push(rbac_interface_1.PERMISSION_EVALUATOR);
+        }
         return {
             module: SaihuCommonModule_1,
             providers,
-            exports: [
-                common_consts_1.COMMON_MODULE_OPTIONS,
-                common_consts_1.REDIS_SERVICE,
-                common_consts_1.RABBITMQ_SERVICE,
-                interceptors_1.OperlogInterceptor,
-            ],
+            exports,
             global: true,
         };
     }
@@ -62,6 +72,12 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
             },
             // Add OperlogInterceptor as a regular provider so it can be used manually
             interceptors_1.OperlogInterceptor,
+            // Always register so downstream services get RedisPermissionEvaluator;
+            // with the isEnabled guard, it returns null/false harmlessly when Redis is off
+            {
+                provide: rbac_interface_1.PERMISSION_EVALUATOR,
+                useClass: redis_permission_evaluator_1.RedisPermissionEvaluator,
+            },
         ];
         return {
             module: SaihuCommonModule_1,
@@ -72,6 +88,7 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
                 common_consts_1.REDIS_SERVICE,
                 common_consts_1.RABBITMQ_SERVICE,
                 interceptors_1.OperlogInterceptor,
+                rbac_interface_1.PERMISSION_EVALUATOR,
             ],
             global: true, // 设置为全局模块
         };

package/dist/services/redis.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBACa,gBACX,YAAW,YAAY,EAAE,YAAY,EAAE,eAAe;IASpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAkB;gBAIhB,aAAa,EAAE,mBAAmB;IAM/C,YAAY;IAIZ,UAAU;IAsCV,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAYtC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,eAAe;CAMhB"}
+{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBACa,gBACX,YAAW,YAAY,EAAE,YAAY,EAAE,eAAe;IASpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAkB;gBAIhB,aAAa,EAAE,mBAAmB;IAM/C,YAAY;IAIZ,UAAU;IAsCV,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAatC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrC,eAAe;CAMhB"}

package/dist/services/redis.service.js

@@ -66,6 +66,8 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         }
     }
     async get(key) {
+        if (!this.isEnabled || !this.redisClient)
+            return null;
         const value = await this.redisClient.get(key);
         if (!value) {
             return null;
@@ -78,6 +80,8 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         }
     }
     async set(key, value, ttl) {
+        if (!this.isEnabled || !this.redisClient)
+            return;
         const serializedValue = typeof value === 'object' ? JSON.stringify(value) : String(value);
         if (ttl) {
             await this.redisClient.setex(key, ttl, serializedValue);
@@ -87,6 +91,8 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         }
     }
     async del(key) {
+        if (!this.isEnabled || !this.redisClient)
+            return;
         await this.redisClient.del(key);
     }
     onModuleDestroy() {

package/package.json

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