@oondemand/oon-core-back 0.3.5 → 0.3.6

package/package.json

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

package/src/core/utils/activationProvider.js

@@ -6,26 +6,35 @@ const DEFAULT_CENTRAL_ATIVACAO_URL =
 const LOGIN_PATH = "/integracao/autenticacao-aplicativos/autenticar";
 const PERMISSION_PATH = "/integracao/autenticacao-aplicativos/verificar-permissao";
 
-function readCentralActivationUrl() {
-  return (
-    process.env.CENTRAL_ATIVACAO_URL ||
-    process.env.MEUS_APPS_BACKEND_URL ||
-    DEFAULT_CENTRAL_ATIVACAO_URL
-  );
+function uniq(values) {
+  return [...new Set(values.filter(Boolean))];
 }
 
-function getBaseUrl(req) {
-  const value = readCentralActivationUrl();
-
+function normalizeBaseUrl(value, label) {
   let parsed;
   try {
     parsed = new URL(value);
   } catch {
-    throw new GenericError("CENTRAL_ATIVACAO_URL inválida.", {
+    throw new GenericError(`${label} inválida.`, {
       statusCode: 500,
     });
   }
 
+  return parsed.toString().replace(/\/$/, "");
+}
+
+function withApiPath(value) {
+  const parsed = new URL(value);
+  const cleanPath = parsed.pathname.replace(/\/$/, "");
+
+  if (cleanPath.endsWith("/api")) return null;
+
+  parsed.pathname = `${cleanPath}/api`.replace(/^\/\//, "/");
+  return parsed.toString().replace(/\/$/, "");
+}
+
+function assertNotSameHost(url, req) {
+  const parsed = new URL(url);
   const currentHost = String(
     req?.headers?.["x-forwarded-host"] || req?.headers?.host || "",
   )
@@ -43,8 +52,66 @@ function getBaseUrl(req) {
       { statusCode: 500 },
     );
   }
+}
 
-  return parsed.toString().replace(/\/$/, "");
+function readCentralActivationPublicUrl() {
+  return (
+    process.env.CENTRAL_ATIVACAO_URL ||
+    process.env.MEUS_APPS_BACKEND_URL ||
+    DEFAULT_CENTRAL_ATIVACAO_URL
+  );
+}
+
+function readCentralActivationApiUrl() {
+  return (
+    process.env.CENTRAL_ATIVACAO_API_URL ||
+    process.env.CENTRAL_ATIVACAO_BACKEND_URL ||
+    process.env.CENTRAL_ATIVACAO_URL ||
+    process.env.MEUS_APPS_BACKEND_URL ||
+    DEFAULT_CENTRAL_ATIVACAO_URL
+  );
+}
+
+function getBaseUrl(req) {
+  const value = normalizeBaseUrl(
+    readCentralActivationApiUrl(),
+    "CENTRAL_ATIVACAO_API_URL/CENTRAL_ATIVACAO_URL",
+  );
+  assertNotSameHost(value, req);
+  return value;
+}
+
+function getDisplayUrl(req) {
+  const value = normalizeBaseUrl(
+    readCentralActivationPublicUrl(),
+    "CENTRAL_ATIVACAO_URL",
+  );
+  assertNotSameHost(value, req);
+  return value;
+}
+
+function getBaseUrlCandidates(req) {
+  const explicitApi = process.env.CENTRAL_ATIVACAO_API_URL;
+  const raw = uniq([
+    process.env.CENTRAL_ATIVACAO_API_URL,
+    process.env.CENTRAL_ATIVACAO_BACKEND_URL,
+    process.env.CENTRAL_ATIVACAO_URL,
+    process.env.MEUS_APPS_BACKEND_URL,
+    DEFAULT_CENTRAL_ATIVACAO_URL,
+  ]);
+
+  const normalized = raw.map((value) =>
+    normalizeBaseUrl(value, "CENTRAL_ATIVACAO_API_URL/CENTRAL_ATIVACAO_URL"),
+  );
+
+  const expanded = explicitApi
+    ? normalized
+    : normalized.flatMap((value) => [value, withApiPath(value)]);
+
+  return uniq(expanded).map((url) => {
+    assertNotSameHost(url, req);
+    return url;
+  });
 }
 
 function getAppCode() {
@@ -79,6 +146,8 @@ module.exports = {
   LOGIN_PATH,
   PERMISSION_PATH,
   getBaseUrl,
+  getDisplayUrl,
+  getBaseUrlCandidates,
   getAppCode,
   getTimeout,
 };

package/src/core/utils/instanceActivation.js

@@ -4,7 +4,12 @@ const axios = require("axios");
 const ctx = require("../context");
 const GenericError = require("../errors/GenericError");
 const Instancia = require("../models/InstanciaEcossistema");
-const { getBaseUrl, getAppCode, getTimeout } = require("./activationProvider");
+const {
+  getBaseUrl,
+  getBaseUrlCandidates,
+  getAppCode,
+  getTimeout,
+} = require("./activationProvider");
 
 const PATHS = {
   validar: "/integracao/ativacao-instancias/validar-codigo",
@@ -430,12 +435,28 @@ function validateParams(globalParameters = {}, appParameters = {}) {
   }
 }
 
+function shouldTryNextProviderUrl(error) {
+  return [404, 405].includes(Number(error.response?.status));
+}
+
 async function providerPost(req, path, payload, headers = {}) {
-  return axios.post(`${getBaseUrl(req)}${path}`, payload, {
-    timeout: getTimeout(),
-    maxRedirects: 0,
-    headers: { "Content-Type": "application/json", ...headers },
-  });
+  const baseUrls = getBaseUrlCandidates(req);
+  let lastError;
+
+  for (const baseUrl of baseUrls) {
+    try {
+      return await axios.post(`${baseUrl}${path}`, payload, {
+        timeout: getTimeout(),
+        maxRedirects: 0,
+        headers: { "Content-Type": "application/json", ...headers },
+      });
+    } catch (error) {
+      lastError = error;
+      if (!shouldTryNextProviderUrl(error)) throw error;
+    }
+  }
+
+  throw lastError;
 }
 
 function providerPayload(req, codigoAtivacao, extra = {}) {