npm - @servicelabsco/slabs-access-manager - Versions diffs - 1.0.64 → 1.0.67 - Mend

@servicelabsco/slabs-access-manager 1.0.64 → 1.0.67

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.

Files changed (160) hide show

package/dist/access/middlewares/idempotency.middleware.js ADDED Viewed

@@ -0,0 +1,46 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdempotencyMiddleware = void 0;
+const common_1 = require("@nestjs/common");
+const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
+const mcp_idempotency_store_1 = require("../../mcp/auth/mcp.idempotency.store");
+let IdempotencyMiddleware = class IdempotencyMiddleware {
+    use(req, res, next) {
+        const header = String(req.headers?.['idempotency-key'] || '').trim();
+        if (!header || req.method === 'GET' || req.method === 'HEAD')
+            return next();
+        const key = mcp_idempotency_store_1.McpIdempotencyStore.scopedKey(this.callerKey(), header);
+        const replay = mcp_idempotency_store_1.McpIdempotencyStore.get(key);
+        if (replay !== undefined) {
+            res.status(mcp_idempotency_store_1.McpIdempotencyStore.getStatus(key) ?? 200).json(replay);
+            return;
+        }
+        let statusCode = 200;
+        const originalStatus = res.status.bind(res);
+        const originalJson = res.json.bind(res);
+        res.status = (code) => {
+            statusCode = code;
+            return originalStatus(code);
+        };
+        res.json = (body) => {
+            mcp_idempotency_store_1.McpIdempotencyStore.set(key, body, statusCode);
+            return originalJson(body);
+        };
+        next();
+    }
+    callerKey() {
+        const user = nestjs_utility_services_1.Auth.user();
+        return `${user?.id || 0}:${user?.auth_attributes?.business_id || 0}`;
+    }
+};
+exports.IdempotencyMiddleware = IdempotencyMiddleware;
+exports.IdempotencyMiddleware = IdempotencyMiddleware = __decorate([
+    (0, common_1.Injectable)()
+], IdempotencyMiddleware);
+//# sourceMappingURL=idempotency.middleware.js.map

package/dist/access/middlewares/idempotency.middleware.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"idempotency.middleware.js","sourceRoot":"","sources":["../../../src/access/middlewares/idempotency.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4D;AAC5D,oFAA8D;AAC9D,gFAA2E;AAQpE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAgB;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,IAAI,EAAE,CAAC;QAE5E,MAAM,GAAG,GAAG,2CAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,2CAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,GAAG,CAAC,MAAM,CAAC,2CAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnE,OAAO;QACX,CAAC;QAED,IAAI,UAAU,GAAG,GAAG,CAAC;QACrB,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;YAC1B,UAAU,GAAG,IAAI,CAAC;YAClB,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,GAAG,CAAC,IAAa,EAAE,EAAE;YACzB,2CAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YAC/C,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC;QACF,IAAI,EAAE,CAAC;IACX,CAAC;IAEO,SAAS;QACb,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAA6E,CAAC;QACpG,OAAO,GAAG,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,eAAe,EAAE,WAAW,IAAI,CAAC,EAAE,CAAC;IACzE,CAAC;CACJ,CAAA;AA/BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;GACA,qBAAqB,CA+BjC"}

package/dist/access/middlewares/index.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 export * from './business.middleware';
 export * from './external.access.middleware';
+export * from './idempotency.middleware';
 export * from './mcp.access.middleware';
+export * from './mcp.rate.limit.middleware';
 export * from './user.business.access.middleware';

package/dist/access/middlewares/index.js CHANGED Viewed

@@ -16,6 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./business.middleware"), exports);
 __exportStar(require("./external.access.middleware"), exports);
+__exportStar(require("./idempotency.middleware"), exports);
 __exportStar(require("./mcp.access.middleware"), exports);
+__exportStar(require("./mcp.rate.limit.middleware"), exports);
 __exportStar(require("./user.business.access.middleware"), exports);
 //# sourceMappingURL=index.js.map

package/dist/access/middlewares/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/access/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AAAA,+DAA6C;AAAA,0DAAwC;AAAA,oEAAiD"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/access/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AAAA,+DAA6C;AAAA,2DAAyC;AAAA,0DAAwC;AAAA,8DAA4C;AAAA,oEAAiD"}

package/dist/access/middlewares/mcp.access.middleware.js CHANGED Viewed

@@ -11,6 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpAccessMiddleware = void 0;
 const common_1 = require("@nestjs/common");
+const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
+const unauthorized_mcp_response_1 = require("../../mcp/http/unauthorized.mcp.response");
 const extract_client_credentials_1 = require("../libraries/extract.client.credentials");
 const credential_resolve_service_1 = require("../services/credential.resolve.service");
 let McpAccessMiddleware = class McpAccessMiddleware {
@@ -22,7 +24,15 @@ let McpAccessMiddleware = class McpAccessMiddleware {
         if (!creds)
             return next();
         const ip = req.headers['x-forwarded-for'] || req.ip || req.ips?.[0];
-        await this.credentialResolveService.authenticate(creds.clientId, creds.clientSecret, ip);
+        try {
+            await this.credentialResolveService.authenticate(creds.clientId, creds.clientSecret, ip);
+        }
+        catch (error) {
+            if (error instanceof nestjs_utility_services_1.AccessException) {
+                return unauthorized_mcp_response_1.UnauthorizedMcpResponse.unauthorized(res, 'Invalid or revoked credentials.');
+            }
+            throw error;
+        }
         next();
     }
 };

