blyzer/graphs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Normalize super admin login env values"

Browse Source 
This reverts commit de49dd50d9.
This commit is contained in:
Cauê Faleiros
2026-06-17 11:07:39 -03:00
parent de49dd50d9
commit ab4d7a3bd7
3 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/auth.js
View File

@@ -53,9 +53,8 @@ const buildTokenResponse = (user) => {
const login = async (email, password) => { const login = async (email, password) => {
const normalizedEmail = normalizeEmail(email); 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({ return buildTokenResponse({
id: null, id: null,
name: 'Super Admin', name: 'Super Admin',
@@ -65,7 +64,7 @@ const login = async (email, password) => {
} }
const dbUser = await findUserByEmail(normalizedEmail); 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; return null;
} }

20
backend/config.js
View File

@@ -1,21 +1,11 @@
require('dotenv').config(); 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 = { module.exports = {
PORT: process.env.PORT || 3004, PORT: process.env.PORT || 3004,
API_KEY: cleanEnvValue(process.env.API_KEY, 'nexstar_secret_key_123'), API_KEY: process.env.API_KEY || 'nexstar_secret_key_123',
ADMIN_EMAIL: cleanEnvValue(process.env.ADMIN_EMAIL || process.env.SUPER_ADMIN_EMAIL, 'admin@admin.com'), ADMIN_EMAIL: process.env.ADMIN_EMAIL || 'admin@admin.com',
ADMIN_PASSWORD: cleanEnvValue(process.env.ADMIN_PASSWORD || process.env.SUPER_ADMIN_PASSWORD, 'admin123'), ADMIN_PASSWORD: process.env.ADMIN_PASSWORD || 'admin123',
JWT_SECRET: cleanEnvValue(process.env.JWT_SECRET, 'super_secret_jwt_key_123'), JWT_SECRET: process.env.JWT_SECRET || 'super_secret_jwt_key_123',
DATABASE_URL: process.env.DATABASE_URL || 'postgres://graphuser:graphpassword@localhost:5432/graphdb', 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'), N8N_WHATSAPP_TRIGGER_URL: process.env.N8N_WHATSAPP_TRIGGER_URL || 'http://localhost:5678/webhook/whatsapp'
cleanEnvValue
}; };

16
backend/test/config.test.js
View File

@@ -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');
});