From 7bb971b502c2f0f413f6c4500a83bdb353f76f7f Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 2 Jul 2026 12:14:21 +0200 Subject: [PATCH] Push for multi roles functionalities4 --- backend/dist/app.d.ts.map | 2 +- backend/dist/app.js | 10 ++++++++++ backend/dist/app.js.map | 2 +- backend/dist/config/index.d.ts.map | 2 +- backend/dist/config/index.js | 3 ++- backend/dist/config/index.js.map | 2 +- backend/dist/services/emailService.d.ts | 4 ++++ backend/dist/services/emailService.d.ts.map | 2 +- backend/dist/services/emailService.js | 7 +++++++ backend/dist/services/emailService.js.map | 2 +- .../services/emailVerificationService.d.ts.map | 2 +- .../dist/services/emailVerificationService.js | 13 +++++++++---- .../services/emailVerificationService.js.map | 2 +- .../dist/services/passwordResetService.d.ts.map | 2 +- backend/dist/services/passwordResetService.js | 7 +++++-- .../dist/services/passwordResetService.js.map | 2 +- backend/src/app.ts | 10 ++++++++++ backend/src/config/index.ts | 3 ++- backend/src/services/emailService.ts | 7 +++++++ backend/src/services/emailVerificationService.ts | 16 +++++++++++----- backend/src/services/passwordResetService.ts | 10 +++++++--- docker-compose.yml | 1 + .../src/features/auth/ForgotPasswordPage.tsx | 8 +++++--- 23 files changed, 90 insertions(+), 29 deletions(-) diff --git a/backend/dist/app.d.ts.map b/backend/dist/app.d.ts.map index b7414f0f..f50433d6 100644 --- a/backend/dist/app.d.ts.map +++ b/backend/dist/app.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,QAAA,MAAM,GAAG,6CAAY,CAAC;AA6DtB,mEAAmE;AACnE,eAAe,GAAG,CAAC"} \ No newline at end of file +{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,QAAA,MAAM,GAAG,6CAAY,CAAC;AAsEtB,mEAAmE;AACnE,eAAe,GAAG,CAAC"} \ No newline at end of file diff --git a/backend/dist/app.js b/backend/dist/app.js index 7b436e65..174809f1 100644 --- a/backend/dist/app.js +++ b/backend/dist/app.js @@ -47,7 +47,15 @@ const config_1 = require("./config"); const routes_1 = __importDefault(require("./routes")); const settingsRepository = __importStar(require("./repositories/settingsRepository")); const withdrawalFee_1 = require("./utils/withdrawalFee"); +const emailService_1 = require("./services/emailService"); const app = (0, express_1.default)(); +// Behind nginx / Docker reverse proxy (required for rate-limit + req.ip). +if (process.env.TRUST_PROXY === 'true' || process.env.TRUST_PROXY === '1') { + app.set('trust proxy', 1); +} +else if (process.env.NODE_ENV === 'production') { + app.set('trust proxy', 1); +} app.use((0, helmet_1.default)()); app.use((0, cors_1.default)({ origin: true, credentials: true })); app.use(express_1.default.json()); @@ -85,6 +93,8 @@ app.get('/health', async (_req, res) => { status: 'ok', timestamp: new Date().toISOString(), env: config_1.config.env, + emailTransport: config_1.config.email.transport, + emailConsoleMode: (0, emailService_1.usesConsoleEmailTransport)(), asset: 'USDT_TRC20', network: labelTronNetwork(config_1.config.blockchain.tron.nodeUrl), withdrawalsEnabled: settings.allow_withdrawals, diff --git a/backend/dist/app.js.map b/backend/dist/app.js.map index ef261310..4c68dbc7 100644 --- a/backend/dist/app.js.map +++ b/backend/dist/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/config/index.d.ts.map b/backend/dist/config/index.d.ts.map index ce4fa43c..f7f02d01 100644 --- a/backend/dist/config/index.d.ts.map +++ b/backend/dist/config/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkEH,kFAAkF;AAClF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;YAoBb,kIAAkI;;;;;;;YAOlI,iFAAiF;;;;;;;;;;;;QAgBnF,kFAAkF;;QAElF,4FAA4F;;;;;;;QAU5F,kEAAkE;;;QAGlE,gDAAgD;;QAEhD,0DAA0D;;QAE1D,2DAA2D;;;;QAI3D,iFAAiF;;;;;;QAMjF,6FAA6F;;;;QAI7F,gEAAgE;;;;;;;;;;QAUhE,+DAA+D;;;;;;;;;;;;;;QAc/D,iEAAiE;;QAEjE,8DAA8D;;QAE9D,4DAA4D;;;;;QAK5D,oEAAoE;;QAIpE,6DAA6D;;QAE7D,2EAA2E;;;;;;;;;IAS7E,mFAAmF;;;QAGjF;;;WAGG;;;CAKN,CAAC"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmEH,kFAAkF;AAClF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;YAoBb,kIAAkI;;;;;;;YAOlI,iFAAiF;;;;;;;;;;;;QAgBnF,kFAAkF;;QAElF,4FAA4F;;;;;;;QAU5F,kEAAkE;;;QAGlE,gDAAgD;;QAEhD,0DAA0D;;QAE1D,2DAA2D;;;;QAI3D,iFAAiF;;;;;;QAMjF,6FAA6F;;;;QAI7F,gEAAgE;;;;;;;;;;QAUhE,+DAA+D;;;;;;;;;;;;;;QAc/D,iEAAiE;;QAEjE,8DAA8D;;QAE9D,4DAA4D;;;;;QAK5D,oEAAoE;;QAIpE,6DAA6D;;QAE7D,2EAA2E;;;;;;;;;IAS7E,mFAAmF;;;QAGjF;;;WAGG;;;CAKN,CAAC"} \ No newline at end of file diff --git a/backend/dist/config/index.js b/backend/dist/config/index.js index 4f0a0cd0..a5619d1a 100644 --- a/backend/dist/config/index.js +++ b/backend/dist/config/index.js @@ -49,7 +49,8 @@ function loadEnvFiles() { if (rootResult.parsed) { for (const key of MAIL_ENV_KEYS) { const value = rootResult.parsed[key]; - if (value !== undefined && value !== '') { + // Docker Compose / ENV_FILE values take precedence over repo-root .env + if (value !== undefined && value !== '' && process.env[key] === undefined) { process.env[key] = value; } } diff --git a/backend/dist/config/index.js.map b/backend/dist/config/index.js.map index e3e780dc..62c04bf9 100644 --- a/backend/dist/config/index.js.map +++ b/backend/dist/config/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,oDAA4B;AAC5B,gDAAwB;AAExB,MAAM,aAAa,GAAG;IACpB,iBAAiB;IACjB,WAAW;IACX,WAAW;IACX,aAAa;IACb,WAAW;IACX,WAAW;IACX,YAAY;IACZ,gBAAgB;IAChB,mBAAmB;IACnB,qBAAqB;IACrB,6BAA6B;IAC7B,iCAAiC;IACjC,6BAA6B;IAC7B,yBAAyB;CACjB,CAAC;AAEX,SAAS,mBAAmB;IAC1B,OAAO,CAAC,CAAC,CACP,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,UAAU,CACvB,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB;IAC5B,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACpE,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC9C,IAAI,SAAS,KAAK,MAAM;QAAE,OAAO,mBAAmB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,OAAO,mBAAmB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AACpD,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC;IAE/C,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAEpD,yFAAyF;IACzF,MAAM,UAAU,GAAG,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5E,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,YAAY,EAAE,CAAC;AAEf,SAAS,UAAU,CAAC,GAAW,EAAE,QAAgB,EAAE,GAAW,EAAE,GAAW;IACzE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAC;IAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,kFAAkF;AACrE,QAAA,MAAM,GAAG;IACpB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;IAC1C,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,MAAM,EAAE,EAAE,CAAC;IAC9C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS;IAC9C,QAAQ,EAAE;QACR,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE;KACpC;IACD,GAAG,EAAE;QACH,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,yBAAyB;QAC3D,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,KAAK;QACpD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI;KACtD;IACD,UAAU,EAAE;QACV,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;KACtC;IACD,UAAU,EAAE;QACV,IAAI,EAAE;YACJ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,yBAAyB;YAC/D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE;YACtC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,EAAE,EAAE,CAAC;YACnE,kIAAkI;YAClI,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI;SAC3D;QACD,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,yBAAyB;YAChE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,4CAA4C;YAC/F,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,IAAI,EAAE,EAAE,CAAC;YACtE,iFAAiF;YACjF,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,KAAK,EAAE,EAAE,CAAC;SAClF;KACF;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,QAAQ,EAAE,EAAE,CAAC;QACpE,GAAG,EAAE,QAAQ,CACX,OAAO,CAAC,GAAG,CAAC,cAAc;YACxB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAC3D,EAAE,CACH;QACD,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,GAAG,EAAE,EAAE,CAAC;KAChE;IACD,UAAU,EAAE;QACV,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,OAAO,EAAE,EAAE,CAAC;QAC9E,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,MAAM,EAAE,EAAE,CAAC;QACrF,kFAAkF;QAClF,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM;QAC1D,4FAA4F;QAC5F,mBAAmB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,SAAS,EAAE,EAAE,CAAC;KAC9F;IACD,QAAQ,EAAE;QACR,wBAAwB,EAAE,QAAQ,CAChC,OAAO,CAAC,GAAG,CAAC,oCAAoC,IAAI,QAAQ,EAC5D,EAAE,CACH;KACF;IACD,QAAQ,EAAE;QACR,kEAAkE;QAClE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;QAClD,mBAAmB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,QAAQ,EAAE,EAAE,CAAC;QACjF,gDAAgD;QAChD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS;QAChE,0DAA0D;QAC1D,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,UAAU;QACnE,2DAA2D;QAC3D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,oBAAoB;KACpF;IACD,GAAG,EAAE;QACH,iFAAiF;QACjF,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,uBAAuB;QAChE,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,eAAe;QACjE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,iBAAiB;KACxE;IACD,SAAS,EAAE;QACT,6FAA6F;QAC7F,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,EAAE;KAC9D;IACD,OAAO,EAAE;QACP,gEAAgE;QAChE,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,YAAY;KACnE;IACD,aAAa,EAAE;QACb,YAAY,EAAE,UAAU,CAAC,+BAA+B,EAAE,IAAI,EAAE,IAAI,EAAE,KAAM,CAAC;QAC7E,kBAAkB,EAAE,UAAU,CAAC,sCAAsC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAChF,kBAAkB,EAAE,UAAU,CAAC,qCAAqC,EAAE,KAAM,EAAE,KAAM,EAAE,MAAO,CAAC;QAC9F,eAAe,EAAE,UAAU,CAAC,kCAAkC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC;KAC5E;IACD,KAAK,EAAE;QACL,+DAA+D;QAC/D,SAAS,EAAE,qBAAqB,EAAE;QAClC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE;QACjC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM;QAC1C,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QAC1C,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACvD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;QAClC,uBAAuB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,IAAI,EAAE,EAAE,CAAC;QAC1F,mBAAmB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,GAAG,EAAE,EAAE,CAAC;QACjF,wBAAwB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,GAAG,EAAE,EAAE,CAAC;QACtF,oBAAoB,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,GAAG,EAAE,EAAE,CAAC;KAC/E;IACD,KAAK,EAAE;QACL,iEAAiE;QACjE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE;QAC/C,8DAA8D;QAC9D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,EAAE;QAChE,4DAA4D;QAC5D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,EAAE;KACjE;IACD,KAAK,EAAE;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE;QAChC,oEAAoE;QACpE,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;YACpC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,OAAO,CAAC;QACpE,6DAA6D;QAC7D,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM;QAC3D,2EAA2E;QAC3E,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM;KAClD;IACD,EAAE,EAAE;QACF,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM;QAC1C,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,MAAM,EAAE,EAAE,CAAC;QACjD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,6BAA6B;QAC1D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,gBAAgB;KAC7D;IACD,mFAAmF;IACnF,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;IACrD,KAAK,EAAE;QACL;;;WAGG;QACH,KAAK,EACH,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC/B,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;KACxE;CACF,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/emailService.d.ts b/backend/dist/services/emailService.d.ts index a6e87435..e970decb 100644 --- a/backend/dist/services/emailService.d.ts +++ b/backend/dist/services/emailService.d.ts @@ -4,6 +4,10 @@ */ /** Gmail app passwords are often copied with spaces — strip them. */ export declare function normalizeSmtpPass(pass: string): string; +/** + * Returns true when emails are logged to stdout instead of SMTP (local Docker default). + */ +export declare function usesConsoleEmailTransport(): boolean; /** * Returns true when SMTP is fully configured for real email delivery. */ diff --git a/backend/dist/services/emailService.d.ts.map b/backend/dist/services/emailService.d.ts.map index 176fad5c..2d5c9d6c 100644 --- a/backend/dist/services/emailService.d.ts.map +++ b/backend/dist/services/emailService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emailService.d.ts","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAOD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAG1C;AAmCD,6DAA6D;AAC7D,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1D;AA6BD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA8Cf"} \ No newline at end of file +{"version":3,"file":"emailService.d.ts","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAOD;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAG1C;AAmCD,6DAA6D;AAC7D,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1D;AA6BD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA8Cf"} \ No newline at end of file diff --git a/backend/dist/services/emailService.js b/backend/dist/services/emailService.js index 84fc159a..41523560 100644 --- a/backend/dist/services/emailService.js +++ b/backend/dist/services/emailService.js @@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.normalizeSmtpPass = normalizeSmtpPass; +exports.usesConsoleEmailTransport = usesConsoleEmailTransport; exports.isSmtpConfigured = isSmtpConfigured; exports.verifySmtpConnection = verifySmtpConnection; exports.sendVerificationEmail = sendVerificationEmail; @@ -24,6 +25,12 @@ function isGmailHost(host) { const h = host.toLowerCase(); return h.includes('gmail.com') || h.includes('googlemail.com'); } +/** + * Returns true when emails are logged to stdout instead of SMTP (local Docker default). + */ +function usesConsoleEmailTransport() { + return config_1.config.email.transport === 'console'; +} /** * Returns true when SMTP is fully configured for real email delivery. */ diff --git a/backend/dist/services/emailService.js.map b/backend/dist/services/emailService.js.map index 52f395a7..c494137b 100644 --- a/backend/dist/services/emailService.js.map +++ b/backend/dist/services/emailService.js.map @@ -1 +1 @@ -{"version":3,"file":"emailService.js","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"emailService.js","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/emailVerificationService.d.ts.map b/backend/dist/services/emailVerificationService.d.ts.map index 4501f7d1..a0d75da6 100644 --- a/backend/dist/services/emailVerificationService.d.ts.map +++ b/backend/dist/services/emailVerificationService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"emailVerificationService.d.ts","sourceRoot":"","sources":["../../src/services/emailVerificationService.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsCrD;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAuBrG;AAED;;GAEG;AACH,wBAAsB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC,CAkBD;AAED;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMjF"} \ No newline at end of file +{"version":3,"file":"emailVerificationService.d.ts","sourceRoot":"","sources":["../../src/services/emailVerificationService.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwCrD;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAuBrG;AAED;;GAEG;AACH,wBAAsB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC,CAsBD;AAED;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMjF"} \ No newline at end of file diff --git a/backend/dist/services/emailVerificationService.js b/backend/dist/services/emailVerificationService.js index 5622f894..11447fd4 100644 --- a/backend/dist/services/emailVerificationService.js +++ b/backend/dist/services/emailVerificationService.js @@ -88,9 +88,11 @@ async function sendVerificationEmailForUser(userId) { metadata: { transport: config_1.config.email.transport }, }); const result = { - message: 'Verification email sent. Check your inbox.', + message: (0, emailService_1.usesConsoleEmailTransport)() + ? 'Console email mode: use the verification link below (also logged in backend output).' + : 'Verification email sent. Check your inbox.', }; - if (config_1.config.env !== 'production' && config_1.config.email.transport === 'console') { + if ((0, emailService_1.usesConsoleEmailTransport)()) { result.devVerifyUrl = verifyUrl; } return result; @@ -137,8 +139,11 @@ async function requestVerificationResendByEmail(email) { if (!user || user.is_enabled === false || user.email_verified) return generic; const sent = await sendVerificationEmailForUser(user.id); - if (config_1.config.env !== 'production' && config_1.config.email.transport === 'console') { - return { ...generic, devVerifyUrl: sent.devVerifyUrl }; + if ((0, emailService_1.usesConsoleEmailTransport)() && sent.devVerifyUrl) { + return { + message: 'Console email mode: no message was sent. Use the verification link below if an account exists.', + devVerifyUrl: sent.devVerifyUrl, + }; } return generic; } diff --git a/backend/dist/services/emailVerificationService.js.map b/backend/dist/services/emailVerificationService.js.map index 0f97768a..0d93a992 100644 --- a/backend/dist/services/emailVerificationService.js.map +++ b/backend/dist/services/emailVerificationService.js.map @@ -1 +1 @@ -{"version":3,"file":"emailVerificationService.js","sourceRoot":"","sources":["../../src/services/emailVerificationService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"emailVerificationService.js","sourceRoot":"","sources":["../../src/services/emailVerificationService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/passwordResetService.d.ts.map b/backend/dist/services/passwordResetService.d.ts.map index 04b44b78..6d641963 100644 --- a/backend/dist/services/passwordResetService.d.ts.map +++ b/backend/dist/services/passwordResetService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"passwordResetService.d.ts","sourceRoot":"","sources":["../../src/services/passwordResetService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC,CAyCD;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA4B9B;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAMtF"} \ No newline at end of file +{"version":3,"file":"passwordResetService.d.ts","sourceRoot":"","sources":["../../src/services/passwordResetService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC,CA6CD;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA4B9B;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAMtF"} \ No newline at end of file diff --git a/backend/dist/services/passwordResetService.js b/backend/dist/services/passwordResetService.js index 876ebb52..d65eacfa 100644 --- a/backend/dist/services/passwordResetService.js +++ b/backend/dist/services/passwordResetService.js @@ -92,8 +92,11 @@ async function requestPasswordReset(email) { resourceId: user.id, metadata: { transport: config_1.config.email.transport }, }); - if (config_1.config.env !== 'production' && config_1.config.email.transport === 'console') { - return { ...generic, devResetUrl: resetUrl }; + if ((0, emailService_1.usesConsoleEmailTransport)()) { + return { + message: 'Console email mode: no message was sent. Use the reset link below (also logged in backend container output).', + devResetUrl: resetUrl, + }; } return generic; } diff --git a/backend/dist/services/passwordResetService.js.map b/backend/dist/services/passwordResetService.js.map index 9610ce22..c74c70b6 100644 --- a/backend/dist/services/passwordResetService.js.map +++ b/backend/dist/services/passwordResetService.js.map @@ -1 +1 @@ -{"version":3,"file":"passwordResetService.js","sourceRoot":"","sources":["../../src/services/passwordResetService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"passwordResetService.js","sourceRoot":"","sources":["../../src/services/passwordResetService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/src/app.ts b/backend/src/app.ts index 095b45fb..9043bcee 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -10,9 +10,17 @@ import { config } from './config'; import routes from './routes'; import * as settingsRepository from './repositories/settingsRepository'; import { getWithdrawalNetworkFeeRaw } from './utils/withdrawalFee'; +import { usesConsoleEmailTransport } from './services/emailService'; const app = express(); +// Behind nginx / Docker reverse proxy (required for rate-limit + req.ip). +if (process.env.TRUST_PROXY === 'true' || process.env.TRUST_PROXY === '1') { + app.set('trust proxy', 1); +} else if (process.env.NODE_ENV === 'production') { + app.set('trust proxy', 1); +} + app.use(helmet()); app.use(cors({ origin: true, credentials: true })); app.use(express.json()); @@ -50,6 +58,8 @@ app.get('/health', async (_req, res) => { status: 'ok', timestamp: new Date().toISOString(), env: config.env, + emailTransport: config.email.transport, + emailConsoleMode: usesConsoleEmailTransport(), asset: 'USDT_TRC20', network: labelTronNetwork(config.blockchain.tron.nodeUrl), withdrawalsEnabled: settings.allow_withdrawals, diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 77cf7101..879a9791 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -50,7 +50,8 @@ function loadEnvFiles(): void { if (rootResult.parsed) { for (const key of MAIL_ENV_KEYS) { const value = rootResult.parsed[key]; - if (value !== undefined && value !== '') { + // Docker Compose / ENV_FILE values take precedence over repo-root .env + if (value !== undefined && value !== '' && process.env[key] === undefined) { process.env[key] = value; } } diff --git a/backend/src/services/emailService.ts b/backend/src/services/emailService.ts index faba9956..7781bf69 100644 --- a/backend/src/services/emailService.ts +++ b/backend/src/services/emailService.ts @@ -19,6 +19,13 @@ function isGmailHost(host: string): boolean { return h.includes('gmail.com') || h.includes('googlemail.com'); } +/** + * Returns true when emails are logged to stdout instead of SMTP (local Docker default). + */ +export function usesConsoleEmailTransport(): boolean { + return config.email.transport === 'console'; +} + /** * Returns true when SMTP is fully configured for real email delivery. */ diff --git a/backend/src/services/emailVerificationService.ts b/backend/src/services/emailVerificationService.ts index fce6337b..0bb217a0 100644 --- a/backend/src/services/emailVerificationService.ts +++ b/backend/src/services/emailVerificationService.ts @@ -7,7 +7,7 @@ import { decrypt, hashToken, randomHex } from '../utils/crypto'; import * as userRepository from '../repositories/userRepository'; import * as emailVerificationRepository from '../repositories/emailVerificationRepository'; import * as auditLogRepository from '../repositories/auditLogRepository'; -import { sendVerificationEmail } from './emailService'; +import { sendVerificationEmail, usesConsoleEmailTransport } from './emailService'; /** * Builds the web app URL users open to complete verification. @@ -58,10 +58,12 @@ export async function sendVerificationEmailForUser( }); const result: { message: string; devVerifyUrl?: string } = { - message: 'Verification email sent. Check your inbox.', + message: usesConsoleEmailTransport() + ? 'Console email mode: use the verification link below (also logged in backend output).' + : 'Verification email sent. Check your inbox.', }; - if (config.env !== 'production' && config.email.transport === 'console') { + if (usesConsoleEmailTransport()) { result.devVerifyUrl = verifyUrl; } @@ -118,8 +120,12 @@ export async function requestVerificationResendByEmail(email: string): Promise<{ if (!user || user.is_enabled === false || user.email_verified) return generic; const sent = await sendVerificationEmailForUser(user.id); - if (config.env !== 'production' && config.email.transport === 'console') { - return { ...generic, devVerifyUrl: sent.devVerifyUrl }; + if (usesConsoleEmailTransport() && sent.devVerifyUrl) { + return { + message: + 'Console email mode: no message was sent. Use the verification link below if an account exists.', + devVerifyUrl: sent.devVerifyUrl, + }; } return generic; } diff --git a/backend/src/services/passwordResetService.ts b/backend/src/services/passwordResetService.ts index 2b091a09..83895e44 100644 --- a/backend/src/services/passwordResetService.ts +++ b/backend/src/services/passwordResetService.ts @@ -8,7 +8,7 @@ import * as userRepository from '../repositories/userRepository'; import * as passwordResetRepository from '../repositories/passwordResetRepository'; import * as refreshTokenRepository from '../repositories/refreshTokenRepository'; import * as auditLogRepository from '../repositories/auditLogRepository'; -import { sendPasswordResetEmail } from './emailService'; +import { sendPasswordResetEmail, usesConsoleEmailTransport } from './emailService'; import { validatePassword } from './authService'; import * as settingsRepository from '../repositories/settingsRepository'; import argon2 from 'argon2'; @@ -64,8 +64,12 @@ export async function requestPasswordReset(email: string): Promise<{ metadata: { transport: config.email.transport }, }); - if (config.env !== 'production' && config.email.transport === 'console') { - return { ...generic, devResetUrl: resetUrl }; + if (usesConsoleEmailTransport()) { + return { + message: + 'Console email mode: no message was sent. Use the reset link below (also logged in backend container output).', + devResetUrl: resetUrl, + }; } return generic; } diff --git a/docker-compose.yml b/docker-compose.yml index aa4349d8..0e36bc7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,6 +44,7 @@ x-backend-common: &backend-common ALLOW_WITHDRAWALS: ${ALLOW_WITHDRAWALS:-false} RATE_LIMIT_MAX: ${RATE_LIMIT_MAX:-2000} INITIAL_SETUP_TOKEN: ${INITIAL_SETUP_TOKEN:-} + TRUST_PROXY: ${TRUST_PROXY:-true} APP_PUBLIC_URL: ${APP_PUBLIC_URL:-https://prediqo.redirectme.net:9443} EMAIL_TRANSPORT: ${EMAIL_TRANSPORT:-console} SMTP_HOST: ${SMTP_HOST:-} diff --git a/prediqo_web/src/features/auth/ForgotPasswordPage.tsx b/prediqo_web/src/features/auth/ForgotPasswordPage.tsx index b4443f8a..8be05a80 100644 --- a/prediqo_web/src/features/auth/ForgotPasswordPage.tsx +++ b/prediqo_web/src/features/auth/ForgotPasswordPage.tsx @@ -53,9 +53,11 @@ export function ForgotPasswordPage() { {success && {success}} {devUrl && ( - Dev mode — reset link:{' '} - - open link + + Local / console mode — no email is sent. Open this link to reset your password: + + + {devUrl} )}