@oondemand/oon-core-back 0.4.20 → 0.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oondemand/oon-core-back",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oondemand/oon-platform.git",

package/src/api/auth.routes.js

@@ -60,6 +60,7 @@ function configuredSessionScope() {
 function tenantForLogin(req, instance) {
   const tenancyModel =
     ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel;
+  if (tenancyModel === "none") return undefined;
   if (tenancyModel === "multi_tenant") {
     // Uma instância compartilhada não pertence ao tenant que a ativou
     // originalmente. Sem seleção explícita, a Central de Ativações resolve o

package/src/core/define.js

@@ -47,8 +47,10 @@ function addDataScopeFields(schema, definition) {
   if (!["tenant", "user"].includes(scope)) return schema;
 
   const fields = {};
+  const tenantScoped = scope === "tenant"
+    || (scope === "user" && (ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel) !== "none");
   const scopedTenantField = tenantField(definition);
-  if (!schema.path(scopedTenantField)) {
+  if (tenantScoped && !schema.path(scopedTenantField)) {
     fields[scopedTenantField] = {
       type: String,
       required: true,

package/src/core/middlewares/auth.js

@@ -17,7 +17,10 @@ const {
 async function defaultVerifyToken(token, { req } = {}) {
   const baseUrl = getBaseUrl(req);
   const appCode = getAppCode();
-  const requestedTenantId = readRequestedTenantId(req);
+  const requestedTenantId =
+    (ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel) === "none"
+      ? undefined
+      : readRequestedTenantId(req);
 
   let response;
   try {

package/src/core/rbac/storage.js

@@ -178,6 +178,20 @@ async function resolveUserAccess(user, { touch = true } = {}) {
   }
 
   let access = await findAccessForUser(user);
+  const authenticatedAdmission =
+    (ctx.config.accessMode || ctx.config.ecosystem?.accessMode) === "authenticated_users";
+  if (!access && authenticatedAdmission) {
+    const globalPermissions = Array.isArray(user?.globalPermissions)
+      ? [...new Set(user.globalPermissions.map(String))]
+      : [];
+    return {
+      mode: "authenticated_users",
+      status: "active",
+      roleCode: "authenticated_user",
+      permissions: globalPermissions,
+      mustChangePassword: Boolean(user?.mustChangePassword || user?.firstAccessPending),
+    };
+  }
   if (!access) access = await migrateLegacyAccess(user);
   if (!access) {
     throw accessError("Usuário autenticado sem perfil local nesta Central.", "RBAC_LOCAL_ACCESS_REQUIRED");

package/src/core/tenancy.js

@@ -1,6 +1,7 @@
 const GenericError = require("./errors/GenericError");
 
 const TENANT_HEADER = "x-oon-tenant-id";
+const TARGET_TENANT_HEADER = "x-oon-target-tenant-id";
 const TENANCY_MODELS = Object.freeze(["none", "single_tenant", "multi_tenant"]);
 const DATA_SCOPES = Object.freeze(["legacy", "system", "tenant", "user"]);
 
@@ -21,6 +22,21 @@ function readRequestedTenantId(req) {
   return stringId(req?.headers?.[TENANT_HEADER]);
 }
 
+function readTargetTenantId(req) {
+  return stringId(req?.headers?.[TARGET_TENANT_HEADER]);
+}
+
+function requireTargetTenantId(req) {
+  const targetTenantId = readTargetTenantId(req);
+  if (!targetTenantId) {
+    throw new GenericError("Informe o tenant-alvo da operação.", {
+      statusCode: 400,
+      code: "TARGET_TENANT_REQUIRED",
+    });
+  }
+  return targetTenantId;
+}
+
 function inferVerifiedTenantId(usuario) {
   return stringId(
     usuario?.tenantId ||
@@ -124,6 +140,16 @@ function scopeFilter(entryOrDefinition, accessContext) {
   const scope = dataScope(entryOrDefinition);
   if (scope === "legacy" || scope === "system") return {};
 
+  if (scope === "user" && accessContext?.tenancyModel === "none") {
+    return {
+      [userField(entryOrDefinition)]: requireContextValue(
+        accessContext?.userId,
+        "USER_CONTEXT_REQUIRED",
+        "Contexto de usuário obrigatório para este recurso.",
+      ),
+    };
+  }
+
   const tenantId = requireContextValue(
     accessContext?.tenantId,
     "TENANT_CONTEXT_REQUIRED",
@@ -144,6 +170,9 @@ function scopeFilter(entryOrDefinition, accessContext) {
 
 function mergeScopedFilter(entryOrDefinition, filter = {}, accessContext) {
   const clean = { ...(filter || {}) };
+  if (dataScope(entryOrDefinition) === "user" && accessContext?.tenancyModel === "none") {
+    delete clean[tenantField(entryOrDefinition)];
+  }
   const enforced = scopeFilter(entryOrDefinition, accessContext);
 
   // Remove tentativas de substituir escopo via query/body. O valor confiável
@@ -162,6 +191,9 @@ function scopeMutation(entryOrDefinition, data = {}, accessContext) {
 
   const scope = dataScope(entryOrDefinition);
   if (scope === "legacy" || scope === "system") return result;
+  if (scope === "user" && accessContext?.tenancyModel === "none") {
+    delete result[tenantField(entryOrDefinition)];
+  }
 
   const enforced = scopeFilter(entryOrDefinition, accessContext);
   Object.assign(result, enforced);
@@ -182,10 +214,13 @@ function assertScopedEntry(entryOrDefinition) {
 
 module.exports = {
   TENANT_HEADER,
+  TARGET_TENANT_HEADER,
   TENANCY_MODELS,
   DATA_SCOPES,
   stringId,
   readRequestedTenantId,
+  readTargetTenantId,
+  requireTargetTenantId,
   inferVerifiedTenantId,
   inferTenancyModel,
   createAccessContext,

package/src/core/utils/instanceActivation.js

@@ -398,11 +398,13 @@ function decrypt(instance) {
 
 function instanceHeaders(instance) {
   if (instance.deploymentId) {
+    const tenantAware =
+      (ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel) !== "none";
     return {
       "x-oon-deployment-id": instance.deploymentId,
       "x-oon-deployment-token": decrypt(instance),
       "x-app-code": getAppCode(),
-      ...(instance.tenantId ? { "x-oon-tenant-id": instance.tenantId } : {}),
+      ...(tenantAware && instance.tenantId ? { "x-oon-tenant-id": instance.tenantId } : {}),
     };
   }
   return {
@@ -426,11 +428,23 @@ async function operationalRequestHeaders(options = {}, dependencies = {}) {
       code: "OPERATIONAL_CREDENTIAL_REQUIRED",
     });
   }
-  return {
+  const tenancyModel = ctx.config.tenancyModel || ctx.config.ecosystem?.tenancyModel;
+  if (tenancyModel === "none" && options.tenantId) {
+    throw new GenericError("Apps globais devem usar targetTenantId, não tenantId.", {
+      statusCode: 400,
+      code: "TENANT_CONTEXT_NOT_ALLOWED",
+    });
+  }
+  const headers = {
     ...buildHeaders(instance),
     ...(options.tenantId ? { "x-oon-tenant-id": String(options.tenantId) } : {}),
+    ...(options.targetTenantId
+      ? { "x-oon-target-tenant-id": String(options.targetTenantId) }
+      : {}),
     ...(options.correlationId ? { "x-correlation-id": String(options.correlationId) } : {}),
   };
+  if (tenancyModel === "none") delete headers["x-oon-tenant-id"];
+  return headers;
 }
 
 function validateUrl(value) {

package/src/manifest/appManifest.js

@@ -14,7 +14,7 @@ const SUPPORTED_MODULES = Object.freeze([
 ]);
 const SUPPORTED_TENANCY_MODELS = Object.freeze(["none", "single_tenant", "multi_tenant"]);
 const SUPPORTED_AVAILABILITIES = Object.freeze(["system", "common", "licensed"]);
-const SUPPORTED_ACCESS_MODES = Object.freeze(["tenant_members", "explicit_users"]);
+const SUPPORTED_ACCESS_MODES = Object.freeze(["tenant_members", "explicit_users", "authenticated_users"]);
 const SUPPORTED_AUTHORIZATION_MODES = Object.freeze(["none", "rbac"]);
 // Compatibilidade de leitura para manifestos anteriores à separação das duas dimensões.
 const SUPPORTED_ACCESS_POLICIES = Object.freeze(["tenant_members", "explicit_users", "rbac"]);
@@ -264,6 +264,23 @@ function validateAppManifest(input, { coreVersion = corePackage.version } = {})
   if (dimensions.tenancyModel === "none" && dimensions.accessMode === "tenant_members") {
     addIssue(issues, "accessMode", "tenant_members exige uma aplicação tenant-aware.");
   }
+  if (dimensions.accessMode === "authenticated_users") {
+    if (dimensions.tenancyModel !== "none") {
+      addIssue(issues, "tenancyModel", "authenticated_users exige tenancyModel=none.");
+    }
+    if (dimensions.availability !== "common") {
+      addIssue(issues, "availability", "authenticated_users exige availability=common.");
+    }
+    if (dimensions.authorizationMode !== "rbac") {
+      addIssue(issues, "authorizationMode", "authenticated_users exige authorizationMode=rbac.");
+    }
+    if (dimensions.deploymentMode !== "singleton") {
+      addIssue(issues, "deploymentMode", "authenticated_users exige deploymentMode=singleton.");
+    }
+  }
+  if (dimensions.tenancyModel === "single_tenant" && dimensions.deploymentMode === "shared") {
+    addIssue(issues, "deploymentMode", "single_tenant não pode usar deploymentMode=shared; use dedicated.");
+  }
   if (!isPlainObject(input.modules)) {
     addIssue(issues, "modules", "deve ser um objeto.");
   } else {