@oondemand/oon-core-back 0.3.6 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -3,6 +3,8 @@ const ctx = require("../context");
|
|
|
3
3
|
|
|
4
4
|
const DEFAULT_CENTRAL_ATIVACAO_URL =
|
|
5
5
|
"https://central-ativacao.central.oondemand.online";
|
|
6
|
+
const DEFAULT_CENTRAL_ATIVACAO_API_URL =
|
|
7
|
+
"https://api.central-ativacao.central.oondemand.online";
|
|
6
8
|
const LOGIN_PATH = "/integracao/autenticacao-aplicativos/autenticar";
|
|
7
9
|
const PERMISSION_PATH = "/integracao/autenticacao-aplicativos/verificar-permissao";
|
|
8
10
|
|
|
@@ -57,7 +59,6 @@ function assertNotSameHost(url, req) {
|
|
|
57
59
|
function readCentralActivationPublicUrl() {
|
|
58
60
|
return (
|
|
59
61
|
process.env.CENTRAL_ATIVACAO_URL ||
|
|
60
|
-
process.env.MEUS_APPS_BACKEND_URL ||
|
|
61
62
|
DEFAULT_CENTRAL_ATIVACAO_URL
|
|
62
63
|
);
|
|
63
64
|
}
|
|
@@ -66,16 +67,15 @@ function readCentralActivationApiUrl() {
|
|
|
66
67
|
return (
|
|
67
68
|
process.env.CENTRAL_ATIVACAO_API_URL ||
|
|
68
69
|
process.env.CENTRAL_ATIVACAO_BACKEND_URL ||
|
|
69
|
-
process.env.CENTRAL_ATIVACAO_URL ||
|
|
70
70
|
process.env.MEUS_APPS_BACKEND_URL ||
|
|
71
|
-
|
|
71
|
+
DEFAULT_CENTRAL_ATIVACAO_API_URL
|
|
72
72
|
);
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
function getBaseUrl(req) {
|
|
76
76
|
const value = normalizeBaseUrl(
|
|
77
77
|
readCentralActivationApiUrl(),
|
|
78
|
-
"CENTRAL_ATIVACAO_API_URL/
|
|
78
|
+
"CENTRAL_ATIVACAO_API_URL/CENTRAL_ATIVACAO_BACKEND_URL",
|
|
79
79
|
);
|
|
80
80
|
assertNotSameHost(value, req);
|
|
81
81
|
return value;
|
|
@@ -91,12 +91,16 @@ function getDisplayUrl(req) {
|
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
function getBaseUrlCandidates(req) {
|
|
94
|
-
const explicitApi =
|
|
94
|
+
const explicitApi =
|
|
95
|
+
process.env.CENTRAL_ATIVACAO_API_URL ||
|
|
96
|
+
process.env.CENTRAL_ATIVACAO_BACKEND_URL ||
|
|
97
|
+
process.env.MEUS_APPS_BACKEND_URL;
|
|
95
98
|
const raw = uniq([
|
|
96
99
|
process.env.CENTRAL_ATIVACAO_API_URL,
|
|
97
100
|
process.env.CENTRAL_ATIVACAO_BACKEND_URL,
|
|
98
|
-
process.env.CENTRAL_ATIVACAO_URL,
|
|
99
101
|
process.env.MEUS_APPS_BACKEND_URL,
|
|
102
|
+
DEFAULT_CENTRAL_ATIVACAO_API_URL,
|
|
103
|
+
process.env.CENTRAL_ATIVACAO_URL,
|
|
100
104
|
DEFAULT_CENTRAL_ATIVACAO_URL,
|
|
101
105
|
]);
|
|
102
106
|
|
|
@@ -143,6 +147,7 @@ function getTimeout() {
|
|
|
143
147
|
|
|
144
148
|
module.exports = {
|
|
145
149
|
DEFAULT_CENTRAL_ATIVACAO_URL,
|
|
150
|
+
DEFAULT_CENTRAL_ATIVACAO_API_URL,
|
|
146
151
|
LOGIN_PATH,
|
|
147
152
|
PERMISSION_PATH,
|
|
148
153
|
getBaseUrl,
|