@moostjs/arbac 0.5.33 → 0.6.1

package/README.md

@@ -71,11 +71,11 @@ app.setReplaceRegistry(ArbacReplaceRegistry)
 ### Protect Routes with `@Authorized()`
 
 ```typescript
-import { Authorized, Public } from '@moostjs/arbac'
+import { ArbacAuthorize, ArbacPublic } from '@moostjs/arbac'
 import { Controller, Get } from 'moost'
 
 @Controller('/data')
-@ArbacAuthorized()
+@ArbacAuthorize()
 export class DataController {
   @Get()
   getProtectedData() {
@@ -100,7 +100,7 @@ Extends `@prostojs/arbac` and integrates with MoostJS DI.
 
 Abstract class for defining user-related access control logic.
 
-### `@ArbacAuthorized()`
+### `@ArbacAuthorize()`
 
 Method decorator to enforce ARBAC checks.
 

package/dist/index.cjs

@@ -6,11 +6,11 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key$1; i < n; i++) {
+		key$1 = keys[i];
+		if (!__hasOwnProp.call(to, key$1) && key$1 !== except) __defProp(to, key$1, {
+			get: ((k) => from[k]).bind(null, key$1),
+			enumerable: !(desc = __getOwnPropDesc(from, key$1)) || desc.enumerable
 		});
 	}
 	return to;
@@ -26,22 +26,22 @@ const __prostojs_arbac = __toESM(require("@prostojs/arbac"));
 const __wooksjs_event_http = __toESM(require("@wooksjs/event-http"));
 
 //#region packages/arbac/src/moost-arbac.ts
-function _ts_decorate$1(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;
+function _ts_decorate$1(decorators, target, key$1, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key$1) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key$1, 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$1, r) : d(target, key$1)) || r;
+	return c > 3 && r && Object.defineProperty(target, key$1, r), r;
 }
 var MoostArbac = class extends __prostojs_arbac.Arbac {};
 MoostArbac = _ts_decorate$1([(0, moost.Injectable)()], MoostArbac);
 
 //#endregion
 //#region packages/arbac/src/user.provider.ts
-function _ts_decorate(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;
+function _ts_decorate(decorators, target, key$1, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key$1) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key$1, 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$1, r) : d(target, key$1)) || r;
+	return c > 3 && r && Object.defineProperty(target, key$1, r), r;
 }
 var ArbacUserProvider = class {
 	/**
@@ -79,11 +79,12 @@ ArbacUserProvider = _ts_decorate([(0, moost.Injectable)()], ArbacUserProvider);
 * Composable for ARBAC (Advanced Role-Based Access Control) utilities within MoostJS.
 *
 * @template TScope - Type representing the scope of access control.
-*/ function useArbac() {
-	const store = (0, moost.useAsyncEventContext)().store("arbac");
-	const cc = (0, moost.useControllerContext)();
-	const getScopes = () => store.get("scopes");
-	const setScopes = (scope) => store.set("scopes", scope);
+*/ const arbacScopesKey = (0, moost.key)("arbac.scopes");
+function useArbac(ctx) {
+	const _ctx = ctx || (0, moost.current)();
+	const cc = (0, moost.useControllerContext)(_ctx);
+	const getScopes = () => _ctx.has(arbacScopesKey) ? _ctx.get(arbacScopesKey) : void 0;
+	const setScopes = (scope) => _ctx.set(arbacScopesKey, scope);
 	const evaluate = async (opts) => {
 		const user = await cc.instantiate(ArbacUserProvider);
 		const userId = await user.getUserId();
@@ -113,20 +114,22 @@ ArbacUserProvider = _ts_decorate([(0, moost.Injectable)()], ArbacUserProvider);
 
 //#endregion
 //#region packages/arbac/src/arbac.mate.ts
-function getArbacMate() {
+/** Returns the shared `Mate` instance extended with ARBAC metadata fields. */ function getArbacMate() {
 	return (0, moost.getMoostMate)();
 }
 
 //#endregion
 //#region packages/arbac/src/arbac.decorator.ts
 /**
-* Interceptor function that enforces authorization checks based on ARBAC rules.
+* Interceptor that enforces authorization checks based on ARBAC rules.
 * It evaluates the user's permissions against the requested resource and action.
 *
 * @constant
-*/ const arbackAuthorizeInterceptor = (0, moost.defineInterceptorFn)(async (before, after, onError) => {
-	const logger = (0, moost.useEventLogger)("arbac");
-	const { setScopes, evaluate, resource, action, isPublic } = useArbac();
+*/ const arbackAuthorizeInterceptor = (0, moost.defineBeforeInterceptor)(async () => {
+	const ctx = (0, moost.current)();
+	const l = (0, moost.useLogger)(ctx);
+	const logger = typeof l.topic === "function" ? l.topic("arbac") : l;
+	const { setScopes, evaluate, resource, action, isPublic } = useArbac(ctx);
 	if (!action || !resource || isPublic) return;
 	try {
 		const { allowed, scopes, userId } = await evaluate({
@@ -138,7 +141,7 @@ function getArbacMate() {
 		setScopes(scopes);
 	} catch (error) {
 		if (error instanceof __wooksjs_event_http.HttpError) throw error;
-		logger.warn(error);
+		logger.warn(String(error));
 		throw new __wooksjs_event_http.HttpError(401, `Authorization error`);
 	}
 }, moost.TInterceptorPriority.GUARD);

package/dist/index.d.ts

@@ -1,14 +1,10 @@
 import * as _prostojs_arbac from '@prostojs/arbac';
 import { Arbac } from '@prostojs/arbac';
+import { EventContext } from '@wooksjs/event-core';
 import * as moost from 'moost';
 import { Mate, TMoostMetadata, TMateParamMeta } from 'moost';
 
-/**
- * Composable for ARBAC (Advanced Role-Based Access Control) utilities within MoostJS.
- *
- * @template TScope - Type representing the scope of access control.
- */
-declare function useArbac<TScope extends object>(): {
+declare function useArbac<TScope extends object>(ctx?: EventContext): {
     /**
      * Get evaluated scopes
      */
@@ -16,7 +12,7 @@ declare function useArbac<TScope extends object>(): {
     /**
      * Set evaluated scopes
      */
-    setScopes: (scope: TScope[] | undefined) => TScope[] | undefined;
+    setScopes: (scope: TScope[] | undefined) => void;
     /**
      * Evaluate access control for the given resource and action.
      */
@@ -41,12 +37,12 @@ declare function useArbac<TScope extends object>(): {
 };
 
 /**
- * Interceptor function that enforces authorization checks based on ARBAC rules.
+ * Interceptor that enforces authorization checks based on ARBAC rules.
  * It evaluates the user's permissions against the requested resource and action.
  *
  * @constant
  */
-declare const arbackAuthorizeInterceptor: moost.TInterceptorFn;
+declare const arbackAuthorizeInterceptor: moost.TInterceptorDef;
 /**
  * Decorator that applies the `arbackAuthorizeInterceptor` to enforce authorization.
  *
@@ -80,15 +76,17 @@ declare const ArbacAction: (name: string) => MethodDecorator & ClassDecorator &
  */
 declare const ArbacPublic: () => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 
+/** ARBAC metadata fields attached to classes and methods by ARBAC decorators. */
 interface TArbacMeta {
     arbacResourceId?: string;
     arbacActionId?: string;
     arbacPublic?: boolean;
 }
+/** Returns the shared `Mate` instance extended with ARBAC metadata fields. */
 declare function getArbacMate(): Mate<TMoostMetadata & TArbacMeta & {
-    params: Array<TMateParamMeta>;
+    params: TMateParamMeta[];
 }, TMoostMetadata & TArbacMeta & {
-    params: Array<TMateParamMeta>;
+    params: TMateParamMeta[];
 }>;
 
 /**

package/dist/index.mjs

@@ -1,24 +1,24 @@
-import { Injectable, Intercept, Resolve, TInterceptorPriority, defineInterceptorFn, getConstructor, getMoostMate, useAsyncEventContext, useControllerContext, useEventLogger } from "moost";
+import { Injectable, Intercept, Resolve, TInterceptorPriority, current, defineBeforeInterceptor, getConstructor, getMoostMate, key, useControllerContext, useLogger } from "moost";
 import { Arbac } from "@prostojs/arbac";
 import { HttpError } from "@wooksjs/event-http";
 
 //#region packages/arbac/src/moost-arbac.ts
-function _ts_decorate$1(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;
+function _ts_decorate$1(decorators, target, key$1, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key$1) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key$1, 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$1, r) : d(target, key$1)) || r;
+	return c > 3 && r && Object.defineProperty(target, key$1, r), r;
 }
 var MoostArbac = class extends Arbac {};
 MoostArbac = _ts_decorate$1([Injectable()], MoostArbac);
 
 //#endregion
 //#region packages/arbac/src/user.provider.ts
-function _ts_decorate(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;
+function _ts_decorate(decorators, target, key$1, desc) {
+	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key$1) : desc, d;
+	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key$1, 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$1, r) : d(target, key$1)) || r;
+	return c > 3 && r && Object.defineProperty(target, key$1, r), r;
 }
 var ArbacUserProvider = class {
 	/**
@@ -56,11 +56,12 @@ ArbacUserProvider = _ts_decorate([Injectable()], ArbacUserProvider);
 * Composable for ARBAC (Advanced Role-Based Access Control) utilities within MoostJS.
 *
 * @template TScope - Type representing the scope of access control.
-*/ function useArbac() {
-	const store = useAsyncEventContext().store("arbac");
-	const cc = useControllerContext();
-	const getScopes = () => store.get("scopes");
-	const setScopes = (scope) => store.set("scopes", scope);
+*/ const arbacScopesKey = key("arbac.scopes");
+function useArbac(ctx) {
+	const _ctx = ctx || current();
+	const cc = useControllerContext(_ctx);
+	const getScopes = () => _ctx.has(arbacScopesKey) ? _ctx.get(arbacScopesKey) : void 0;
+	const setScopes = (scope) => _ctx.set(arbacScopesKey, scope);
 	const evaluate = async (opts) => {
 		const user = await cc.instantiate(ArbacUserProvider);
 		const userId = await user.getUserId();
@@ -90,20 +91,22 @@ ArbacUserProvider = _ts_decorate([Injectable()], ArbacUserProvider);
 
 //#endregion
 //#region packages/arbac/src/arbac.mate.ts
-function getArbacMate() {
+/** Returns the shared `Mate` instance extended with ARBAC metadata fields. */ function getArbacMate() {
 	return getMoostMate();
 }
 
 //#endregion
 //#region packages/arbac/src/arbac.decorator.ts
 /**
-* Interceptor function that enforces authorization checks based on ARBAC rules.
+* Interceptor that enforces authorization checks based on ARBAC rules.
 * It evaluates the user's permissions against the requested resource and action.
 *
 * @constant
-*/ const arbackAuthorizeInterceptor = defineInterceptorFn(async (before, after, onError) => {
-	const logger = useEventLogger("arbac");
-	const { setScopes, evaluate, resource, action, isPublic } = useArbac();
+*/ const arbackAuthorizeInterceptor = defineBeforeInterceptor(async () => {
+	const ctx = current();
+	const l = useLogger(ctx);
+	const logger = typeof l.topic === "function" ? l.topic("arbac") : l;
+	const { setScopes, evaluate, resource, action, isPublic } = useArbac(ctx);
 	if (!action || !resource || isPublic) return;
 	try {
 		const { allowed, scopes, userId } = await evaluate({
@@ -115,7 +118,7 @@ function getArbacMate() {
 		setScopes(scopes);
 	} catch (error) {
 		if (error instanceof HttpError) throw error;
-		logger.warn(error);
+		logger.warn(String(error));
 		throw new HttpError(401, `Authorization error`);
 	}
 }, TInterceptorPriority.GUARD);

package/package.json

@@ -1,11 +1,34 @@
 {
   "name": "@moostjs/arbac",
-  "version": "0.5.33",
+  "version": "0.6.1",
   "description": "Access Control @prostojs/arbac",
+  "keywords": [
+    "abac",
+    "access control",
+    "arbac",
+    "moost",
+    "moostjs",
+    "rbac"
+  ],
+  "homepage": "https://github.com/moostjs/moostjs/tree/main/packages/arbac#readme",
+  "bugs": {
+    "url": "https://github.com/moostjs/moostjs/issues"
+  },
+  "license": "MIT",
+  "author": "Artem Maltsev",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/moostjs/moostjs.git",
+    "directory": "packages/arbac"
+  },
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "sideEffects": false,
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "sideEffects": false,
   "exports": {
     "./package.json": "./package.json",
     ".": {
@@ -14,38 +37,17 @@
       "require": "./dist/index.cjs"
     }
   },
-  "files": [
-    "dist"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/moostjs/moostjs.git",
-    "directory": "packages/arbac"
-  },
-  "keywords": [
-    "moost",
-    "moostjs",
-    "arbac",
-    "rbac",
-    "abac",
-    "access control"
-  ],
-  "author": "Artem Maltsev",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/moostjs/moostjs/issues"
-  },
-  "homepage": "https://github.com/moostjs/moostjs/tree/main/packages/arbac#readme",
-  "peerDependencies": {
-    "@wooksjs/event-http": "^0.6.2",
-    "moost": "^0.5.33"
-  },
   "dependencies": {
     "@prostojs/arbac": "^0.0.2"
   },
   "devDependencies": {
     "vitest": "3.2.4"
   },
+  "peerDependencies": {
+    "@wooksjs/event-core": "^0.7.3",
+    "@wooksjs/event-http": "^0.7.3",
+    "moost": "^0.6.1"
+  },
   "scripts": {
     "pub": "pnpm publish --access public",
     "test": "vitest"