@oondemand/oon-core-back 0.4.25 → 0.4.27

package/package.json

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

package/src/api/activation.routes.js

@@ -125,14 +125,50 @@ function translateProviderActivationError(error, fallback) {
 
   const timedOut = error.code === "ECONNABORTED";
   const statusCode = timedOut ? 504 : error.response?.status || 502;
+  const payload = error.response?.data;
+  const envelope = payload?.error && typeof payload.error === "object"
+    ? payload.error
+    : payload;
+  const responseHeaders = error.response?.headers;
+  const headerRequestId = typeof responseHeaders?.get === "function"
+    ? responseHeaders.get("x-request-id") || responseHeaders.get("x-correlation-id")
+    : responseHeaders?.["x-request-id"] || responseHeaders?.["x-correlation-id"];
+  const requestId = String(
+    envelope?.requestId
+    || envelope?.details?.requestId
+    || headerRequestId
+    || "",
+  ).trim();
+  const upstreamDetails = envelope?.details;
+  const details = upstreamDetails && typeof upstreamDetails === "object"
+    ? { ...upstreamDetails, ...(requestId ? { requestId } : {}) }
+    : {
+        ...(upstreamDetails !== undefined ? { upstream: upstreamDetails } : {}),
+        ...(requestId ? { requestId } : {}),
+      };
   const message =
-    error.response?.data?.message ||
-    error.response?.data?.error?.message ||
-    (timedOut
+    envelope?.message
+    || payload?.message
+    || (timedOut
       ? "A Central de Ativações não respondeu dentro do prazo."
       : fallback);
 
-  return new GenericError(message, { statusCode });
+  return new GenericError(message, {
+    statusCode,
+    code: envelope?.code || (timedOut ? "ACTIVATION_PROVIDER_TIMEOUT" : "ACTIVATION_PROVIDER_FAILED"),
+    details: Object.keys(details).length ? details : null,
+  });
+}
+
+async function activationProviderPost(...args) {
+  try {
+    return await providerPost(...args);
+  } catch (error) {
+    throw translateProviderActivationError(
+      error,
+      "A Central de Ativações recusou a operação.",
+    );
+  }
 }
 
 function idOf(value) {
@@ -522,7 +558,7 @@ router.post(
     });
 
     try {
-      const response = await providerPost(
+      const response = await activationProviderPost(
         req,
         PATHS.validar,
         providerPayload(req, codigoAtivacao),
@@ -601,14 +637,14 @@ router.post(
       });
     }
 
-    const preview = await providerPost(
+    const preview = await activationProviderPost(
       req,
       PATHS.validar,
       providerPayload(req, codigoAtivacao),
     );
     assertApp(preview.data);
 
-    const activated = await providerPost(
+    const activated = await activationProviderPost(
       req,
       PATHS.ativar,
       providerPayload(req, codigoAtivacao, { nomeInstancia, metadata: {} }),
@@ -682,7 +718,7 @@ async function complete(req, instance, config) {
       });
     }
 
-    await providerPost(
+    await activationProviderPost(
       req,
       PATHS.concluir,
       {
@@ -746,3 +782,4 @@ router.post(
 );
 
 module.exports = router;
+module.exports.translateProviderActivationError = translateProviderActivationError;

package/src/core/rbac/storage.js

@@ -9,6 +9,7 @@ const {
   policy,
   roleByCode,
   rolePermissions,
+  unique,
   legacyPermissions,
   matchingRoleForLegacyUser,
 } = require("./policy");
@@ -182,13 +183,17 @@ async function resolveUserAccess(user, { touch = true } = {}) {
     (ctx.config.accessMode || ctx.config.ecosystem?.accessMode) === "authenticated_users";
   if (!access && authenticatedAdmission) {
     const globalPermissions = Array.isArray(user?.globalPermissions)
-      ? [...new Set(user.globalPermissions.map(String))]
+      ? user.globalPermissions.map(String)
       : [];
+    const authenticatedRole = roleByCode("authenticated_user");
     return {
       mode: "authenticated_users",
       status: "active",
       roleCode: "authenticated_user",
-      permissions: globalPermissions,
+      permissions: unique([
+        ...rolePermissions(authenticatedRole),
+        ...globalPermissions,
+      ]),
       mustChangePassword: Boolean(user?.mustChangePassword || user?.firstAccessPending),
     };
   }