diff --git a/docs/sim-api/Activate.bru b/docs/sim-api/Activate.bru index 58c9cf7..42a9d5c 100644 --- a/docs/sim-api/Activate.bru +++ b/docs/sim-api/Activate.bru @@ -11,7 +11,7 @@ post { } body:form-urlencoded { - iccid: 8933201125065160406 + iccid: 8933201125065160331 offer: SAVEFAMILY1 } diff --git a/docs/sim-api/Activation Email Health.bru b/docs/sim-api/Activation Email Health.bru new file mode 100644 index 0000000..eebbd63 --- /dev/null +++ b/docs/sim-api/Activation Email Health.bru @@ -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 +} diff --git a/docs/sim-api/Activation Email.bru b/docs/sim-api/Activation Email.bru new file mode 100644 index 0000000..a6817c3 --- /dev/null +++ b/docs/sim-api/Activation Email.bru @@ -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 +} diff --git a/docs/sim-objenious/Get request by ID.bru b/docs/sim-objenious/Get request by ID.bru index 82efb13..4c85e9e 100644 --- a/docs/sim-objenious/Get request by ID.bru +++ b/docs/sim-objenious/Get request by ID.bru @@ -37,7 +37,7 @@ body:form-urlencoded { } vars:pre-request { - params.id: 14111 + params.id: 14333 } settings { diff --git a/package.json b/package.json index a1f8c44..fb0a23e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "sim-eventos", + "version": "1.0.0", "packageManager": "yarn@4.12.0", "workspaces": [ "packages/*" diff --git a/packages/sim-objenious-cron/.env b/packages/sim-objenious-cron/.env index 627af25..06d6f02 100644 --- a/packages/sim-objenious-cron/.env +++ b/packages/sim-objenious-cron/.env @@ -5,6 +5,7 @@ OBJ_CLI_ASSERTION=XOc7FtwXD8hUX2SFVX94XSty8wkOmChkwDNF09O_aIxPubMDdFUdCDCB4zpzSI OBJ_CLIENT_ID=savefamily_rest_ws OBJ_KID=xNfbMiyL1ORXGP8lElhcv8nVaG3EJKye4Lc1YoN3I1E 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" +SIM_ACTIVATION_API_KEY=9e48c4ac-1ab0-4397-b3f3-6c239200dfe6 diff --git a/packages/sim-objenious-cron/config/env/index.ts b/packages/sim-objenious-cron/config/env/index.ts index 2540574..a8d2fac 100644 --- a/packages/sim-objenious-cron/config/env/index.ts +++ b/packages/sim-objenious-cron/config/env/index.ts @@ -1,5 +1,6 @@ import { loadEnvFile } from "node:process"; import path from "node:path"; +import assert from "node:assert"; loadEnvFile(path.join("../../.env")) // Global loadEnvFile(path.join("./.env")) // base @@ -12,9 +13,9 @@ export const env = { POSTGRES_HOST: process.env.POSTGRES_HOST, POSTGRES_DATABASE: process.env.POSTGRES_DATABASE, RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"), - RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "guest"), - RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "guest"), - RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE ?? "/"), + RABBITMQ_USER: String(process.env.RABBITMQ_USER), + RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD), + RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE), RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"), RABBITMQ_MODULENAME: process.env.MODULENAME, RABBITMQ_TTL: process.env.RABBITMQ_TTL, @@ -30,6 +31,20 @@ export const env = { OBJ_KID: String(process.env.OBJ_KID), 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) + diff --git a/packages/sim-objenious-cron/tasks/background1.ts b/packages/sim-objenious-cron/tasks/background1.ts deleted file mode 100644 index e582b85..0000000 --- a/packages/sim-objenious-cron/tasks/background1.ts +++ /dev/null @@ -1 +0,0 @@ -export const task = async () => console.log("Background " + new Date().toISOString()) diff --git a/packages/sim-objenious-cron/tasks/check_objenious_request.ts b/packages/sim-objenious-cron/tasks/check_objenious_request.ts index 81ec0d5..4476117 100644 --- a/packages/sim-objenious-cron/tasks/check_objenious_request.ts +++ b/packages/sim-objenious-cron/tasks/check_objenious_request.ts @@ -236,27 +236,14 @@ export class CheckObjeniousRequests { * al servicio que manda los mails */ private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) { - console.log("Notificada, ", operation) - const req = axios.post(env.NOTIFICATION_URL, { ...operation, iccids: [operation.iccids] }, { 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("", - { operation: operation }, - { - headers: { - "x-apikey-sim-activation": "9e48c4ac-1ab0-4397-b3f3-6c239200dfe6" - }, - baseURL: env.NOTIFICATION_URL - } - - )*/ await req } }