From 8e0dc4bb88b9396fe61c54f7972b6bd393b7cecb Mon Sep 17 00:00:00 2001 From: Fachba Date: Fri, 9 Jan 2026 11:06:05 +0700 Subject: [PATCH 1/3] fixing token redirect --- controllers/auth.controller.js | 2 ++ services/notifikasi-wa.service.js | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/auth.controller.js b/controllers/auth.controller.js index 69ce205..4145227 100644 --- a/controllers/auth.controller.js +++ b/controllers/auth.controller.js @@ -104,6 +104,8 @@ class AuthController { const bytes = CryptoJS.AES.decrypt(tokenRedirect, process.env.VITE_KEY_SESSION); const decrypted = JSON.parse(bytes.toString(CryptoJS.enc.Utf8)); + console.log("decrypted: ", decrypted); + const userPhone = decrypted?.user_phone const userName = decrypted?.user_name const idData = decrypted?.id diff --git a/services/notifikasi-wa.service.js b/services/notifikasi-wa.service.js index f7d3a51..c726c22 100644 --- a/services/notifikasi-wa.service.js +++ b/services/notifikasi-wa.service.js @@ -67,8 +67,8 @@ class NotifikasiWaService { for (const dataUser of dataUsers) { if (dataUser.is_active) { const tokenRedirect = await generateTokenRedirect( - dataUser.userPhone, - dataUser.userName, + dataUser.contact_phone, + dataUser.contact_name, resultNotificationError.notification_error_id ); @@ -105,6 +105,8 @@ class NotifikasiWaService { param.bodyMessage ); + console.log("resultSend: ", resultSend); + await updateNotificationErrorUserDb( resultNotificationErrorUser[0].notification_error_user_id, { From 436ea1cf8914a084fa8bc3c00f6280503e4d99ba Mon Sep 17 00:00:00 2001 From: mhmmdafif Date: Fri, 9 Jan 2026 14:30:07 +0700 Subject: [PATCH 2/3] replace created at in notif error --- db/notification_error.db.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/db/notification_error.db.js b/db/notification_error.db.js index 2f35a5c..561f68d 100644 --- a/db/notification_error.db.js +++ b/db/notification_error.db.js @@ -95,7 +95,8 @@ const getAllNotificationDb = async (searchParams = {}) => { ], queryParams ); - if (whereParamAnd) queryParams = whereParamAnd; + + queryParams = whereParamAnd ? whereParamAnd : queryParams; const queryText = ` SELECT @@ -108,12 +109,12 @@ const getAllNotificationDb = async (searchParams = {}) => { a.is_delivered, a.is_read, a.is_active, + a.created_at, b.error_code, b.error_code_name, b.error_code_color, b.path_icon, - b.created_at, c.solution_name, c.type_solution, From 47c99c878a5ab933d11b60c61b66d4237fa1545e Mon Sep 17 00:00:00 2001 From: Fachba Date: Mon, 12 Jan 2026 11:12:08 +0700 Subject: [PATCH 3/3] mqtt connection using env --- .env.example | 14 ++++++++++++++ config/index.js | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index cfb3f65..91f1765 100644 --- a/.env.example +++ b/.env.example @@ -45,4 +45,18 @@ IMAGEKIT_PRIVATE_KEY=private_vhO/jXHnEoaVYptOHIuZDPMbxIA= # CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx # REFRESH_TOKEN=1//XXXXXXXX +ENDPOINT_WHATSAPP=https://117.102.231.130:9531/send +# ENDPOINT_WHATSAPP=http://localhost:9529/send + +# ENDPOINT_FE=http://localhost:8592 +# ENDPOINT_FE=http://203.153.114.226:8466 +ENDPOINT_FE=https://117.102.231.130:9529 + + +# MQTT Connection +MQTT_HOST=ws://117.102.231.130:7001 +MQTT_USERNAME=morekmorekmorek +MQTT_PASSWORD=morek888 +TOPIC_COD=PIU_COD/ERROR_CODE + VITE_KEY_SESSION=PetekRombonganPetekMorekMorakMarek diff --git a/config/index.js b/config/index.js index 9fbcd49..3e2b88f 100644 --- a/config/index.js +++ b/config/index.js @@ -292,11 +292,11 @@ const mqttOptions = { clientId: 'express_mqtt_client_' + Math.random().toString(16).substr(2, 8), clean: true, connectTimeout: 4000, - username: 'morekmorekmorek', // jika ada - password: 'morek888', // jika ada + username: process.env.MQTT_USERNAME ?? 'morekmorekmorek', // jika ada + password: process.env.MQTT_PASSWORD ?? 'morek888', // jika ada }; -const mqttUrl = 'ws://117.102.231.130:7001'; // Ganti dengan broker kamu +const mqttUrl = process.env.MQTT_HOST; // Ganti dengan broker kamu const topic = process.env.TOPIC_COD ?? 'morek'; const mqttClient = mqtt.connect(mqttUrl, mqttOptions);