@litusarchieve18/agricore-utils 1.0.4 → 1.0.6

package/README.md

@@ -14,7 +14,7 @@ npm install @litusarchieve18/agricore-utils
 
 For Base44 / Deno Environments
 You do not need a .npmrc or GITHUB_TOKEN to use this library in Base44. Import it directly using the npm: protocol:
-import { AgriLogger, AppError, MOD } from 'npm:@litusarchieve18/agricore-utils@^1.0.2';
+import { AgriLogger, AppError, MOD } from 'npm:@litusarchieve18/agricore-utils@^1.0.4';
 
 🏗️ Core Architecture & Features
 This library is designed with the "Adapter Pattern" in mind. It defines strict contracts (AgriCoreSession) so that your business logic remains completely isolated from the underlying Base44 database infrastructure.
@@ -23,7 +23,7 @@ This library is designed with the "Adapter Pattern" in mind. It defines strict c
 The universal contract for authenticated users. The v2 upgrade includes injected UI-ready navigation data (availableScopes) and tenant configurations to prevent unnecessary frontend API calls.
 
 TypeScript
-import { AgriCoreSession } from 'npm:@litusarchieve18/agricore-utils@^1.0.2';
+import { AgriCoreSession } from 'npm:@litusarchieve18/agricore-utils@^1.0.4';
 
 // Example of the v2 structure:
 const session: AgriCoreSession = {
@@ -62,10 +62,6 @@ ErrorFactory
 4. Domain Enums
 The universal vocabulary of the AgriCore platform, ensuring type-safety across all microservices (e.g., UserRole, UserPrivilege, AccessLevel, FacilityType, NotificationMode, TaskStatus, RESOURCE_PATHS).
 
-To document these powerful new security and architectural features in your README.md, you should add sections that explain why these tools exist. They move your library from being a "Type definition" to a "Security Framework."
-
-Here are the suggested paragraphs to add to your README.md:
-
 🔐 Security & Access Control
 The library now includes a centralized logic layer to enforce granular permissions across all AgriCore services.
 
@@ -121,7 +117,10 @@ Run the publish command:
 Bash
 npm publish --access public
 📝 Version History
+v1.0.4 — refactor the code and edit readme
+
 v1.0.4 — add generateInfrastructureFields, security access control and multi tenant boundary
+
 v1.0.3 — add the base44Id
 
 v1.0.2 — Breaking Change: Upgraded AgriCoreSession interface. Added companyConfig and UI-ready availableScopes arrays to support the frontend hierarchy dropdown without secondary API calls.

package/dist/index.d.mts

@@ -506,7 +506,8 @@ declare function evaluateBaseAccess(resourcePath: string, session: {
 declare function assertTenantBoundary(db: any, requesterCompanyId: string, targets: {
     targetUserId?: string;
     authScopeId?: string;
+    expectedScopeType?: 'company' | 'legalEntity' | 'facility';
 }): Promise<boolean>;
-declare function resolveEffectiveAccess(base: AccessLevelType, override?: AccessLevelType): AccessLevelType;
+declare function resolveEffectiveAccess(base: AccessLevelType, override?: AccessLevelType | null): AccessLevelType;
 
 export { ACCESS_RANK, ACT, AccessLevel, type AccessLevelType, type AgriCoreSession, AgriLogger, AppError, ApprovalStatus, ApprovalType, AuditStatus, AuditType, type AuthScopeFields, type AvailableScope, CAT, type CompanyConfig, Converter, CropCycleStatus, ERROR_DICTIONARY, EmitterType, EnabledModule, ErrorFactory, FORM_REGISTRY, FacilityType, type FormMeta, HarvestMethod, type InfrastructureFields, LinkedStatus, MOD, MODULE_LABELS, MicroclimateZone, MimeType, type ModCode, NettingType, NotificationMode, OrderStatus, type PermissionLevel, PhysicalState, PlantingMethod, RESOURCE_PATHS, ROLE_SECTIONS_BY_KEY, RelationshipType, type ResolvedError, type ResourceOverrides, RowOrientation, SENTINEL_UUID, type ScopeType, SoilTexture, TASK_TYPE_REGISTRY, type TabConfig, TargetEntityType, TaskStatus, TaskType, type TaskTypeConfig, TransactionType, TrellisType, UserPrivilege, UserRole, type UserRoleType, Validator, VigorRating, WaterSource, assertCanWrite, assertTenantBoundary, buildRlsFilter, canRead, canWrite, evaluateBaseAccess, extractAppCode, generateCanonicalId, generateInfrastructureFields, getAcceptedMimeTypes, getApproveAction, getFormMeta, getFormsGroupedByModule, getTaskTypeOptions, handleAppErrorResponse, isTabVisible, isTabWritable, resolveAccess, resolveAppError, resolveEffectiveAccess, resolveError, resolveMenuVisibility, withAgriLogging };

package/dist/index.d.ts

@@ -506,7 +506,8 @@ declare function evaluateBaseAccess(resourcePath: string, session: {
 declare function assertTenantBoundary(db: any, requesterCompanyId: string, targets: {
     targetUserId?: string;
     authScopeId?: string;
+    expectedScopeType?: 'company' | 'legalEntity' | 'facility';
 }): Promise<boolean>;
-declare function resolveEffectiveAccess(base: AccessLevelType, override?: AccessLevelType): AccessLevelType;
+declare function resolveEffectiveAccess(base: AccessLevelType, override?: AccessLevelType | null): AccessLevelType;
 
 export { ACCESS_RANK, ACT, AccessLevel, type AccessLevelType, type AgriCoreSession, AgriLogger, AppError, ApprovalStatus, ApprovalType, AuditStatus, AuditType, type AuthScopeFields, type AvailableScope, CAT, type CompanyConfig, Converter, CropCycleStatus, ERROR_DICTIONARY, EmitterType, EnabledModule, ErrorFactory, FORM_REGISTRY, FacilityType, type FormMeta, HarvestMethod, type InfrastructureFields, LinkedStatus, MOD, MODULE_LABELS, MicroclimateZone, MimeType, type ModCode, NettingType, NotificationMode, OrderStatus, type PermissionLevel, PhysicalState, PlantingMethod, RESOURCE_PATHS, ROLE_SECTIONS_BY_KEY, RelationshipType, type ResolvedError, type ResourceOverrides, RowOrientation, SENTINEL_UUID, type ScopeType, SoilTexture, TASK_TYPE_REGISTRY, type TabConfig, TargetEntityType, TaskStatus, TaskType, type TaskTypeConfig, TransactionType, TrellisType, UserPrivilege, UserRole, type UserRoleType, Validator, VigorRating, WaterSource, assertCanWrite, assertTenantBoundary, buildRlsFilter, canRead, canWrite, evaluateBaseAccess, extractAppCode, generateCanonicalId, generateInfrastructureFields, getAcceptedMimeTypes, getApproveAction, getFormMeta, getFormsGroupedByModule, getTaskTypeOptions, handleAppErrorResponse, isTabVisible, isTabWritable, resolveAccess, resolveAppError, resolveEffectiveAccess, resolveError, resolveMenuVisibility, withAgriLogging };

package/dist/index.js

@@ -873,27 +873,43 @@ function evaluateBaseAccess(resourcePath, session, requirements = {}) {
   return isHighRole ? "WRITE" : "READ";
 }
 async function assertTenantBoundary(db, requesterCompanyId, targets) {
-  if (!requesterCompanyId) throw new Error("Missing requester company context");
+  if (!requesterCompanyId) {
+    throw ErrorFactory.internal(MOD.ADMIN, "Missing requester company context for boundary check.");
+  }
   if (targets.targetUserId) {
-    const assignments = await db.UserRoleAssignment.filter({
+    const targetUserAssignments = await db.UserRoleAssignment.filter({
       userId: targets.targetUserId,
       companyId: requesterCompanyId
     });
-    if (assignments.length === 0) throw new Error("Tenant boundary violation: User");
+    if (targetUserAssignments.length === 0) {
+      console.error(`[SECURITY BREACH ATTEMPT] User tried to modify targetUserId ${targets.targetUserId} outside their company ${requesterCompanyId}`);
+      throw ErrorFactory.forbidden(MOD.ADMIN, ACT.EDIT, "Invalid target user or tenant boundary violation.");
+    }
   }
   if (targets.authScopeId) {
-    const [c, le, fac] = await Promise.all([
-      db.Company.filter({ canonicalId: targets.authScopeId, id: requesterCompanyId }),
-      db.LegalEntity.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId }),
-      db.Facility.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId })
-    ]);
-    if (!c.length && !le.length && !fac.length) throw new Error("Tenant boundary violation: Scope");
+    let matchFound = false;
+    if (targets.expectedScopeType === "company" || !targets.expectedScopeType) {
+      const c = await db.Company.filter({ canonicalId: targets.authScopeId, id: requesterCompanyId });
+      if (c.length > 0) matchFound = true;
+    }
+    if (!matchFound && (targets.expectedScopeType === "legalEntity" || !targets.expectedScopeType)) {
+      const le = await db.LegalEntity.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId });
+      if (le.length > 0) matchFound = true;
+    }
+    if (!matchFound && (targets.expectedScopeType === "facility" || !targets.expectedScopeType)) {
+      const fac = await db.Facility.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId });
+      if (fac.length > 0) matchFound = true;
+    }
+    if (!matchFound) {
+      console.error(`[SECURITY BREACH/VALIDATION ERROR] Scope ${targets.authScopeId} not found for type ${targets.expectedScopeType} in company ${requesterCompanyId}`);
+      throw ErrorFactory.forbidden(MOD.ADMIN, ACT.EDIT, "Invalid authorization scope level or tenant boundary violation.");
+    }
   }
   return true;
 }
 function resolveEffectiveAccess(base, override) {
-  if (!override) return base;
-  return ACCESS_RANK[override] >= ACCESS_RANK[base] ? override : base;
+  if (override === void 0 || override === null) return base;
+  return override;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -779,27 +779,43 @@ function evaluateBaseAccess(resourcePath, session, requirements = {}) {
   return isHighRole ? "WRITE" : "READ";
 }
 async function assertTenantBoundary(db, requesterCompanyId, targets) {
-  if (!requesterCompanyId) throw new Error("Missing requester company context");
+  if (!requesterCompanyId) {
+    throw ErrorFactory.internal(MOD.ADMIN, "Missing requester company context for boundary check.");
+  }
   if (targets.targetUserId) {
-    const assignments = await db.UserRoleAssignment.filter({
+    const targetUserAssignments = await db.UserRoleAssignment.filter({
       userId: targets.targetUserId,
       companyId: requesterCompanyId
     });
-    if (assignments.length === 0) throw new Error("Tenant boundary violation: User");
+    if (targetUserAssignments.length === 0) {
+      console.error(`[SECURITY BREACH ATTEMPT] User tried to modify targetUserId ${targets.targetUserId} outside their company ${requesterCompanyId}`);
+      throw ErrorFactory.forbidden(MOD.ADMIN, ACT.EDIT, "Invalid target user or tenant boundary violation.");
+    }
   }
   if (targets.authScopeId) {
-    const [c, le, fac] = await Promise.all([
-      db.Company.filter({ canonicalId: targets.authScopeId, id: requesterCompanyId }),
-      db.LegalEntity.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId }),
-      db.Facility.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId })
-    ]);
-    if (!c.length && !le.length && !fac.length) throw new Error("Tenant boundary violation: Scope");
+    let matchFound = false;
+    if (targets.expectedScopeType === "company" || !targets.expectedScopeType) {
+      const c = await db.Company.filter({ canonicalId: targets.authScopeId, id: requesterCompanyId });
+      if (c.length > 0) matchFound = true;
+    }
+    if (!matchFound && (targets.expectedScopeType === "legalEntity" || !targets.expectedScopeType)) {
+      const le = await db.LegalEntity.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId });
+      if (le.length > 0) matchFound = true;
+    }
+    if (!matchFound && (targets.expectedScopeType === "facility" || !targets.expectedScopeType)) {
+      const fac = await db.Facility.filter({ canonicalId: targets.authScopeId, companyId: requesterCompanyId });
+      if (fac.length > 0) matchFound = true;
+    }
+    if (!matchFound) {
+      console.error(`[SECURITY BREACH/VALIDATION ERROR] Scope ${targets.authScopeId} not found for type ${targets.expectedScopeType} in company ${requesterCompanyId}`);
+      throw ErrorFactory.forbidden(MOD.ADMIN, ACT.EDIT, "Invalid authorization scope level or tenant boundary violation.");
+    }
   }
   return true;
 }
 function resolveEffectiveAccess(base, override) {
-  if (!override) return base;
-  return ACCESS_RANK[override] >= ACCESS_RANK[base] ? override : base;
+  if (override === void 0 || override === null) return base;
+  return override;
 }
 export {
   ACCESS_RANK,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litusarchieve18/agricore-utils",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Canonical Backend Utility Library for AgriCore",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",