Fix de api-key y mejora del control de versiones
This commit is contained in:
@@ -11,7 +11,7 @@ post {
|
|||||||
}
|
}
|
||||||
|
|
||||||
body:form-urlencoded {
|
body:form-urlencoded {
|
||||||
iccid: 8933201125065160406
|
iccid: 8933201125065160331
|
||||||
offer: SAVEFAMILY1
|
offer: SAVEFAMILY1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
16
docs/sim-api/Activation Email Health.bru
Normal file
16
docs/sim-api/Activation Email Health.bru
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
meta {
|
||||||
|
name: Activation Email Health
|
||||||
|
type: http
|
||||||
|
seq: 8
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
url: https://sf-sim-activation.savefamily.net/health
|
||||||
|
body: none
|
||||||
|
auth: inherit
|
||||||
|
}
|
||||||
|
|
||||||
|
settings {
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
}
|
||||||
26
docs/sim-api/Activation Email.bru
Normal file
26
docs/sim-api/Activation Email.bru
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
meta {
|
||||||
|
name: Activation Email
|
||||||
|
type: http
|
||||||
|
seq: 6
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
url: https://sf-sim-activation.savefamily.net/send-activation-mail
|
||||||
|
body: json
|
||||||
|
auth: inherit
|
||||||
|
}
|
||||||
|
|
||||||
|
headers {
|
||||||
|
x-apikey-sim-activation: 9e48c4ac-1ab0-4397-b3f3-6c239200dfe6
|
||||||
|
}
|
||||||
|
|
||||||
|
body:json {
|
||||||
|
{
|
||||||
|
"iccids":["1234"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
settings {
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
}
|
||||||
@@ -37,7 +37,7 @@ body:form-urlencoded {
|
|||||||
}
|
}
|
||||||
|
|
||||||
vars:pre-request {
|
vars:pre-request {
|
||||||
params.id: 14111
|
params.id: 14333
|
||||||
}
|
}
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sim-eventos",
|
"name": "sim-eventos",
|
||||||
|
"version": "1.0.0",
|
||||||
"packageManager": "yarn@4.12.0",
|
"packageManager": "yarn@4.12.0",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ OBJ_CLI_ASSERTION=XOc7FtwXD8hUX2SFVX94XSty8wkOmChkwDNF09O_aIxPubMDdFUdCDCB4zpzSI
|
|||||||
OBJ_CLIENT_ID=savefamily_rest_ws
|
OBJ_CLIENT_ID=savefamily_rest_ws
|
||||||
OBJ_KID=xNfbMiyL1ORXGP8lElhcv8nVaG3EJKye4Lc1YoN3I1E
|
OBJ_KID=xNfbMiyL1ORXGP8lElhcv8nVaG3EJKye4Lc1YoN3I1E
|
||||||
OBJ_BASE_URL=https://api-getway.objenious.com/ws
|
OBJ_BASE_URL=https://api-getway.objenious.com/ws
|
||||||
//OBJ_BASE_URL=https://api-getway.objenious.com/ws/test
|
# OBJ_BASE_URL=https://api-getway.objenious.com/ws/test
|
||||||
|
|
||||||
NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"
|
NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"
|
||||||
|
SIM_ACTIVATION_API_KEY=9e48c4ac-1ab0-4397-b3f3-6c239200dfe6
|
||||||
|
|||||||
23
packages/sim-objenious-cron/config/env/index.ts
vendored
23
packages/sim-objenious-cron/config/env/index.ts
vendored
@@ -1,5 +1,6 @@
|
|||||||
import { loadEnvFile } from "node:process";
|
import { loadEnvFile } from "node:process";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
|
import assert from "node:assert";
|
||||||
|
|
||||||
loadEnvFile(path.join("../../.env")) // Global
|
loadEnvFile(path.join("../../.env")) // Global
|
||||||
loadEnvFile(path.join("./.env")) // base
|
loadEnvFile(path.join("./.env")) // base
|
||||||
@@ -12,9 +13,9 @@ export const env = {
|
|||||||
POSTGRES_HOST: process.env.POSTGRES_HOST,
|
POSTGRES_HOST: process.env.POSTGRES_HOST,
|
||||||
POSTGRES_DATABASE: process.env.POSTGRES_DATABASE,
|
POSTGRES_DATABASE: process.env.POSTGRES_DATABASE,
|
||||||
RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"),
|
RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"),
|
||||||
RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "guest"),
|
RABBITMQ_USER: String(process.env.RABBITMQ_USER),
|
||||||
RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "guest"),
|
RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD),
|
||||||
RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE ?? "/"),
|
RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE),
|
||||||
RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"),
|
RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"),
|
||||||
RABBITMQ_MODULENAME: process.env.MODULENAME,
|
RABBITMQ_MODULENAME: process.env.MODULENAME,
|
||||||
RABBITMQ_TTL: process.env.RABBITMQ_TTL,
|
RABBITMQ_TTL: process.env.RABBITMQ_TTL,
|
||||||
@@ -30,6 +31,20 @@ export const env = {
|
|||||||
OBJ_KID: String(process.env.OBJ_KID),
|
OBJ_KID: String(process.env.OBJ_KID),
|
||||||
OBJ_BASE_URL: String(process.env.OBJ_BASE_URL),
|
OBJ_BASE_URL: String(process.env.OBJ_BASE_URL),
|
||||||
|
|
||||||
NOTIFICATION_URL: String(process.env.NOTIFICATION_URL)
|
NOTIFICATION_URL: String(process.env.NOTIFICATION_URL),
|
||||||
|
SIM_ACTIVATION_API_KEY: String(process.env.SIM_ACTIVATION_API_KEY)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// assert las partes criticas
|
||||||
|
assert(env.RABBITMQ_PASSWORD != undefined)
|
||||||
|
assert(env.RABBITMQ_USER != undefined)
|
||||||
|
assert(env.SIM_ACTIVATION_API_KEY != undefined)
|
||||||
|
assert(env.NOTIFICATION_URL != undefined)
|
||||||
|
|
||||||
|
if (env.ENVIRONMENT == "production") {
|
||||||
|
assert(env.RABBITMQ_PASSWORD != "guest")
|
||||||
|
assert(env.RABBITMQ_HOST != "localhost")
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("CRON: ENV", env)
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export const task = async () => console.log("Background " + new Date().toISOString())
|
|
||||||
@@ -236,27 +236,14 @@ export class CheckObjeniousRequests {
|
|||||||
* al servicio que manda los mails
|
* al servicio que manda los mails
|
||||||
*/
|
*/
|
||||||
private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) {
|
private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) {
|
||||||
console.log("Notificada, ", operation)
|
|
||||||
|
|
||||||
const req = axios.post(env.NOTIFICATION_URL, {
|
const req = axios.post(env.NOTIFICATION_URL, {
|
||||||
...operation,
|
...operation,
|
||||||
iccids: [operation.iccids]
|
iccids: [operation.iccids]
|
||||||
}, {
|
}, {
|
||||||
headers: {
|
headers: {
|
||||||
"x-apikey-sim-activation": "9e48c4ac-1ab0-4397-b3f3-6c239200dfe6"
|
"x-apikey-sim-activation": env.SIM_ACTIVATION_API_KEY
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
/*
|
|
||||||
const req = this.httpClient.client.post<any>("",
|
|
||||||
{ operation: operation },
|
|
||||||
{
|
|
||||||
headers: {
|
|
||||||
"x-apikey-sim-activation": "9e48c4ac-1ab0-4397-b3f3-6c239200dfe6"
|
|
||||||
},
|
|
||||||
baseURL: env.NOTIFICATION_URL
|
|
||||||
}
|
|
||||||
|
|
||||||
)*/
|
|
||||||
await req
|
await req
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user