package/dist/access/middlewares/mcp.access.middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mcp.access.middleware.js","sourceRoot":"","sources":["../../../src/access/middlewares/mcp.access.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,wFAAmF;AACnF,uFAAkF;~~AAS3E~~,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,wBAAkD;QAAlD,6BAAwB,GAAxB,wBAAwB,CAA0B;IAAG,CAAC;IAEnF,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAgB;QAC1C,MAAM,KAAK,GAAG,qDAAwB,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAE1B,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;~~QAEzF~~,IAAI,EAAE,CAAC;IACX,CAAC;CACJ,CAAA;~~AAZY~~,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAE8C,qDAAwB;GADtE,mBAAmB,~~CAY~~/B"}
1	+ {"version":3,"file":"mcp.access.middleware.js","sourceRoot":"","sources":["../../../src/access/middlewares/mcp.access.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,oFAAyE;AACzE,wFAAmF;AACnF,wFAAmF;AACnF,uFAAkF;AAU3E,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,wBAAkD;QAAlD,6BAAwB,GAAxB,wBAAwB,CAA0B;IAAG,CAAC;IAEnF,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAgB;QAC1C,MAAM,KAAK,GAAG,qDAAwB,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAE1B,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,yCAAe,EAAE,CAAC;gBACnC,OAAO,mDAAuB,CAAC,YAAY,CAAC,GAAG,EAAE,iCAAiC,CAAC,CAAC;YACxF,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;QAED,IAAI,EAAE,CAAC;IACX,CAAC;CACJ,CAAA;AAnBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAE8C,qDAAwB;GADtE,mBAAmB,CAmB/B"}

package/dist/access/middlewares/mcp.rate.limit.middleware.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { NestMiddleware } from '@nestjs/common';
+export declare class McpRateLimitMiddleware implements NestMiddleware {
+    private readonly buckets;
+    use(req: any, res: any, next: () => void): void;
+    private callerKey;
+}

package/dist/access/middlewares/mcp.rate.limit.middleware.js ADDED Viewed

@@ -0,0 +1,50 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.McpRateLimitMiddleware = void 0;
+const common_1 = require("@nestjs/common");
+const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
+let McpRateLimitMiddleware = class McpRateLimitMiddleware {
+    constructor() {
+        this.buckets = new Map();
+    }
+    use(req, res, next) {
+        const windowMs = parseInt(process.env.MCP_THROTTLE_WINDOW || '', 10) || 60_000;
+        const max = parseInt(process.env.MCP_THROTTLE_RATE || '', 10) || 300;
+        const key = this.callerKey(req);
+        const now = Date.now();
+        const bucket = this.buckets.get(key);
+        if (!bucket || now >= bucket.resetAt) {
+            this.buckets.set(key, { resetAt: now + windowMs, count: 1 });
+            return next();
+        }
+        bucket.count += 1;
+        if (bucket.count > max) {
+            res.status(429).json({
+                jsonrpc: '2.0',
+                error: { code: -32000, message: 'Rate limit exceeded for this caller.' },
+                id: null,
+            });
+            return;
+        }
+        next();
+    }
+    callerKey(req) {
+        const user = nestjs_utility_services_1.Auth.user();
+        if (user?.id && user?.auth_attributes?.business_id) {
+            return `mcp:${user.id}:${user.auth_attributes.business_id}`;
+        }
+        const ip = req.headers?.['x-forwarded-for'] || req.ip || 'anon';
+        return `mcp-ip:${String(ip).split(',')[0].trim()}`;
+    }
+};
+exports.McpRateLimitMiddleware = McpRateLimitMiddleware;
+exports.McpRateLimitMiddleware = McpRateLimitMiddleware = __decorate([
+    (0, common_1.Injectable)()
+], McpRateLimitMiddleware);
+//# sourceMappingURL=mcp.rate.limit.middleware.js.map

package/dist/access/middlewares/mcp.rate.limit.middleware.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"mcp.rate.limit.middleware.js","sourceRoot":"","sources":["../../../src/access/middlewares/mcp.rate.limit.middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4D;AAC5D,oFAA8D;AAQvD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACc,YAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAmCzD,CAAC;IAjCG,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAgB;QACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC;QAC/E,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;QACrE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,GAAG,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7D,OAAO,IAAI,EAAE,CAAC;QAClB,CAAC;QAED,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;QAClB,IAAI,MAAM,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC;YACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,sCAAsC,EAAE;gBACxE,EAAE,EAAE,IAAI;aACX,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,EAAE,CAAC;IACX,CAAC;IAEO,SAAS,CAAC,GAAQ;QACtB,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAA6E,CAAC;QACpG,IAAI,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC;YACjD,OAAO,OAAO,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAChE,CAAC;QACD,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,MAAM,CAAC;QAChE,OAAO,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;IACvD,CAAC;CACJ,CAAA;AApCY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;GACA,sBAAsB,CAoClC"}

package/dist/access/services/access.business.service.d.ts CHANGED Viewed

@@ -6,6 +6,13 @@ export declare class AccessBusinessService {
     private readonly sqlService;
     constructor(accessService: AccessService, propertyService: PropertyService, sqlService: SqlService);
     validateAccess(): Promise<AccessBusinessEntity>;
+    assertActiveMembership(userId: number, businessId: number): Promise<AccessBusinessEntity>;
+    listActiveMemberships(userId: number, currentBusinessId?: number): Promise<{
+        id: number;
+        name: string;
+        role: string;
+        is_current: boolean;
+    }[]>;
     hasRoles(roles: string[]): Promise<AccessBusinessEntity>;
     validateRoles(roles: string[]): Promise<void>;
     getFrontendUrl(business_id: number): Promise<string>;

package/dist/access/services/access.business.service.js CHANGED Viewed

@@ -13,6 +13,7 @@ exports.AccessBusinessService = void 0;
 const common_1 = require("@nestjs/common");
 const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
 const access_business_entity_1 = require("../entities/access.business.entity");
+const business_user_entity_1 = require("../entities/business.user.entity");
 let AccessBusinessService = class AccessBusinessService {
     constructor(accessService, propertyService, sqlService) {
         this.accessService = accessService;
@@ -29,6 +30,39 @@ let AccessBusinessService = class AccessBusinessService {
             throw new nestjs_utility_services_1.AccessException();
         return business;
     }
+    async assertActiveMembership(userId, businessId) {
+        const business = await access_business_entity_1.AccessBusinessEntity.findOne({ where: { id: businessId } });
+        if (!business)
+            throw new nestjs_utility_services_1.OperationException('Unknown business_id.');
+        const membership = await business_user_entity_1.BusinessUserEntity.findOne({
+            where: { user_id: userId, business_id: businessId, active: true },
+        });
+        if (!membership)
+            throw new nestjs_utility_services_1.AccessException('You are not an active member of this business.');
+        return business;
+    }
+    async listActiveMemberships(userId, currentBusinessId) {
+        const rows = await business_user_entity_1.BusinessUserEntity.find({
+            where: { user_id: userId, active: true },
+            relations: ['business'],
+        });
+        const seen = new Set();
+        const list = [];
+        for (const row of rows) {
+            const business = row.business;
+            if (!business || seen.has(business.id))
+                continue;
+            seen.add(business.id);
+            list.push({
+                id: business.id,
+                name: business.name,
+                role: business.owner_id === userId ? 'Owner' : 'Member',
+                is_current: business.id === currentBusinessId,
+            });
+        }
+        list.sort((a, b) => Number(b.is_current) - Number(a.is_current) || a.name.localeCompare(b.name));
+        return list;
+    }
     async hasRoles(roles) {
         const business = await this.validateAccess();
         if (roles?.length > 0) {

package/dist/access/services/access.business.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"access.business.service.js","sourceRoot":"","sources":["../../../src/access/services/access.business.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,~~oFAA2H~~;~~AAC3H~~,+EAA0E;~~AAOnE~~,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YACqB,aAA4B,EAC5B,eAAgC,EAChC,UAAsB;QAFtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;IACxC,CAAC;IAOJ,KAAK,CAAC,cAAc;QAChB,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAAE,CAAC;QAEzB,MAAM,UAAU,GAAG,IAAI,EAAE,eAAe,EAAE,WAAW,CAAC;QACtD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,yCAAe,EAAE,CAAC;QAE7C,MAAM,QAAQ,GAAG,MAAM,6CAAoB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,yCAAe,EAAE,CAAC;QAE3C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAOD,KAAK,CAAC,QAAQ,CAAC,KAAe;QAC1B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE7C,IAAI,KAAK,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAOD,KAAK,CAAC,aAAa,CAAC,KAAe;QAC/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEnE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,yCAAe,CAAC,sDAAsD,CAAC,CAAC;IACpG,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,WAAmB;QACpC,MAAM,YAAY,GAAQ,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAChD,+EAA+E,WAAW,2BAA2B,CACxH,CAAC;QAEF,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QACjC,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC;QAEpB,MAAM,UAAU,GAAG,2BAA2B,CAAC;QAC/C,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;~~AAlEY~~,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAG2B,uCAAa;QACX,yCAAe;QACpB,oCAAU;GAJlC,qBAAqB,~~CAkEjC~~"}
1	+ {"version":3,"file":"access.business.service.js","sourceRoot":"","sources":["../../../src/access/services/access.business.service.ts"],"names":[],"mappings":"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"}

package/dist/access/services/access.report.service.d.ts CHANGED Viewed

@@ -35,6 +35,11 @@ export declare class AccessReportService {
         description: string;
     }): Promise<ReportEntity>;
     private newReport;
+    listAccessibleReports(search?: string): Promise<{
+        slug: string;
+        title: string;
+        description: string | null;
+    }[]>;
     private getReport;
     private hasAccess;
     getBaseOptions(): Promise<{

package/dist/access/services/access.report.service.js CHANGED Viewed

@@ -93,6 +93,25 @@ let AccessReportService = class AccessReportService {
         await script.save();
         return report;
     }
+    async listAccessibleReports(search) {
+        const rows = await nestjs_utility_services_1.ReportEntity.find({
+            select: ['id', 'name', 'description'],
+            order: { name: 'ASC' },
+        });
+        const needle = search?.trim().toLowerCase();
+        const accessible = [];
+        for (const row of rows || []) {
+            if (!(await this.hasAccess(row)))
+                continue;
+            if (needle) {
+                const hay = `${row.name} ${row.description || ''}`.toLowerCase();
+                if (!hay.includes(needle))
+                    continue;
+            }
+            accessible.push({ slug: row.name, title: row.name, description: row.description || null });
+        }
+        return accessible;
+    }
     async getReport(name) {
         const report = await nestjs_utility_services_1.ReportEntity.findOne({ where: { name }, relations: ['query', 'params'] });
         const hasAccess = await this.hasAccess(report);

package/dist/access/services/access.report.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"access.report.service.js","sourceRoot":"","sources":["../../../src/access/services/access.report.service.ts"],"names":[],"mappings":"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~~AA7QY~~,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAG0B,oCAAU;QACP,uCAAa;QACb,uCAAa;QACL,+CAAqB;QAC5B,gCAAc;GAN5C,mBAAmB,~~CA6Q~~/B"}
1	+ {"version":3,"file":"access.report.service.js","sourceRoot":"","sources":["../../../src/access/services/access.report.service.ts"],"names":[],"mappings":"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"}

package/dist/access/services/credential.resolve.service.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ export interface ResolvedCredential {
     clientId: string;
     businessId: number;
     userId: number;
+    scope?: string[];
 }
 export declare class CredentialResolveService {
     private readonly apiAccountService;

package/dist/access/services/credential.resolve.service.js CHANGED Viewed

@@ -34,7 +34,7 @@ let CredentialResolveService = class CredentialResolveService {
             ip: this.normalizeIp(ip),
         };
         const userSecret = await user_business_secret_entity_1.UserBusinessSecretEntity.findOne({ where: { client_id: clientId } });
-        if (userSecret) {
+        if (userSecret && !userSecret.deleted_at) {
             const data = await this.userBusinessAccessService.validate(payload);
             await this.touchUserSecretActivity(data.user_id, data.client_id);
             return {
@@ -42,6 +42,7 @@ let CredentialResolveService = class CredentialResolveService {
                 clientId: data.client_id,
                 businessId: data.business_id,
                 userId: data.user_id,
+                scope: Array.isArray(userSecret.access_scopes) ? userSecret.access_scopes : undefined,
             };
         }
         const api = await this.apiAccountService.validate(payload);
@@ -70,6 +71,8 @@ let CredentialResolveService = class CredentialResolveService {
                     product_id: product_type_enum_1.ProductTypeEnum.EMPLOYEE,
                     api_key_kind: 'user',
                     client_id: resolved.clientId,
+                    scope: resolved.scope?.length ? resolved.scope : ['mcp'],
+                    read_only: resolved.scope?.length === 1 && resolved.scope[0] === 'reporting:read',
                 },
             });
             return;

package/dist/access/services/credential.resolve.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"credential.resolve.service.js","sourceRoot":"","sources":["../../../src/access/services/credential.resolve.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAAqI;AACrI,kEAA6D;AAC7D,yFAAmF;AACnF,+DAA0D;AAC1D,iFAA2E;~~AAgBpE~~,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,YACqB,iBAAoC,EACpC,yBAAoD,EACpD,WAAwB;QAFxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAKJ,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAsB;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAsB;QAExE,MAAM,OAAO,GAAwB;YACjC,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;YAC3B,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAQ;SAClC,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,sDAAwB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9F,IAAI,UAAU,EAAE,CAAC;~~YACb~~,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACpE,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAEjE,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,MAAM,EAAE,IAAI,CAAC,OAAO;~~aACvB~~,CAAC;QACN,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,yCAAe,CAAC,qBAAqB,CAAC,CAAC;QAE3D,OAAO;YACH,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,MAAM,EAAE,CAAC;SACZ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,QAA4B,EAAE,EAAW;QACzD,MAAM,YAAY,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,4CAAkB,CAAC,wCAAwC,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,8BAAI,CAAC,KAAK,CAAC;gBACP,GAAG,YAAY;gBACf,GAAG,EAAE,EAAE,EAAE,EAAE;gBACX,SAAS,EAAE,QAAQ,CAAC,QAAQ;gBAC5B,WAAW,EAAE,QAAQ,CAAC,UAAU;gBAChC,eAAe,EAAE;oBACb,WAAW,EAAE,QAAQ,CAAC,UAAU;oBAChC,UAAU,EAAE,mCAAe,CAAC,QAAQ;oBACpC,YAAY,EAAE,MAAM;oBACpB,SAAS,EAAE,QAAQ,CAAC,QAAQ;~~iBAC/B~~;aACJ,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,YAAY,CAAC,eAAe,GAAG;YAC3B,SAAS,EAAE,QAAQ,CAAC,QAAQ;YAC5B,WAAW,EAAE,QAAQ,CAAC,UAAU;YAChC,YAAY,EAAE,KAAK;SACtB,CAAC;QACF,8BAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,MAAc,EAAE,QAAgB;QAClE,MAAM,sDAAwB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IACtH,CAAC;IAEO,WAAW,CAAC,EAAsB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAEO,OAAO,CAAC,EAAsB;QAClC,IAAI,CAAC,EAAE;YAAE,OAAO,SAAS,CAAC;QAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,CACH,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;aACZ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb,IAAI,EAAE,IAAI,SAAS,CAC3B,CAAC;IACN,CAAC;CACJ,CAAA;~~AAnGY~~,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAG+B,uCAAiB;QACT,wDAAyB;QACvC,qCAAW;GAJpC,wBAAwB,~~CAmGpC~~"}
1	+ {"version":3,"file":"credential.resolve.service.js","sourceRoot":"","sources":["../../../src/access/services/credential.resolve.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAAqI;AACrI,kEAA6D;AAC7D,yFAAmF;AACnF,+DAA0D;AAC1D,iFAA2E;AAiBpE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,YACqB,iBAAoC,EACpC,yBAAoD,EACpD,WAAwB;QAFxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAKJ,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAsB;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAsB;QAExE,MAAM,OAAO,GAAwB;YACjC,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;YAC3B,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAQ;SAClC,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,sDAAwB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9F,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACpE,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAEjE,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,MAAM,EAAE,IAAI,CAAC,OAAO;gBACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;aACxF,CAAC;QACN,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,yCAAe,CAAC,qBAAqB,CAAC,CAAC;QAE3D,OAAO;YACH,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,MAAM,EAAE,CAAC;SACZ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,QAA4B,EAAE,EAAW;QACzD,MAAM,YAAY,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,4CAAkB,CAAC,wCAAwC,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,8BAAI,CAAC,KAAK,CAAC;gBACP,GAAG,YAAY;gBACf,GAAG,EAAE,EAAE,EAAE,EAAE;gBACX,SAAS,EAAE,QAAQ,CAAC,QAAQ;gBAC5B,WAAW,EAAE,QAAQ,CAAC,UAAU;gBAChC,eAAe,EAAE;oBACb,WAAW,EAAE,QAAQ,CAAC,UAAU;oBAChC,UAAU,EAAE,mCAAe,CAAC,QAAQ;oBACpC,YAAY,EAAE,MAAM;oBACpB,SAAS,EAAE,QAAQ,CAAC,QAAQ;oBAC5B,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACxD,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,gBAAgB;iBACpF;aACJ,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,YAAY,CAAC,eAAe,GAAG;YAC3B,SAAS,EAAE,QAAQ,CAAC,QAAQ;YAC5B,WAAW,EAAE,QAAQ,CAAC,UAAU;YAChC,YAAY,EAAE,KAAK;SACtB,CAAC;QACF,8BAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,MAAc,EAAE,QAAgB;QAClE,MAAM,sDAAwB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IACtH,CAAC;IAEO,WAAW,CAAC,EAAsB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAEO,OAAO,CAAC,EAAsB;QAClC,IAAI,CAAC,EAAE;YAAE,OAAO,SAAS,CAAC;QAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,CACH,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;aACZ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACb,IAAI,EAAE,IAAI,SAAS,CAC3B,CAAC;IACN,CAAC;CACJ,CAAA;AAtGY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAG+B,uCAAiB;QACT,wDAAyB;QACvC,qCAAW;GAJpC,wBAAwB,CAsGpC"}

package/dist/access/services/listing.service.d.ts CHANGED Viewed

@@ -20,6 +20,7 @@ export declare class ListingService {
     constructor(accessService: AccessService, sqlService: SqlService, uploadService: UploadService, propertyService: PropertyService, cacheService: CacheService);
     savePreference(listing: ListingPageEntity, business: AccessBusinessEntity, payload: AddListingPreferenceDto): Promise<ListingPreferenceEntity>;
     private saveGlobalPreference;
+    listAccessiblePages(business: AccessBusinessEntity): Promise<ListingPageEntity[]>;
     get(listing: ListingPageEntity, business: AccessBusinessEntity): Promise<{
         definition: ListingColumnEntity[];
         preferences: any;
@@ -36,6 +37,7 @@ export declare class ListingService {
     getTotalRecords(listing: ProcessCommonList): Promise<void>;
     getQueryRestrictions(listing: ProcessCommonList): string;
     getQuery(listing: ProcessCommonList): string;
+    private assertSafeFilterQuery;
     private handleIdsFilter;
     getRecords(listing: ProcessCommonList): Promise<void>;
     aggregate(listing: ProcessCommonList): Promise<{

package/dist/access/services/listing.service.js CHANGED Viewed

@@ -14,6 +14,8 @@ const common_1 = require("@nestjs/common");
 const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
 const date_fns_1 = require("date-fns");
 const typeorm_1 = require("typeorm");
+const menu_role_entity_1 = require("../entities/menu.role.entity");
+const business_menu_entity_1 = require("../entities/business.menu.entity");
 const business_preference_entity_1 = require("../entities/business.preference.entity");
 const listing_column_entity_1 = require("../entities/listing.column.entity");
 const listing_page_entity_1 = require("../entities/listing.page.entity");
@@ -59,6 +61,21 @@ let ListingService = class ListingService {
         preference.query_definition = payload.query_definition;
         return preference.save();
     }
+    async listAccessiblePages(business) {
+        const pages = await listing_page_entity_1.ListingPageEntity.find({ order: { name: 'ASC' } });
+        const businessMenus = await business_menu_entity_1.BusinessMenuEntity.find({ where: { business_id: business.id, active: true } });
+        const enabledMenuIds = businessMenus.length ? businessMenus.map((row) => row.menu_id) : null;
+        const accessible = [];
+        for (const page of pages || []) {
+            if (enabledMenuIds && !enabledMenuIds.includes(page.menu_id))
+                continue;
+            const roles = await menu_role_entity_1.MenuRoleEntity.find({ where: { menu_id: page.menu_id } });
+            if (roles.length && !this.accessService.hasRoleAssignments(roles))
+                continue;
+            accessible.push(page);
+        }
+        return accessible;
+    }
     async get(listing, business) {
         const definition = await this.getBusinessWiseListingFromCacheService(listing.id, business.id);
         const user = nestjs_utility_services_1.Auth.user();
@@ -161,10 +178,18 @@ let ListingService = class ListingService {
             const idsFilter = this.handleIdsFilter();
             sql = ` (${sql}) UNION (${sql} or  ${idsFilter})`;
         }
-        if (listing.getFilter().filter_query)
+        if (listing.getFilter().filter_query) {
+            this.assertSafeFilterQuery(listing.getFilter().filter_query);
             return `(${sql}) sq where ${listing.getFilter().filter_query}`;
+        }
         return `(${sql}) sq`;
     }
+    assertSafeFilterQuery(fragment) {
+        const matched = this.sqlService.detectSqlInjectionSignature(fragment);
+        if (matched) {
+            throw new nestjs_utility_services_1.OperationException(`filter_query rejected: matches ${matched} pattern.`);
+        }
+    }
     handleIdsFilter() {
         if (!this.options?.ids?.length)
             return '';

package/dist/access/services/listing.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listing.service.js","sourceRoot":"","sources":["../../../src/access/services/listing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFASgD;AAChD,uCAAoC;AACpC,qCAAiC;~~AAIjC~~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~~YAAE~~,OAAO,IAAI,GAAG,cAAc,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;~~QAErG~~,OAAO,IAAI,GAAG,MAAM,CAAC;IACzB,CAAC;IAOO,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM;YAAE,OAAO,EAAE,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,IAAI,MAAM,CAAC;QAE5D,OAAO,GAAG,aAAa,QAAQ,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClE,CAAC;IAOD,KAAK,CAAC,UAAU,CAAC,OAA0B;QAEvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAEnC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAElC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;QAGrE,MAAM,GAAG,GAAG,oBAAoB,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,MAAM,EAAE,CAAC;QAGzH,IAAI,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QAErC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QAC7B,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAE3B,QAAQ,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,MAAM,EAAE,WAAW;YAAE,QAAQ,CAAC,cAAc,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QAElE,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAQD,KAAK,CAAC,SAAS,CAAC,OAA0B;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC;QAChD,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAW,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,4CAAkB,CAAC,4BAA4B,GAAG,mBAAmB,CAAC,CAAC;QAE9H,MAAM,KAAK,GAAW,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,UAAU,GAAG,OAAO,KAAK,oBAAoB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;QAE9E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEtD,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,OAA0B;QACxC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,YAAY;YAAE,MAAM,IAAI,4CAAkB,CAAC,2CAA2C,CAAC,CAAC;QAElH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,QAAQ,EAAE,UAAU,KAAK,EAAE,CAAC;QACxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpD,OAAO,IAAI,gDAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7H,CAAC;CACJ,CAAA;~~AAvXY~~,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAO2B,uCAAa;QAChB,oCAAU;QACP,uCAAa;QACX,yCAAe;QAClB,sCAAY;GAVtC,cAAc,~~CAuX1B~~"}
1	+ {"version":3,"file":"listing.service.js","sourceRoot":"","sources":["../../../src/access/services/listing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFASgD;AAChD,uCAAoC;AACpC,qCAAiC;AAGjC,mEAA8D;AAE9D,2EAAsE;AACtE,uFAAkF;AAClF,6EAAwE;AACxE,yEAAoE;AACpE,qFAAgF;AAEhF,oFAA8E;AAYvE,IAAM,cAAc,GAApB,MAAM,cAAc;IAKvB,YACqB,aAA4B,EAC5B,UAAsB,EACtB,aAA4B,EAC5B,eAAgC,EAChC,YAA0B;QAJ1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAc;QAT/C,YAAO,GAAe;YAClB,aAAa,EAAE,MAAM;YACrB,GAAG,EAAE,EAAE;SACV,CAAC;IAOC,CAAC;IASJ,KAAK,CAAC,cAAc,CAChB,OAA0B,EAC1B,QAA8B,EAC9B,OAAgC;QAEhC,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE;YAAE,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAE3G,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,MAAM,mDAAuB,CAAC,UAAU,CAAC;YACxD,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,WAAW,EAAE,QAAQ,CAAC,EAAE;YACxB,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,UAAU,EAAE,OAAO,CAAC,UAAU;SACjC,CAAC,CAAC;QAEH,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACzD,UAAU,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAEvD,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAUO,KAAK,CAAC,oBAAoB,CAAC,OAA0B,EAAE,QAA8B,EAAE,OAAgC;QAC3H,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;QAEnD,MAAM,UAAU,GAAG,MAAM,mDAAuB,CAAC,UAAU,CAAC;YACxD,UAAU,EAAE,OAAO,CAAC,EAAE;YACtB,WAAW,EAAE,QAAQ,CAAC,EAAE;YACxB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,UAAU;YACV,OAAO,EAAE,IAAA,gBAAM,GAAE;SACpB,CAAC,CAAC;QAEH,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACzD,UAAU,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAEvD,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAKD,KAAK,CAAC,mBAAmB,CAAC,QAA8B;QACpD,MAAM,KAAK,GAAG,MAAM,uCAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAEvE,MAAM,aAAa,GAAG,MAAM,yCAAkB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3G,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7F,MAAM,UAAU,GAAwB,EAAE,CAAC;QAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;YAC7B,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,SAAS;YACvE,MAAM,KAAK,GAAG,MAAM,iCAAc,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC9E,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC5E,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAQD,KAAK,CAAC,GAAG,CAAC,OAA0B,EAAE,QAA8B;QAChE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sCAAsC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE9F,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,2FAA2F,QAAQ,CAAC,EAAE,iDAAiD,OAAO,CAAC,EAAE,qBAAqB,IAAI,CAAC,EAAE,sEAAsE,CAAC;QAEhR,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE5H,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC;IAQD,KAAK,CAAC,sCAAsC,CAAC,UAAkB,EAAE,WAAmB;QAChF,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAahE,CAAC;IASD,KAAK,CAAC,sBAAsB,CAAC,UAAkB,EAAE,WAAmB;QAChE,MAAM,QAAQ,GAAG,MAAM,2CAAmB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,UAAU,EAAE;YACrB,SAAS,EAAE,CAAC,iBAAiB,CAAC;YAC9B,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC7B,CAAC,CAAC;QAIH,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,IAAI,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAC/G,CAAC;IAUD,KAAK,CAAC,MAAM,CAAC,OAA0B,EAAE,YAAoB;QACzD,MAAM,UAAU,GAAG,MAAM,mDAAuB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAElH,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,yCAAe,EAAE,CAAC;QAE7C,MAAM,IAAI,GAAG,8BAAI,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,yCAAe,CAAC,iCAAiC,CAAC,CAAC;QAEjG,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;IACnC,CAAC;IAOO,YAAY;QAChB,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9E,OAAO,KAAK,CAAC;IACjB,CAAC;IAOD,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACrC,MAAM,UAAU,GAAG,YAAY,UAAU,qBAAqB,CAAC;QAE/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAA,mBAAQ,EAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEzE,OAAO,MAAM,CAAC;IAClB,CAAC;IAQO,KAAK,CAAC,kBAAkB,CAAC,UAAkB;QAC/C,MAAM,kBAAkB,GAAG,MAAM,qDAAwB,CAAC,OAAO,CAAC;YAC9D,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,UAAU,EAAE;SAC/D,CAAC,CAAC;QAEH,IAAI,kBAAkB,EAAE,UAAU,CAAC,oBAAoB,CAAC;YAAE,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAEtH,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACnE,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,OAA0B;QACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,OAA0B;QAE3C,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAGpC,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;IAOD,KAAK,CAAC,eAAe,CAAC,OAA0B;QAE5C,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,GAAG;YAAE,OAAO;QAChF,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,OAAO,IAAI,EAAE,CAAC;QAEnD,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE/B,MAAM,GAAG,GAAG,UAAU,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QAErC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACpC,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAC;QAEtB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,IAAI,GAAG,KAAK,OAAO;gBAAE,SAAS;YAE9B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAClC,CAAC;QAED,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAOD,oBAAoB,CAAC,OAA0B;QAC3C,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,MAAM;YAAE,OAAO;QAE9C,MAAM,MAAM,GAAa,EAAE,CAAC;QAG5B,OAAO,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YAC9C,MAAM,CAAC,IAAI,CAAC,MAAM,WAAW,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAOD,QAAQ,CAAC,OAA0B;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,GAAG,GAAG,UAAU,OAAO,SAAS,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC;QAE9D,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;YACjC,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC;QACvC,CAAC;QAED,IAAI,YAAY;YAAE,GAAG,GAAG,GAAG,GAAG,QAAQ,YAAY,GAAG,CAAC;QAItD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACzC,GAAG,GAAG,KAAK,GAAG,YAAY,GAAG,QAAQ,SAAS,GAAG,CAAC;QACtD,CAAC;QAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;YAC7D,OAAO,IAAI,GAAG,cAAc,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;QACnE,CAAC;QAED,OAAO,IAAI,GAAG,MAAM,CAAC;IACzB,CAAC;IAMO,qBAAqB,CAAC,QAAgB;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,4CAAkB,CAAC,kCAAkC,OAAO,WAAW,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;IAOO,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM;YAAE,OAAO,EAAE,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,IAAI,MAAM,CAAC;QAE5D,OAAO,GAAG,aAAa,QAAQ,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClE,CAAC;IAOD,KAAK,CAAC,UAAU,CAAC,OAA0B;QAEvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAEnC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAElC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;QAGrE,MAAM,GAAG,GAAG,oBAAoB,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,MAAM,EAAE,CAAC;QAGzH,IAAI,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QAErC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QAC7B,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAE3B,QAAQ,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,MAAM,EAAE,WAAW;YAAE,QAAQ,CAAC,cAAc,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QAElE,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAQD,KAAK,CAAC,SAAS,CAAC,OAA0B;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC;QAChD,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAW,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,4CAAkB,CAAC,4BAA4B,GAAG,mBAAmB,CAAC,CAAC;QAE9H,MAAM,KAAK,GAAW,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,UAAU,GAAG,OAAO,KAAK,oBAAoB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;QAE9E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEtD,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,OAA0B;QACxC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,YAAY;YAAE,MAAM,IAAI,4CAAkB,CAAC,2CAA2C,CAAC,CAAC;QAElH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,QAAQ,EAAE,UAAU,KAAK,EAAE,CAAC;QACxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpD,OAAO,IAAI,gDAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7H,CAAC;CACJ,CAAA;AAzZY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAO2B,uCAAa;QAChB,oCAAU;QACP,uCAAa;QACX,yCAAe;QAClB,sCAAY;GAVtC,cAAc,CAyZ1B"}

package/dist/access/services/oauth.as.service.d.ts CHANGED Viewed

@@ -51,6 +51,7 @@ export declare class OauthAsService {
         redirect_host?: undefined;
         scope?: undefined;
         expires_at?: undefined;
+        businesses?: undefined;
     } | {
         status: "decided";
         authorization_id: number;
@@ -58,6 +59,7 @@ export declare class OauthAsService {
         redirect_host?: undefined;
         scope?: undefined;
         expires_at?: undefined;
+        businesses?: undefined;
     } | {
         status: "expired";
         authorization_id: number;
@@ -65,6 +67,7 @@ export declare class OauthAsService {
         redirect_host?: undefined;
         scope?: undefined;
         expires_at?: undefined;
+        businesses?: undefined;
     } | {
         status: "pending";
         authorization_id: number;
@@ -72,6 +75,12 @@ export declare class OauthAsService {
         redirect_host: string;
         scope: string;
         expires_at: Date;
+        businesses: {
+            id: number;
+            name: string;
+            role: string;
+            is_current: boolean;
+        }[];
     }>;
     decideConsent(authorizationId: number, action: 'approve' | 'deny', businessId?: number): Promise<{
         status: "already_decided";

package/dist/access/services/oauth.as.service.js CHANGED Viewed

@@ -160,6 +160,10 @@ let OauthAsService = class OauthAsService {
             return { status: 'decided', authorization_id: row.id };
         if (row.expires_at.getTime() <= Date.now())
             return { status: 'expired', authorization_id: row.id };
+        const user = nestjs_utility_services_1.Auth.user();
+        if (!user?.id)
+            throw new nestjs_utility_services_1.AccessException('Login required.');
+        const businesses = await this.accessBusinessService.listActiveMemberships(user.id, user.auth_attributes?.business_id);
         return {
             status: 'pending',
             authorization_id: row.id,
@@ -167,6 +171,7 @@ let OauthAsService = class OauthAsService {
             redirect_host: oauth_pkce_1.OauthPkce.safeRedirectHost(row.redirect_uri),
             scope: row.scope,
             expires_at: row.expires_at,
+            businesses,
         };
     }
     async decideConsent(authorizationId, action, businessId) {
@@ -188,7 +193,7 @@ let OauthAsService = class OauthAsService {
             }
             return { status: 'denied', redirect_to: this.errorRedirect(row, 'access_denied') };
         }
-        const business = await this.resolveBusiness(businessId);
+        const business = await this.resolveBusiness(user.id, businessId);
         const code = oauth_pkce_1.OauthPkce.randomToken(32);
         const claimed = await oauth_authorization_entity_1.OauthAuthorizationEntity.update({ id: row.id, approved_at: (0, typeorm_1.IsNull)(), denied_at: (0, typeorm_1.IsNull)() }, {
             approved_at: new Date(),
@@ -247,12 +252,17 @@ let OauthAsService = class OauthAsService {
         if (!row.approved_by_user_id || !row.business_id) {
             throw new OauthProtocolError('server_error', 'Authorization missing approver or business', 500);
         }
+        try {
+            await this.accessBusinessService.assertActiveMembership(row.approved_by_user_id, row.business_id);
+        }
+        catch {
+            throw new OauthProtocolError('invalid_grant', 'Approver is no longer a member of this business');
+        }
         const business = await access_business_entity_1.AccessBusinessEntity.findOne({ where: { id: row.business_id } });
         if (!business)
             throw new OauthProtocolError('server_error', 'Business no longer exists', 500);
         nestjs_utility_services_1.Auth.login({ id: row.approved_by_user_id, auth_attributes: { business_id: business.id } });
-        const name = `MCP · browser connect · ${new Date().toISOString().slice(0, 16)}`;
-        const secret = await new create_user_business_secret_1.CreateUserBusinessSecret(business).process({ name });
+        const secret = await new create_user_business_secret_1.CreateUserBusinessSecret(business).process({ name: `MCP · ${row.client_id}` }, { oauthClientId: row.client_id, accessScopes: (row.scope || DEFAULT_SCOPE).split(/\s+/).filter(Boolean) });
         row.user_secret_id = secret.id;
         await row.save();
         return {
@@ -261,12 +271,9 @@ let OauthAsService = class OauthAsService {
             client_secret: secret.client_secret,
         };
     }
-    async resolveBusiness(businessId) {
+    async resolveBusiness(userId, businessId) {
         if (businessId) {
-            const business = await access_business_entity_1.AccessBusinessEntity.findOne({ where: { id: businessId } });
-            if (!business)
-                throw new nestjs_utility_services_1.OperationException('Unknown business_id.');
-            return business;
+            return this.accessBusinessService.assertActiveMembership(userId, businessId);
         }
         return this.accessBusinessService.validateAccess();
     }