From ab4d7a3bd74a6da6c56d34fd401814d71c349635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Faleiros?= Date: Wed, 17 Jun 2026 11:07:39 -0300 Subject: [PATCH] Revert "Normalize super admin login env values" This reverts commit de49dd50d918e93073634aa1773b20a6c007f699. --- backend/auth.js | 5 ++--- backend/config.js | 20 +++++--------------- backend/test/config.test.js | 16 ---------------- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 backend/test/config.test.js diff --git a/backend/auth.js b/backend/auth.js index 078d721..d2bb446 100644 --- a/backend/auth.js +++ b/backend/auth.js @@ -53,9 +53,8 @@ const buildTokenResponse = (user) => { const login = async (email, password) => { const normalizedEmail = normalizeEmail(email); - const normalizedPassword = String(password || '').trim(); - if (normalizedEmail === normalizeEmail(ADMIN_EMAIL) && normalizedPassword === ADMIN_PASSWORD) { + if (normalizedEmail === normalizeEmail(ADMIN_EMAIL) && password === ADMIN_PASSWORD) { return buildTokenResponse({ id: null, name: 'Super Admin', @@ -65,7 +64,7 @@ const login = async (email, password) => { } const dbUser = await findUserByEmail(normalizedEmail); - if (!dbUser || !dbUser.is_active || !verifyPassword(normalizedPassword, dbUser.password_hash)) { + if (!dbUser || !dbUser.is_active || !verifyPassword(password, dbUser.password_hash)) { return null; } diff --git a/backend/config.js b/backend/config.js index 275e606..ab522b6 100644 --- a/backend/config.js +++ b/backend/config.js @@ -1,21 +1,11 @@ require('dotenv').config(); -const cleanEnvValue = (value, fallback) => { - const rawValue = value ?? fallback; - const trimmedValue = String(rawValue || '').trim(); - const quote = trimmedValue[0]; - const hasMatchingQuotes = (quote === '"' || quote === "'") && trimmedValue.endsWith(quote); - - return hasMatchingQuotes ? trimmedValue.slice(1, -1) : trimmedValue; -}; - module.exports = { PORT: process.env.PORT || 3004, - API_KEY: cleanEnvValue(process.env.API_KEY, 'nexstar_secret_key_123'), - ADMIN_EMAIL: cleanEnvValue(process.env.ADMIN_EMAIL || process.env.SUPER_ADMIN_EMAIL, 'admin@admin.com'), - ADMIN_PASSWORD: cleanEnvValue(process.env.ADMIN_PASSWORD || process.env.SUPER_ADMIN_PASSWORD, 'admin123'), - JWT_SECRET: cleanEnvValue(process.env.JWT_SECRET, 'super_secret_jwt_key_123'), + API_KEY: process.env.API_KEY || 'nexstar_secret_key_123', + ADMIN_EMAIL: process.env.ADMIN_EMAIL || 'admin@admin.com', + ADMIN_PASSWORD: process.env.ADMIN_PASSWORD || 'admin123', + JWT_SECRET: process.env.JWT_SECRET || 'super_secret_jwt_key_123', DATABASE_URL: process.env.DATABASE_URL || 'postgres://graphuser:graphpassword@localhost:5432/graphdb', - N8N_WHATSAPP_TRIGGER_URL: cleanEnvValue(process.env.N8N_WHATSAPP_TRIGGER_URL, 'http://localhost:5678/webhook/whatsapp'), - cleanEnvValue + N8N_WHATSAPP_TRIGGER_URL: process.env.N8N_WHATSAPP_TRIGGER_URL || 'http://localhost:5678/webhook/whatsapp' }; diff --git a/backend/test/config.test.js b/backend/test/config.test.js deleted file mode 100644 index f17b1ce..0000000 --- a/backend/test/config.test.js +++ /dev/null @@ -1,16 +0,0 @@ -const assert = require('node:assert/strict'); -const test = require('node:test'); - -const config = require('../config'); - -test('cleanEnvValue trims env values and removes matching wrapper quotes', () => { - assert.equal(config.cleanEnvValue(' admin@example.com ', 'fallback'), 'admin@example.com'); - assert.equal(config.cleanEnvValue('"secret-pass"', 'fallback'), 'secret-pass'); - assert.equal(config.cleanEnvValue("'secret-pass'", 'fallback'), 'secret-pass'); -}); - -test('cleanEnvValue keeps unmatched quote characters inside values', () => { - assert.equal(config.cleanEnvValue('Compor@2017#', 'fallback'), 'Compor@2017#'); - assert.equal(config.cleanEnvValue('secret"pass', 'fallback'), 'secret"pass'); - assert.equal(config.cleanEnvValue('"secret-pass', 'fallback'), '"secret-pass'); -});