diff --git a/backend/dist/bootstrap/appBootstrap.d.ts.map b/backend/dist/bootstrap/appBootstrap.d.ts.map index f6a65af2..81e9107b 100644 --- a/backend/dist/bootstrap/appBootstrap.d.ts.map +++ b/backend/dist/bootstrap/appBootstrap.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"appBootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap/appBootstrap.ts"],"names":[],"mappings":"AAAA;;GAEG;AAmGH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+EAA+E;IAC/E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,kCAAkC;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,yDAAyD;AACzD,wBAAsB,aAAa,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C9E"} \ No newline at end of file +{"version":3,"file":"appBootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap/appBootstrap.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqGH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+EAA+E;IAC/E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,kCAAkC;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,yDAAyD;AACzD,wBAAsB,aAAa,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C9E"} \ No newline at end of file diff --git a/backend/dist/bootstrap/appBootstrap.js b/backend/dist/bootstrap/appBootstrap.js index 7c077b83..2678440d 100644 --- a/backend/dist/bootstrap/appBootstrap.js +++ b/backend/dist/bootstrap/appBootstrap.js @@ -11,7 +11,7 @@ const engineRunner_1 = require("../games/engineRunner"); const depositMonitorService_1 = require("../services/depositMonitorService"); const securityService_1 = require("../services/securityService"); const dbTamperService_1 = require("../services/dbTamperService"); -const sweepService_1 = require("../services/sweepService"); +const sweepBatchService_1 = require("../services/sweepBatchService"); const countryService_1 = require("../services/countryService"); const userAdminStatsService_1 = require("../services/userAdminStatsService"); const adminUserExportService_1 = require("../services/adminUserExportService"); @@ -64,21 +64,20 @@ function startDbTamperMonitor() { }; setTimeout(run, 15000); } -function startSweepMonitor() { - const intervalMs = (0, sweepService_1.getSweepPollIntervalMs)(); +function startSweepBatchMonitor() { const run = async () => { try { - const n = await (0, sweepService_1.processPendingSweeps)(); + const n = await (0, sweepBatchService_1.createSweepBatchApprovalRequests)(); if (n > 0 && process.env.NODE_ENV !== 'production') { - console.log(`[sweep] Processed ${n} sweep(s)`); + console.log(`[sweep-batch] Enqueued ${n} batch approval request(s)`); } } catch (e) { - console.error('Sweep monitor error:', e); + console.error('Sweep batch job error:', e); } - setTimeout(run, intervalMs); + setTimeout(run, sweepBatchService_1.SWEEP_BATCH_INTERVAL_MS); }; - setTimeout(run, 45000); + setTimeout(run, 60000); } function startReferralCommissionMonitor() { const intervalMs = (0, referralService_1.getReferralCommissionPollIntervalMs)(); @@ -127,7 +126,7 @@ async function bootstrapCore(opts = {}) { startDepositMonitor(); startLedgerIntegrityMonitor(); startDbTamperMonitor(); - startSweepMonitor(); + startSweepBatchMonitor(); startReferralCommissionMonitor(); } if (startEngines) { diff --git a/backend/dist/bootstrap/appBootstrap.js.map b/backend/dist/bootstrap/appBootstrap.js.map index 6a69c782..56a95daf 100644 --- a/backend/dist/bootstrap/appBootstrap.js.map +++ b/backend/dist/bootstrap/appBootstrap.js.map @@ -1 +1 @@ -{"version":3,"file":"appBootstrap.js","sourceRoot":"","sources":["../../src/bootstrap/appBootstrap.ts"],"names":[],"mappings":";AAAA;;GAEG;;AA6GH,sCA6CC;AAxJD,sCAAmC;AACnC,iDAAiD;AACjD,kDAA0D;AAC1D,wDAAmE;AACnE,6EAAwE;AACxE,iEAAmG;AACnG,iEAA8F;AAC9F,2DAAwF;AACxF,+DAAmE;AACnE,6EAA+E;AAC/E,+EAA4E;AAC5E,iEAGqC;AACrC,oFAA+F;AAC/F,yDAAsE;AACtE,qDAAwD;AAExD,MAAM,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAC;AAE3C,KAAK,UAAU,mBAAmB;IAChC,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,IAAA,2CAAmB,GAAE,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;IAC5C,CAAC,CAAC;IACF,UAAU,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,2BAA2B;IAClC,MAAM,UAAU,GAAG,IAAA,6CAA2B,GAAE,CAAC;IACjD,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAuB,GAAE,CAAC;YAC/C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,2CAA2C,MAAM,CAAC,MAAM,WAAW,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,UAAU,CAAC,GAAG,EAAE,KAAM,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,oBAAoB;IAC3B,MAAM,UAAU,GAAG,IAAA,0CAAwB,GAAE,CAAC;IAC9C,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,IAAA,uCAAqB,GAAE,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,kCAAkC,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,UAAU,CAAC,GAAG,EAAE,KAAM,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,iBAAiB;IACxB,MAAM,UAAU,GAAG,IAAA,qCAAsB,GAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,IAAA,mCAAoB,GAAE,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,UAAU,CAAC,GAAG,EAAE,KAAM,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,8BAA8B;IACrC,MAAM,UAAU,GAAG,IAAA,qDAAmC,GAAE,CAAC;IACzD,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,IAAA,mDAAiC,GAAE,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,UAAU,CAAC,GAAG,EAAE,KAAM,CAAC,CAAC;AAC1B,CAAC;AAWD,yDAAyD;AAClD,KAAK,UAAU,aAAa,CAAC,OAAyB,EAAE;IAC7D,MAAM,EACJ,YAAY,GAAG,eAAM,CAAC,aAAa,EACnC,qBAAqB,GAAG,IAAI,EAC5B,gBAAgB,GAAG,eAAM,CAAC,GAAG,KAAK,aAAa,GAChD,GAAG,IAAI,CAAC;IAET,IAAA,2CAA4B,GAAE,CAAC;IAE/B,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,IAAA,0BAAa,GAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM,IAAA,sCAAqB,GAAE,CAAC;IAE9B,IAAI,eAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,IAAA,qBAAY,GAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,uDAAuD,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,IAAA,gCAAoB,GAAE,CAAC;IAEvB,IAAI,qBAAqB,EAAE,CAAC;QAC1B,IAAA,kDAA0B,GAAE,CAAC;QAC7B,IAAA,+CAAsB,GAAE,CAAC;QACzB,IAAA,qEAAwC,GAAE,CAAC;QAC3C,mBAAmB,EAAE,CAAC;QACtB,2BAA2B,EAAE,CAAC;QAC9B,oBAAoB,EAAE,CAAC;QACvB,iBAAiB,EAAE,CAAC;QACpB,8BAA8B,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,IAAA,yCAA0B,GAAE,CAAC;IAC/B,CAAC;AACH,CAAC"} \ No newline at end of file +{"version":3,"file":"appBootstrap.js","sourceRoot":"","sources":["../../src/bootstrap/appBootstrap.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/controllers/adminController.d.ts b/backend/dist/controllers/adminController.d.ts index b2f02651..f3ea14f9 100644 --- a/backend/dist/controllers/adminController.d.ts +++ b/backend/dist/controllers/adminController.d.ts @@ -18,4 +18,5 @@ export declare function batchGrantLedgerCredit(req: AuthRequest, res: Response): export declare function verifyUserEmail(req: AuthRequest, res: Response): Promise; export declare function getUserDetails(req: AuthRequest, res: Response): Promise; export declare function updateUserRole(req: AuthRequest, res: Response): Promise; +export declare function updateUserRoles(req: AuthRequest, res: Response): Promise; //# sourceMappingURL=adminController.d.ts.map \ No newline at end of file diff --git a/backend/dist/controllers/adminController.d.ts.map b/backend/dist/controllers/adminController.d.ts.map index 405c06bf..8b5d1486 100644 --- a/backend/dist/controllers/adminController.d.ts.map +++ b/backend/dist/controllers/adminController.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminController.d.ts","sourceRoot":"","sources":["../../src/controllers/adminController.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AASjD;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCrF;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBxF;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBpF;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBzF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB5F;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B3F;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWpF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAenF"} \ No newline at end of file +{"version":3,"file":"adminController.d.ts","sourceRoot":"","sources":["../../src/controllers/adminController.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AASjD;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCrF;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBxF;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBpF;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBzF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB5F;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B3F;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWpF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAenF;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAcpF"} \ No newline at end of file diff --git a/backend/dist/controllers/adminController.js b/backend/dist/controllers/adminController.js index 4b5ea9cf..2dd6ace8 100644 --- a/backend/dist/controllers/adminController.js +++ b/backend/dist/controllers/adminController.js @@ -48,6 +48,7 @@ exports.batchGrantLedgerCredit = batchGrantLedgerCredit; exports.verifyUserEmail = verifyUserEmail; exports.getUserDetails = getUserDetails; exports.updateUserRole = updateUserRole; +exports.updateUserRoles = updateUserRoles; const adminService = __importStar(require("../services/adminService")); const adminUserExportService = __importStar(require("../services/adminUserExportService")); const adminUserListQuery_1 = require("../utils/adminUserListQuery"); @@ -249,4 +250,20 @@ async function updateUserRole(req, res) { res.status(status).json({ error: msg }); } } +async function updateUserRoles(req, res) { + try { + const userId = req.params.userId; + const { roles } = req.body; + if (!roles?.length) { + res.status(400).json({ error: 'roles array is required' }); + return; + } + const result = await adminService.updateUserRoles(userId, roles, req.user.userId); + res.json(result); + } + catch (e) { + const msg = e instanceof Error ? e.message : 'Failed to update roles'; + res.status(400).json({ error: msg }); + } +} //# sourceMappingURL=adminController.js.map \ No newline at end of file diff --git a/backend/dist/controllers/adminController.js.map b/backend/dist/controllers/adminController.js.map index f51ff89c..f5d9ec67 100644 --- a/backend/dist/controllers/adminController.js.map +++ b/backend/dist/controllers/adminController.js.map @@ -1 +1 @@ -{"version":3,"file":"adminController.js","sourceRoot":"","sources":["../../src/controllers/adminController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"adminController.js","sourceRoot":"","sources":["../../src/controllers/adminController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/controllers/adminCreditController.d.ts.map b/backend/dist/controllers/adminCreditController.d.ts.map index e3742d2d..a348670c 100644 --- a/backend/dist/controllers/adminCreditController.d.ts.map +++ b/backend/dist/controllers/adminCreditController.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminCreditController.d.ts","sourceRoot":"","sources":["../../src/controllers/adminCreditController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF"} \ No newline at end of file +{"version":3,"file":"adminCreditController.d.ts","sourceRoot":"","sources":["../../src/controllers/adminCreditController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYhF"} \ No newline at end of file diff --git a/backend/dist/controllers/adminCreditController.js b/backend/dist/controllers/adminCreditController.js index 918cd8cd..d5261c27 100644 --- a/backend/dist/controllers/adminCreditController.js +++ b/backend/dist/controllers/adminCreditController.js @@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.grantCredit = grantCredit; exports.listCredits = listCredits; -const adminCreditService = __importStar(require("../services/adminCreditService")); +const fundApprovalService = __importStar(require("../services/fundApprovalService")); async function grantCredit(req, res) { try { const userId = req.params.userId; @@ -46,18 +46,19 @@ async function grantCredit(req, res) { }); return; } - const result = await adminCreditService.grantLedgerCredit({ - userId, - walletTypeId, - adjustmentType, - amountRaw, - reason, - approvedBy: req.user.userId, + const result = await fundApprovalService.createFundRequest({ + operationType: 'ledger_credit', + payload: { userId, walletTypeId, adjustmentType, amountRaw, reason }, + requestedBy: req.user.userId, + }); + res.status(202).json({ + requestId: result.id, + status: result.status, + message: 'Credit request submitted — pending super-admin approval', }); - res.status(201).json(result); } catch (e) { - const msg = e instanceof Error ? e.message : 'Credit failed'; + const msg = e instanceof Error ? e.message : 'Credit request failed'; res.status(400).json({ error: msg }); } } @@ -66,7 +67,8 @@ async function listCredits(req, res) { const userId = req.query.userId || undefined; const limit = parseInt(req.query.limit || '50', 10); const offset = parseInt(req.query.offset || '0', 10); - const result = await adminCreditService.listLedgerCredits({ userId, limit, offset }); + const { listLedgerCredits } = await Promise.resolve().then(() => __importStar(require('../services/adminCreditService'))); + const result = await listLedgerCredits({ userId, limit, offset }); res.json(result); } catch (e) { diff --git a/backend/dist/controllers/adminCreditController.js.map b/backend/dist/controllers/adminCreditController.js.map index 368f430f..325eba04 100644 --- a/backend/dist/controllers/adminCreditController.js.map +++ b/backend/dist/controllers/adminCreditController.js.map @@ -1 +1 @@ -{"version":3,"file":"adminCreditController.js","sourceRoot":"","sources":["../../src/controllers/adminCreditController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,kCA+BC;AAED,kCAWC;AA9CD,mFAAqE;AAE9D,KAAK,UAAU,WAAW,CAAC,GAAgB,EAAE,GAAa;IAC/D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;QACjC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAK/D,CAAC;QAEF,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,kEAAkE;aAC1E,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC;YACxD,MAAM;YACN,YAAY;YACZ,cAAc;YACd,SAAS;YACT,MAAM;YACN,UAAU,EAAE,GAAG,CAAC,IAAK,CAAC,MAAM;SAC7B,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAC7D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,GAAgB,EAAE,GAAa;IAC/D,IAAI,CAAC;QACH,MAAM,MAAM,GAAI,GAAG,CAAC,KAAK,CAAC,MAAiB,IAAI,SAAS,CAAC;QACzD,MAAM,KAAK,GAAG,QAAQ,CAAE,GAAG,CAAC,KAAK,CAAC,KAAgB,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,QAAQ,CAAE,GAAG,CAAC,KAAK,CAAC,MAAiB,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACrF,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC;QACtE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"} \ No newline at end of file +{"version":3,"file":"adminCreditController.js","sourceRoot":"","sources":["../../src/controllers/adminCreditController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,kCAgCC;AAED,kCAYC;AAhDD,qFAAuE;AAEhE,KAAK,UAAU,WAAW,CAAC,GAAgB,EAAE,GAAa;IAC/D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;QACjC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAK/D,CAAC;QAEF,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,kEAAkE;aAC1E,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,iBAAiB,CAAC;YACzD,aAAa,EAAE,eAAe;YAC9B,OAAO,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE;YACpE,WAAW,EAAE,GAAG,CAAC,IAAK,CAAC,MAAM;SAC9B,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,MAAM,CAAC,EAAE;YACpB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,yDAAyD;SACnE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC;QACrE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,GAAgB,EAAE,GAAa;IAC/D,IAAI,CAAC;QACH,MAAM,MAAM,GAAI,GAAG,CAAC,KAAK,CAAC,MAAiB,IAAI,SAAS,CAAC;QACzD,MAAM,KAAK,GAAG,QAAQ,CAAE,GAAG,CAAC,KAAK,CAAC,KAAgB,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,QAAQ,CAAE,GAAG,CAAC,KAAK,CAAC,MAAiB,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,gCAAgC,GAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC;QACtE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"} \ No newline at end of file diff --git a/backend/dist/controllers/referralController.d.ts.map b/backend/dist/controllers/referralController.d.ts.map index 42ab991d..bd1456a4 100644 --- a/backend/dist/controllers/referralController.d.ts.map +++ b/backend/dist/controllers/referralController.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"referralController.d.ts","sourceRoot":"","sources":["../../src/controllers/referralController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOjD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY7F;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxF;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5F;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDhG;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BxF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYxF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F;AAED,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9F;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7F;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/F;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/F;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB/F"} \ No newline at end of file +{"version":3,"file":"referralController.d.ts","sourceRoot":"","sources":["../../src/controllers/referralController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOjD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY7F;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxF;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5F;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDhG;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BxF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYxF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BlF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F;AAED,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9F;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7F;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/F;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/F;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB/F"} \ No newline at end of file diff --git a/backend/dist/controllers/referralController.js b/backend/dist/controllers/referralController.js index 01d5cd28..9df89c96 100644 --- a/backend/dist/controllers/referralController.js +++ b/backend/dist/controllers/referralController.js @@ -53,7 +53,6 @@ exports.exportReferralClawbacksCsv = exportReferralClawbacksCsv; const referralService = __importStar(require("../services/referralService")); const bonusService = __importStar(require("../services/bonusService")); const referralRepository = __importStar(require("../repositories/referralRepository")); -const bonusPoolRepository = __importStar(require("../repositories/bonusPoolRepository")); const referralExportService_1 = require("../services/referralExportService"); async function getMyReferralInfo(req, res) { try { @@ -206,9 +205,17 @@ async function fundBonusPool(req, res) { res.status(400).json({ error: 'Amount must be positive' }); return; } - await bonusPoolRepository.fundPool(walletTypeId, amount); - const pools = await bonusPoolRepository.listPools(); - res.json({ message: 'Pool funded', pools }); + const { createFundRequest } = await Promise.resolve().then(() => __importStar(require('../services/fundApprovalService'))); + const result = await createFundRequest({ + operationType: 'bonus_pool_fund', + payload: { walletTypeId, amountRaw }, + requestedBy: req.user.userId, + }); + res.status(202).json({ + requestId: result.id, + status: result.status, + message: 'Bonus pool funding submitted — pending super-admin approval', + }); } catch (e) { res.status(400).json({ error: e instanceof Error ? e.message : 'Failed' }); diff --git a/backend/dist/controllers/referralController.js.map b/backend/dist/controllers/referralController.js.map index ad620758..efeb2f74 100644 --- a/backend/dist/controllers/referralController.js.map +++ b/backend/dist/controllers/referralController.js.map @@ -1 +1 @@ -{"version":3,"file":"referralController.js","sourceRoot":"","sources":["../../src/controllers/referralController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"referralController.js","sourceRoot":"","sources":["../../src/controllers/referralController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/controllers/treasuryController.d.ts b/backend/dist/controllers/treasuryController.d.ts index a48fa747..56938c20 100644 --- a/backend/dist/controllers/treasuryController.d.ts +++ b/backend/dist/controllers/treasuryController.d.ts @@ -4,7 +4,7 @@ export declare function getOverview(_req: AuthRequest, res: Response): Promise; export declare function setColdWallet(req: AuthRequest, res: Response): Promise; export declare function listSweeps(req: AuthRequest, res: Response): Promise; -export declare function runSweeps(_req: AuthRequest, res: Response): Promise; +export declare function runSweeps(req: AuthRequest, res: Response): Promise; export declare function requestFunding(req: AuthRequest, res: Response): Promise; export declare function confirmFunding(req: AuthRequest, res: Response): Promise; export declare function listFunding(req: AuthRequest, res: Response): Promise; diff --git a/backend/dist/controllers/treasuryController.d.ts.map b/backend/dist/controllers/treasuryController.d.ts.map index 52c3a27c..accca471 100644 --- a/backend/dist/controllers/treasuryController.d.ts.map +++ b/backend/dist/controllers/treasuryController.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"treasuryController.d.ts","sourceRoot":"","sources":["../../src/controllers/treasuryController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,wBAAsB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOjF;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBlF;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/E;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF"} \ No newline at end of file +{"version":3,"file":"treasuryController.d.ts","sourceRoot":"","sources":["../../src/controllers/treasuryController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,wBAAsB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOjF;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBlF;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/E;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAe9E;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF"} \ No newline at end of file diff --git a/backend/dist/controllers/treasuryController.js b/backend/dist/controllers/treasuryController.js index ec734111..c962a81c 100644 --- a/backend/dist/controllers/treasuryController.js +++ b/backend/dist/controllers/treasuryController.js @@ -43,7 +43,7 @@ exports.confirmFunding = confirmFunding; exports.listFunding = listFunding; exports.cancelFunding = cancelFunding; const treasuryService = __importStar(require("../services/treasuryService")); -const sweepService = __importStar(require("../services/sweepService")); +const fundApprovalService = __importStar(require("../services/fundApprovalService")); async function getOverview(_req, res) { try { const overview = await treasuryService.getTreasuryOverview(); @@ -87,13 +87,21 @@ async function listSweeps(req, res) { res.status(500).json({ error: e instanceof Error ? e.message : 'Failed to list sweeps' }); } } -async function runSweeps(_req, res) { +async function runSweeps(req, res) { try { - const processed = await sweepService.processPendingSweeps(); - res.json({ processed }); + const result = await fundApprovalService.createFundRequest({ + operationType: 'sweep_manual', + payload: {}, + requestedBy: req.user.userId, + }); + res.status(202).json({ + requestId: result.id, + status: result.status, + message: 'Sweep run submitted — pending super-admin approval', + }); } catch (e) { - res.status(500).json({ error: e instanceof Error ? e.message : 'Sweep run failed' }); + res.status(400).json({ error: e instanceof Error ? e.message : 'Sweep request failed' }); } } async function requestFunding(req, res) { @@ -103,12 +111,20 @@ async function requestFunding(req, res) { res.status(400).json({ error: 'walletTypeId and amount are required' }); return; } - const result = await treasuryService.requestColdToHotFunding(req.user.userId, { - walletTypeId, - amountRaw: BigInt(amount), - notes, + const result = await fundApprovalService.createFundRequest({ + operationType: 'treasury_cold_to_hot', + payload: { + walletTypeId, + amountRaw: BigInt(amount).toString(), + notes, + }, + requestedBy: req.user.userId, + }); + res.status(202).json({ + requestId: result.id, + status: result.status, + message: 'Funding request submitted — pending super-admin approval', }); - res.status(201).json(result); } catch (e) { res.status(400).json({ error: e instanceof Error ? e.message : 'Funding request failed' }); diff --git a/backend/dist/controllers/treasuryController.js.map b/backend/dist/controllers/treasuryController.js.map index eda08e25..7a3fbd76 100644 --- a/backend/dist/controllers/treasuryController.js.map +++ b/backend/dist/controllers/treasuryController.js.map @@ -1 +1 @@ -{"version":3,"file":"treasuryController.js","sourceRoot":"","sources":["../../src/controllers/treasuryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"treasuryController.js","sourceRoot":"","sources":["../../src/controllers/treasuryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/middleware/auth.d.ts b/backend/dist/middleware/auth.d.ts index 8b765895..06d1038d 100644 --- a/backend/dist/middleware/auth.d.ts +++ b/backend/dist/middleware/auth.d.ts @@ -11,18 +11,17 @@ export interface AuthRequest extends Request { } /** * Verifies the Authorization bearer token and attaches the decoded user to the request. - * @param req Express request (extended as AuthRequest on success) - * @param res Express response; sends 401 when the token is missing, invalid, or expired - * @param next Calls next() when authentication succeeds */ export declare function authMiddleware(req: AuthRequest, res: Response, next: NextFunction): Promise; /** - * Returns middleware that restricts access to requests whose user role is in the allowed list. - * Must run after authMiddleware so req.user is populated. - * @param roles One or more role names that are permitted (e.g. 'admin') - * @returns Express middleware that responds 401 without a user or 403 when the role is not allowed + * Restricts access to users whose roles intersect the allowed list. + * `super_admin` satisfies routes that require `admin`. */ export declare function requireRoles(...roles: string[]): (req: AuthRequest, res: Response, next: NextFunction) => void; -/** Admin or moderator — support desk and similar staff tools. */ +/** Requires every listed permission on the JWT payload. */ +export declare function requirePermissions(...perms: string[]): (req: AuthRequest, res: Response, next: NextFunction) => void; +/** Admin or super_admin. */ +export declare function requireAdmin(): (req: AuthRequest, res: Response, next: NextFunction) => void; +/** Admin, moderator, or super_admin — support desk and similar staff tools. */ export declare function requireStaff(): (req: AuthRequest, res: Response, next: NextFunction) => void; //# sourceMappingURL=auth.d.ts.map \ No newline at end of file diff --git a/backend/dist/middleware/auth.d.ts.map b/backend/dist/middleware/auth.d.ts.map index e1da4700..d4de02f7 100644 --- a/backend/dist/middleware/auth.d.ts.map +++ b/backend/dist/middleware/auth.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,0EAA0E;AAC1E,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAevG;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IACrC,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAWnE;AAED,iEAAiE;AACjE,wBAAgB,YAAY,UAdb,WAAW,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CAgBnE"} \ No newline at end of file +{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,0EAA0E;AAC1E,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAaD;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAevG;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IACrC,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAenE;AAED,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IAC3C,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAYnE;AAED,4BAA4B;AAC5B,wBAAgB,YAAY,UAlCb,WAAW,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CAoCnE;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,UAvCb,WAAW,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CAyCnE"} \ No newline at end of file diff --git a/backend/dist/middleware/auth.js b/backend/dist/middleware/auth.js index 3d185b73..952d39f5 100644 --- a/backend/dist/middleware/auth.js +++ b/backend/dist/middleware/auth.js @@ -7,14 +7,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.authMiddleware = authMiddleware; exports.requireRoles = requireRoles; +exports.requirePermissions = requirePermissions; +exports.requireAdmin = requireAdmin; exports.requireStaff = requireStaff; const authService_1 = require("../services/authService"); const onlinePresence_1 = require("../realtime/redis/onlinePresence"); +function userRoles(user) { + if (user.roles?.length) + return user.roles; + if (user.role) + return [user.role]; + return []; +} +function userHasAnyRole(user, roles) { + const assigned = userRoles(user); + return roles.some((r) => assigned.includes(r)); +} /** * Verifies the Authorization bearer token and attaches the decoded user to the request. - * @param req Express request (extended as AuthRequest on success) - * @param res Express response; sends 401 when the token is missing, invalid, or expired - * @param next Calls next() when authentication succeeds */ async function authMiddleware(req, res, next) { const authHeader = req.headers.authorization; @@ -35,10 +45,8 @@ async function authMiddleware(req, res, next) { } } /** - * Returns middleware that restricts access to requests whose user role is in the allowed list. - * Must run after authMiddleware so req.user is populated. - * @param roles One or more role names that are permitted (e.g. 'admin') - * @returns Express middleware that responds 401 without a user or 403 when the role is not allowed + * Restricts access to users whose roles intersect the allowed list. + * `super_admin` satisfies routes that require `admin`. */ function requireRoles(...roles) { return (req, res, next) => { @@ -46,15 +54,38 @@ function requireRoles(...roles) { res.status(401).json({ error: 'Unauthorized' }); return; } - if (!roles.includes(req.user.role)) { - res.status(403).json({ error: 'Forbidden' }); + if (userHasAnyRole(req.user, roles)) { + next(); return; } - next(); + if (roles.includes('admin') && userHasAnyRole(req.user, ['super_admin'])) { + next(); + return; + } + res.status(403).json({ error: 'Forbidden' }); }; } -/** Admin or moderator — support desk and similar staff tools. */ +/** Requires every listed permission on the JWT payload. */ +function requirePermissions(...perms) { + return (req, res, next) => { + if (!req.user) { + res.status(401).json({ error: 'Unauthorized' }); + return; + } + const userPerms = req.user.permissions ?? []; + if (perms.every((p) => userPerms.includes(p))) { + next(); + return; + } + res.status(403).json({ error: 'Forbidden' }); + }; +} +/** Admin or super_admin. */ +function requireAdmin() { + return requireRoles('admin', 'super_admin'); +} +/** Admin, moderator, or super_admin — support desk and similar staff tools. */ function requireStaff() { - return requireRoles('admin', 'moderator'); + return requireRoles('admin', 'moderator', 'super_admin'); } //# sourceMappingURL=auth.js.map \ No newline at end of file diff --git a/backend/dist/middleware/auth.js.map b/backend/dist/middleware/auth.js.map index 0d2bd938..a44134fb 100644 --- a/backend/dist/middleware/auth.js.map +++ b/backend/dist/middleware/auth.js.map @@ -1 +1 @@ -{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAkBH,wCAeC;AAQD,oCAYC;AAGD,oCAEC;AAvDD,yDAAsD;AACtD,qEAAoE;AAQpE;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAAC,GAAgB,EAAE,GAAa,EAAE,IAAkB;IACtF,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;IAC7C,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAW,EAAC,KAAK,CAAC,CAAC;QACzC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,IAAI,OAAO,CAAC,MAAM;YAAE,KAAK,IAAA,iCAAgB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,GAAG,KAAe;IAC7C,OAAO,CAAC,GAAgB,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QACnE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAChD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAED,iEAAiE;AACjE,SAAgB,YAAY;IAC1B,OAAO,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAC5C,CAAC"} \ No newline at end of file +{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/models/user.model.d.ts b/backend/dist/models/user.model.d.ts index cd646054..1f29ee85 100644 --- a/backend/dist/models/user.model.d.ts +++ b/backend/dist/models/user.model.d.ts @@ -3,7 +3,7 @@ * Represents authenticated account rows used by repositories and auth services. */ /** Role name values from the `roles.name` column. */ -export type RoleName = 'user' | 'moderator' | 'admin'; +export type RoleName = 'user' | 'moderator' | 'admin' | 'super_admin'; /** Row shape for the `users` table (excludes PII columns stored only in DTO queries). */ export interface User { id: string; diff --git a/backend/dist/models/user.model.d.ts.map b/backend/dist/models/user.model.d.ts.map index dd37bc09..b51193a0 100644 --- a/backend/dist/models/user.model.d.ts.map +++ b/backend/dist/models/user.model.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../src/models/user.model.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC;AAEtD,yFAAyF;AACzF,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,sBAAsB,EAAE,OAAO,CAAC;IAChC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,0BAA0B,EAAE,OAAO,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,IAAI,GAAG,IAAI,CAAC;IACnC,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB"} \ No newline at end of file +{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../src/models/user.model.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAAC;AAEtE,yFAAyF;AACzF,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,sBAAsB,EAAE,OAAO,CAAC;IAChC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,0BAA0B,EAAE,OAAO,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,IAAI,GAAG,IAAI,CAAC;IACnC,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB"} \ No newline at end of file diff --git a/backend/dist/repositories/depositSweepRepository.d.ts b/backend/dist/repositories/depositSweepRepository.d.ts index f61ca061..f7fe0379 100644 --- a/backend/dist/repositories/depositSweepRepository.d.ts +++ b/backend/dist/repositories/depositSweepRepository.d.ts @@ -8,6 +8,7 @@ export type DepositSweepRow = { blockchain_tx_id: string | null; status: string; deposit_transaction_id: string | null; + batch_id: string | null; error_message_encrypted: string | null; created_at: Date; updated_at: Date; @@ -20,6 +21,7 @@ export declare function createSweep(input: { toColdAddress: string; amount: bigint; depositTransactionId?: string; + batchId?: string; }): Promise; export declare function listSweeps(opts: { status?: string; @@ -29,7 +31,11 @@ export declare function listSweeps(opts: { items: DepositSweepRow[]; total: number; }>; -export declare function listPendingSweeps(limit?: number): Promise; +export declare function listPendingSweeps(limit?: number, opts?: { + unbatchedOnly?: boolean; + batchId?: string; +}): Promise; +export declare function assignSweepToBatch(sweepId: string, batchId: string): Promise; export declare function summarizeInProgressSweeps(): Promise<{ count: number; totalAmountRaw: string; diff --git a/backend/dist/repositories/depositSweepRepository.d.ts.map b/backend/dist/repositories/depositSweepRepository.d.ts.map index 89f93074..2441832c 100644 --- a/backend/dist/repositories/depositSweepRepository.d.ts.map +++ b/backend/dist/repositories/depositSweepRepository.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"depositSweepRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/depositSweepRepository.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,wBAAsB,0BAA0B,CAC9C,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAMjC;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,eAAe,CAAC,CAe3B;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBvD;AAED,wBAAsB,iBAAiB,CAAC,KAAK,SAAK,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAO9E;AAED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAUpG;AAED,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CAgBf"} \ No newline at end of file +{"version":3,"file":"depositSweepRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/depositSweepRepository.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,wBAAsB,0BAA0B,CAC9C,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAMjC;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,eAAe,CAAC,CAgB3B;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBvD;AAED,wBAAsB,iBAAiB,CAAC,KAAK,SAAK,EAAE,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAgBpI;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;AAED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAUpG;AAED,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CAgBf"} \ No newline at end of file diff --git a/backend/dist/repositories/depositSweepRepository.js b/backend/dist/repositories/depositSweepRepository.js index 1f2c8afd..88917c23 100644 --- a/backend/dist/repositories/depositSweepRepository.js +++ b/backend/dist/repositories/depositSweepRepository.js @@ -37,6 +37,7 @@ exports.findByDepositTransactionId = findByDepositTransactionId; exports.createSweep = createSweep; exports.listSweeps = listSweeps; exports.listPendingSweeps = listPendingSweeps; +exports.assignSweepToBatch = assignSweepToBatch; exports.summarizeInProgressSweeps = summarizeInProgressSweeps; exports.updateSweepStatus = updateSweepStatus; const connection_1 = require("../db/connection"); @@ -45,8 +46,8 @@ async function findByDepositTransactionId(depositTransactionId) { return rows[0] ?? null; } async function createSweep(input) { - const rows = await (0, connection_1.query)(`INSERT INTO deposit_sweeps (user_id, wallet_type_id, from_address, to_cold_address, amount, deposit_transaction_id, status) - VALUES ($1, $2, $3, $4, $5, $6, 'pending') + const rows = await (0, connection_1.query)(`INSERT INTO deposit_sweeps (user_id, wallet_type_id, from_address, to_cold_address, amount, deposit_transaction_id, batch_id, status) + VALUES ($1, $2, $3, $4, $5, $6, $7, 'pending') RETURNING *, amount::text`, [ input.userId, input.walletTypeId, @@ -54,6 +55,7 @@ async function createSweep(input) { input.toColdAddress, input.amount.toString(), input.depositTransactionId ?? null, + input.batchId ?? null, ]); return rows[0]; } @@ -68,11 +70,20 @@ async function listSweeps(opts) { : await (0, connection_1.query)(`SELECT *, amount::text FROM deposit_sweeps ORDER BY created_at DESC LIMIT $1 OFFSET $2`, [limit, offset]); return { items, total: Number(countRows[0]?.count ?? 0) }; } -async function listPendingSweeps(limit = 20) { +async function listPendingSweeps(limit = 20, opts) { + if (opts?.batchId) { + return (0, connection_1.query)(`SELECT *, amount::text FROM deposit_sweeps + WHERE batch_id = $1 AND status IN ('pending', 'gas_funding', 'broadcasting') + ORDER BY created_at ASC LIMIT $2`, [opts.batchId, limit]); + } + const batchFilter = opts?.unbatchedOnly ? 'AND batch_id IS NULL' : ''; return (0, connection_1.query)(`SELECT *, amount::text FROM deposit_sweeps - WHERE status IN ('pending', 'gas_funding', 'broadcasting') + WHERE status IN ('pending', 'gas_funding', 'broadcasting') ${batchFilter} ORDER BY created_at ASC LIMIT $1`, [limit]); } +async function assignSweepToBatch(sweepId, batchId) { + await (0, connection_1.query)(`UPDATE deposit_sweeps SET batch_id = $2, updated_at = NOW() WHERE id = $1`, [sweepId, batchId]); +} async function summarizeInProgressSweeps() { const rows = await (0, connection_1.query)(`SELECT COUNT(*)::text AS count, COALESCE(SUM(amount), 0)::text AS total FROM deposit_sweeps diff --git a/backend/dist/repositories/depositSweepRepository.js.map b/backend/dist/repositories/depositSweepRepository.js.map index d74894b7..5eaea6ea 100644 --- a/backend/dist/repositories/depositSweepRepository.js.map +++ b/backend/dist/repositories/depositSweepRepository.js.map @@ -1 +1 @@ -{"version":3,"file":"depositSweepRepository.js","sourceRoot":"","sources":["../../src/repositories/depositSweepRepository.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"depositSweepRepository.js","sourceRoot":"","sources":["../../src/repositories/depositSweepRepository.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/repositories/exchangeFundingRepository.d.ts b/backend/dist/repositories/exchangeFundingRepository.d.ts index ce304786..8c342546 100644 --- a/backend/dist/repositories/exchangeFundingRepository.d.ts +++ b/backend/dist/repositories/exchangeFundingRepository.d.ts @@ -20,6 +20,7 @@ export declare function createFunding(input: { fromAddress?: string; toAddress?: string; notes?: string; + requestedBy?: string; approvedBy?: string; }): Promise; export declare function listFunding(opts: { diff --git a/backend/dist/repositories/exchangeFundingRepository.d.ts.map b/backend/dist/repositories/exchangeFundingRepository.d.ts.map index 60c6d2b2..7d66d5d3 100644 --- a/backend/dist/repositories/exchangeFundingRepository.d.ts.map +++ b/backend/dist/repositories/exchangeFundingRepository.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"exchangeFundingRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/exchangeFundingRepository.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,aAAa,GAAG,aAAa,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgB9B;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB1D;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAMpF;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CASpC;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7D"} \ No newline at end of file +{"version":3,"file":"exchangeFundingRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/exchangeFundingRepository.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,aAAa,GAAG,aAAa,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiB9B;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB1D;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAMpF;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CASpC;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7D"} \ No newline at end of file diff --git a/backend/dist/repositories/exchangeFundingRepository.js b/backend/dist/repositories/exchangeFundingRepository.js index fb72f677..d9d87232 100644 --- a/backend/dist/repositories/exchangeFundingRepository.js +++ b/backend/dist/repositories/exchangeFundingRepository.js @@ -8,8 +8,8 @@ exports.cancelFunding = cancelFunding; const connection_1 = require("../db/connection"); const crypto_1 = require("../utils/crypto"); async function createFunding(input) { - const rows = await (0, connection_1.query)(`INSERT INTO exchange_funding (wallet_type_id, direction, amount, status, from_address, to_address, notes_encrypted, approved_by) - VALUES ($1, $2, $3, 'pending', $4, $5, $6, $7) + const rows = await (0, connection_1.query)(`INSERT INTO exchange_funding (wallet_type_id, direction, amount, status, from_address, to_address, notes_encrypted, approved_by, requested_by) + VALUES ($1, $2, $3, 'pending', $4, $5, $6, $7, $8) RETURNING *, amount::text`, [ input.walletTypeId, input.direction, @@ -18,6 +18,7 @@ async function createFunding(input) { input.toAddress ?? null, input.notes ? (0, crypto_1.encryptSensitive)(input.notes) : null, input.approvedBy ?? null, + input.requestedBy ?? null, ]); return rows[0]; } diff --git a/backend/dist/repositories/exchangeFundingRepository.js.map b/backend/dist/repositories/exchangeFundingRepository.js.map index 529505dd..1107056d 100644 --- a/backend/dist/repositories/exchangeFundingRepository.js.map +++ b/backend/dist/repositories/exchangeFundingRepository.js.map @@ -1 +1 @@ -{"version":3,"file":"exchangeFundingRepository.js","sourceRoot":"","sources":["../../src/repositories/exchangeFundingRepository.ts"],"names":[],"mappings":";;AAmBA,sCAwBC;AAED,kCAuBC;AAED,0CAMC;AAED,wCAaC;AAED,sCAKC;AAlGD,iDAAyC;AACzC,4CAAmD;AAkB5C,KAAK,UAAU,aAAa,CAAC,KAQnC;IACC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;+BAE2B,EAC3B;QACE,KAAK,CAAC,YAAY;QAClB,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvB,KAAK,CAAC,WAAW,IAAI,IAAI;QACzB,KAAK,CAAC,SAAS,IAAI,IAAI;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QAClD,KAAK,CAAC,UAAU,IAAI,IAAI;KACzB,CACF,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,IAIjC;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAK,EAC3B,wDAAwD,KAAK,EAAE,EAC/D,WAAW,CACZ,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM;QACvB,CAAC,CAAC,MAAM,IAAA,kBAAK,EACT,4GAA4G,EAC5G,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAC7B;QACH,CAAC,CAAC,MAAM,IAAA,kBAAK,EACT,0FAA0F,EAC1F,CAAC,KAAK,EAAE,MAAM,CAAC,CAChB,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,EAAU;IAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,4DAA4D,EAC5D,CAAC,EAAE,CAAC,CACL,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,EAAU,EACV,cAAsB,EACtB,UAAkB;IAElB,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;+BAG2B,EAC3B,CAAC,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,CACjC,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,EAAU;IAC5C,MAAM,IAAA,kBAAK,EACT,2GAA2G,EAC3G,CAAC,EAAE,CAAC,CACL,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"exchangeFundingRepository.js","sourceRoot":"","sources":["../../src/repositories/exchangeFundingRepository.ts"],"names":[],"mappings":";;AAmBA,sCA0BC;AAED,kCAuBC;AAED,0CAMC;AAED,wCAaC;AAED,sCAKC;AApGD,iDAAyC;AACzC,4CAAmD;AAkB5C,KAAK,UAAU,aAAa,CAAC,KASnC;IACC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;+BAE2B,EAC3B;QACE,KAAK,CAAC,YAAY;QAClB,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvB,KAAK,CAAC,WAAW,IAAI,IAAI;QACzB,KAAK,CAAC,SAAS,IAAI,IAAI;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QAClD,KAAK,CAAC,UAAU,IAAI,IAAI;QACxB,KAAK,CAAC,WAAW,IAAI,IAAI;KAC1B,CACF,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,IAIjC;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAK,EAC3B,wDAAwD,KAAK,EAAE,EAC/D,WAAW,CACZ,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM;QACvB,CAAC,CAAC,MAAM,IAAA,kBAAK,EACT,4GAA4G,EAC5G,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAC7B;QACH,CAAC,CAAC,MAAM,IAAA,kBAAK,EACT,0FAA0F,EAC1F,CAAC,KAAK,EAAE,MAAM,CAAC,CAChB,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,EAAU;IAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,4DAA4D,EAC5D,CAAC,EAAE,CAAC,CACL,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,EAAU,EACV,cAAsB,EACtB,UAAkB;IAElB,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;+BAG2B,EAC3B,CAAC,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,CACjC,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,EAAU;IAC5C,MAAM,IAAA,kBAAK,EACT,2GAA2G,EAC3G,CAAC,EAAE,CAAC,CACL,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/backend/dist/repositories/userRepository.d.ts b/backend/dist/repositories/userRepository.d.ts index 1b49f086..c7301c2d 100644 --- a/backend/dist/repositories/userRepository.d.ts +++ b/backend/dist/repositories/userRepository.d.ts @@ -65,7 +65,7 @@ export type { AdminSortDir, AdminListPageResult } from './adminListCursor'; export type UserActivityFilter = 'active_in_period' | 'inactive_before_period' | 'online_now' | 'online_app' | 'staff'; export type AdminListFilters = { search?: string; - roleName?: 'user' | 'moderator' | 'admin'; + roleName?: 'user' | 'moderator' | 'admin' | 'super_admin'; emailVerified?: boolean; country?: string; inactiveSinceDays?: number; @@ -187,6 +187,6 @@ export declare function updatePassword(userId: string, passwordHash: string): Pr */ export declare function setEmailVerified(userId: string, verified: boolean): Promise; export declare function countUsersWithRole(roleName: string): Promise; -export declare function getRoleIdByName(roleName: 'user' | 'moderator' | 'admin'): Promise; +export declare function getRoleIdByName(roleName: 'user' | 'moderator' | 'admin' | 'super_admin'): Promise; export declare function updateUserRole(userId: string, roleId: number): Promise; //# sourceMappingURL=userRepository.d.ts.map \ No newline at end of file diff --git a/backend/dist/repositories/userRepository.d.ts.map b/backend/dist/repositories/userRepository.d.ts.map index 1b357f1d..4bd40be0 100644 --- a/backend/dist/repositories/userRepository.d.ts.map +++ b/backend/dist/repositories/userRepository.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"userRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/userRepository.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"userRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/userRepository.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/repositories/userRepository.js b/backend/dist/repositories/userRepository.js index 57388198..dcc0bc1b 100644 --- a/backend/dist/repositories/userRepository.js +++ b/backend/dist/repositories/userRepository.js @@ -56,6 +56,7 @@ const connection_1 = require("../db/connection"); const onlineUsersRepository_1 = require("./onlineUsersRepository"); const crypto_1 = require("../utils/crypto"); const adminListCursor_1 = require("./adminListCursor"); +const roleRepository = __importStar(require("./roleRepository")); /** * Repository for user account persistence and administration. * Handles authentication lookups, profile management, and admin user listing. @@ -121,7 +122,9 @@ async function create(data) { data.referredByUserId ?? null, data.registrationIp ?? null, ]); - return rows[0]; + const user = rows[0]; + await roleRepository.ensureUserHasDefaultRole(user.id, data.roleId ?? 1); + return user; } /** * Updates a user's TOTP (two-factor) configuration. diff --git a/backend/dist/repositories/userRepository.js.map b/backend/dist/repositories/userRepository.js.map index 8f61b6de..58218fae 100644 --- a/backend/dist/repositories/userRepository.js.map +++ b/backend/dist/repositories/userRepository.js.map @@ -1 +1 @@ -{"version":3,"file":"userRepository.js","sourceRoot":"","sources":["../../src/repositories/userRepository.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"userRepository.js","sourceRoot":"","sources":["../../src/repositories/userRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,0CAMC;AAOD,0CAMC;AAOD,4BAMC;AAWD,wBA6CC;AASD,gCAKC;AAOD,kCAGC;AA2ND,8DAwBC;AA8DD,oCA8EC;AAOD,kCAUC;AAaD,gDAkCC;AAKD,kDAwCC;AAOD,8CAMC;AAOD,sDAaC;AAiBD,sCAqEC;AAQD,wCAKC;AAOD,4CAKC;AAED,gDASC;AAED,0CAMC;AAED,wCAEC;AAlyBD,iDAAyC;AACzC,mEAIiC;AAGjC,4CAA6D;AAC7D,uDAM2B;AAC3B,iEAAmD;AAEnD;;;GAGG;AAEH,MAAM,YAAY,GAChB,yTAAyT,CAAC;AAE5T;;;;GAIG;AACI,KAAK,UAAU,eAAe,CAAC,SAAiB;IACrD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,UAAU,YAAY,mCAAmC,EACzD,CAAC,SAAS,CAAC,CACZ,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,eAAe,CAAC,SAAiB;IACrD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,UAAU,YAAY,mCAAmC,EACzD,CAAC,SAAS,CAAC,CACZ,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,QAAQ,CAAC,EAAU;IACvC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,UAAU,YAAY,2BAA2B,EACjD,CAAC,EAAE,CAAC,CACL,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,MAAM,CAAC,IAe5B;IACC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;;;;;iBAOa,YAAY,EAAE,EAC3B;QACE,IAAI,CAAC,SAAS;QACd,IAAI,CAAC,cAAc,IAAI,IAAI;QAC3B,IAAI,CAAC,YAAY;QACjB,IAAI,CAAC,MAAM,IAAI,CAAC;QAChB,IAAI,CAAC,SAAS,IAAI,IAAI;QACtB,IAAI,CAAC,QAAQ,IAAI,IAAI;QACrB,IAAI,CAAC,SAAS,IAAI,IAAI;QACtB,IAAI,CAAC,cAAc,IAAI,IAAI;QAC3B,IAAI,CAAC,kBAAkB,IAAI,IAAI;QAC/B,IAAI,CAAC,WAAW,IAAI,IAAI;QACxB,IAAI,CAAC,MAAM,IAAI,IAAI;QACnB,IAAI,CAAC,YAAY,IAAI,IAAI;QACzB,IAAI,CAAC,gBAAgB,IAAI,IAAI;QAC7B,IAAI,CAAC,cAAc,IAAI,IAAI;KAC5B,CACF,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,cAAc,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IACzE,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,mBAAkC,EAAE,OAAgB;IACnG,MAAM,IAAA,kBAAK,EACT,kGAAkG,EAClG,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAM,CAAC,CACvC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAAC,MAAc;IAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EAAqB,sCAAsC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/F,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,MAAM,CAAC;AACjC,CAAC;AAsDD,MAAM,mBAAmB,GAAG;;;mDAGuB,CAAC;AAEpD,SAAS,mBAAmB,CAAC,OAAyB;IACpD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,IAAI,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,GAAG,IAAI,GAAG,CAAC;QAC7B,UAAU,CAAC,IAAI,CACb,kBAAkB,CAAC,wBAAwB,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,CAAC;6CACrC,CAAC,GAAG,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CACpF,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC;QAC1D,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAC/C,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5B,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC;QACnF,UAAU,CAAC,IAAI,CACb,wEAAwE,CAAC,8BAA8B,CACxG,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC,uCAAuC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC,uCAAuC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC3C,UAAU,CAAC,IAAI,CAAC,+CAA+C,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC3C,UAAU,CAAC,IAAI,CAAC,+CAA+C,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QACvC,UAAU,CAAC,IAAI,CACb;;;;;wCAKkC,CACnC,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;QAChD,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;QACjD,UAAU,CAAC,IAAI,CACb;;;;;;SAMG,CACJ,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,OAAO,CAAC,gBAAgB,KAAK,KAAK,EAAE,CAAC;QAC9C,UAAU,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjE,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,UAAU,CAAC,IAAI,CACb,6DAA6D,CAAC,EAAE,EAAE,CACnE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,UAAU,CAAC,IAAI,CACb,6DAA6D,CAAC,EAAE,EAAE,CACnE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACnD,UAAU,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAC5B,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,KAAK,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC5G,UAAU,CAAC,IAAI,CACb;;;gCAG0B,CAAC,oCAAoC,CAAC,GAAG,CAAC;;;gCAG1C,CAAC,oCAAoC,CAAC,GAAG,CAAC;SACjE,CACJ,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAClE,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;SAAM,IAAI,OAAO,CAAC,cAAc,KAAK,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC7F,UAAU,CAAC,IAAI,CAAC,iDAAiD,CAAC,eAAe,CAAC,CAAC;QACnF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACxC,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;SAAM,IAAI,OAAO,CAAC,cAAc,KAAK,YAAY,EAAE,CAAC;QACnD,0DAA0D;IAC5D,CAAC;SAAM,IAAI,OAAO,CAAC,cAAc,KAAK,YAAY,EAAE,CAAC;QACnD,uDAAuD;IACzD,CAAC;SAAM,IAAI,OAAO,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;QAC9C,UAAU,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AAED,wEAAwE;AACxE,SAAgB,yBAAyB,CAAC,OAAyB;IACjE,OAAO,CAAC,CAAC,CACP,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE;QACtB,OAAO,CAAC,QAAQ;QAChB,OAAO,OAAO,CAAC,aAAa,KAAK,SAAS;QAC1C,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE;QACvB,CAAC,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAChF,OAAO,CAAC,cAAc,KAAK,SAAS;QACpC,OAAO,CAAC,cAAc,KAAK,SAAS;QACpC,OAAO,CAAC,gBAAgB,KAAK,SAAS;QACtC,OAAO,CAAC,gBAAgB,KAAK,SAAS;QACtC,OAAO,CAAC,aAAa;QACrB,OAAO,OAAO,CAAC,gBAAgB,KAAK,SAAS;QAC7C,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,SAAS;QACjB,OAAO,CAAC,MAAM,KAAK,SAAS;QAC5B,OAAO,CAAC,MAAM,KAAK,SAAS;QAC5B,OAAO,OAAO,CAAC,WAAW,KAAK,SAAS;QACxC,OAAO,OAAO,CAAC,iBAAiB,KAAK,SAAS;QAC9C,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;QAClC,CAAC,CAAC,OAAO,CAAC,cAAc;QACxB,CAAC,CAAC,OAAO,CAAC,kBAAkB;QAC5B,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAC3B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kBAAkB;IAC/B,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;;aAIS,CACV,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAmB,EAAE,OAAqB;IAClE,OAAO,IAAA,qCAAmB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;sFAmBwD,CAAC;AAEvF,KAAK,UAAU,uBAAuB,CAAC,OAAyB;IAC9D,IAAI,OAAO,CAAC,cAAc,KAAK,YAAY,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAA,kDAA0B,GAAE,CAAC;QAC/C,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACjD,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gDAAwB,CAAC;SACvD,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,cAAc,KAAK,YAAY,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAA,iDAAyB,GAAE,CAAC;QAC9C,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACjD,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gDAAwB,CAAC;SACvD,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY,CAChC,OAOC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC;IACrF,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;IAChC,MAAM,EAAE,GAAgB,MAAM,IAAI,YAAY,CAAC;IAC/C,MAAM,EAAE,GAAiB,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACtF,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAC;IAE9D,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,uCAAqB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,MAAM,UAAU,GAAc,CAAC,GAAG,YAAY,CAAC,CAAC;IAEhD,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,EAAE,IAAI,aAAa,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;QACjF,MAAM,MAAM,GAAG,IAAA,gCAAc,EAAC,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxF,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAElD,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAK,EAC3B,4BAA4B,mBAAmB,IAAI,QAAQ,EAAE,EAC7D,YAAY,CACb,CAAC;YACF,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;YACjD,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,kBAAkB,EAAE,CAAC;YACnC,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,QAAQ;QAC7B,CAAC,CAAC,GAAG,QAAQ,GAAG,SAAS,EAAE;QAC3B,CAAC,CAAC,SAAS;YACT,CAAC,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE;YACpD,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,cAAsB,CAAC;IAC3B,IAAI,SAAS,EAAE,CAAC;QACd,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,cAAc,GAAG,UAAU,UAAU,CAAC,MAAM,GAAG,CAAC,YAAY,UAAU,CAAC,MAAM,EAAE,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,cAAc,GAAG,UAAU,UAAU,CAAC,MAAM,EAAE,CAAC;IACjD,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,GAAG,qBAAqB;OACrB,mBAAmB;OACnB,cAAc;gBACL,UAAU;OACnB,cAAc,EAAE,EACnB,UAAU,CACX,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACvC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,MAAM,UAAU,GACd,OAAO,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,oCAAkB,EAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3F,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAAC,MAAc;IAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;;qBAIiB,EACjB,CAAC,MAAM,CAAC,CACT,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,KAKC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,KAAK,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,KAAK,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAK,EACT,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAE,EAC7E,MAAM,CACP,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAAc,EACd,KAMC;IAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;IAC7D,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,IAAI,KAAK,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,KAAK,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,KAAK,CAAC,yBAAyB,KAAK,SAAS,EAAE,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAK,EACT,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAE,EAC7E,MAAM,CACP,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,iBAAiB,CAAC,MAAc;IACpD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB,yHAAyH,EACzH,CAAC,MAAM,CAAC,CACT,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,qBAAqB,CAAC,MAAc;IACxD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;;;;;qBAOiB,EACjB,CAAC,MAAM,CAAC,CACT,CAAC;IACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACzB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,IAYC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAK,EACT,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAE,EAC7E,MAAM,CACP,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,YAAoB;IACvE,MAAM,IAAA,kBAAK,EACT,uEAAuE,EACvE,CAAC,YAAY,EAAE,MAAM,CAAC,CACvB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,QAAiB;IACtE,MAAM,IAAA,kBAAK,EACT,wEAAwE,EACxE,CAAC,QAAQ,EAAE,MAAM,CAAC,CACnB,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IACvD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EACtB;;;uBAGmB,EACnB,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,QAAwD;IAExD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAK,EAAmB,sCAAsC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,EAAE,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACpB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,MAAc;IACjE,MAAM,IAAA,kBAAK,EAAC,iEAAiE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACnG,CAAC"} \ No newline at end of file diff --git a/backend/dist/routes/index.d.ts.map b/backend/dist/routes/index.d.ts.map index 24600fe5..3a1341b7 100644 --- a/backend/dist/routes/index.d.ts.map +++ b/backend/dist/routes/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmCH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAqOxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAoCH,QAAA,MAAM,MAAM,4CAAW,CAAC;AA6PxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"} \ No newline at end of file diff --git a/backend/dist/routes/index.js b/backend/dist/routes/index.js index 84bc0dde..74fa257d 100644 --- a/backend/dist/routes/index.js +++ b/backend/dist/routes/index.js @@ -69,6 +69,7 @@ const auth_2 = require("../middleware/auth"); const faqController = __importStar(require("../controllers/faqController")); const faqUpload_1 = require("../middleware/faqUpload"); const setupController = __importStar(require("../controllers/setupController")); +const fundApprovalController = __importStar(require("../controllers/fundApprovalController")); const router = (0, express_1.Router)(); router.use(rateLimit_1.apiLimiter); /** One-time platform setup (before any administrator exists). */ @@ -168,6 +169,13 @@ router.post('/admin/users/batch/ledger-credit', (0, auth_1.requireRoles)('admin' router.get('/admin/users/:userId', (0, auth_1.requireRoles)('admin'), adminController.getUserDetails); router.patch('/admin/users/:userId/flags', (0, auth_1.requireRoles)('admin'), adminController.updateUserFlags); router.patch('/admin/users/:userId/role', (0, auth_1.requireRoles)('admin'), adminController.updateUserRole); +router.patch('/admin/users/:userId/roles', (0, auth_1.requireRoles)('admin'), adminController.updateUserRoles); +router.post('/admin/fund-requests', (0, auth_1.requirePermissions)('fund_operation.request'), fundApprovalController.createFundRequest); +router.get('/admin/fund-requests', (0, auth_1.requireRoles)('admin'), fundApprovalController.listFundRequests); +router.get('/admin/fund-requests/:id', (0, auth_1.requireRoles)('admin'), fundApprovalController.getFundRequest); +router.post('/admin/fund-requests/:id/approve', (0, auth_1.requirePermissions)('fund_operation.approve'), fundApprovalController.approveFundRequest); +router.post('/admin/fund-requests/:id/reject', (0, auth_1.requirePermissions)('fund_operation.approve'), fundApprovalController.rejectFundRequest); +router.delete('/admin/fund-requests/:id', (0, auth_1.requireRoles)('admin'), fundApprovalController.cancelFundRequest); router.post('/admin/users/:userId/verify-email', (0, auth_1.requireRoles)('admin'), adminController.verifyUserEmail); router.patch('/admin/users/:userId/security', (0, auth_1.requireRoles)('admin'), securityController.updateUserSecurity); router.get('/admin/security/alerts', (0, auth_1.requireRoles)('admin'), securityController.listAlerts); diff --git a/backend/dist/routes/index.js.map b/backend/dist/routes/index.js.map index 6381184f..0ee7ae06 100644 --- a/backend/dist/routes/index.js.map +++ b/backend/dist/routes/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/adminCreditService.d.ts b/backend/dist/services/adminCreditService.d.ts index bac94816..b4ba667c 100644 --- a/backend/dist/services/adminCreditService.d.ts +++ b/backend/dist/services/adminCreditService.d.ts @@ -21,6 +21,7 @@ export declare function grantLedgerCredit(input: { amountRaw: string; reason: string; approvedBy: string; + requestedBy?: string; }): Promise; export declare function listLedgerCredits(opts: { userId?: string; diff --git a/backend/dist/services/adminCreditService.d.ts.map b/backend/dist/services/adminCreditService.d.ts.map index fcbc5740..6b852e95 100644 --- a/backend/dist/services/adminCreditService.d.ts.map +++ b/backend/dist/services/adminCreditService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminCreditService.d.ts","sourceRoot":"","sources":["../../src/services/adminCreditService.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH,qBAAa,gBAAiB,SAAQ,KAAK;gBAE7B,OAAO,EAAE,MAAM;CAQ5B;AAID,MAAM,MAAM,uBAAuB,GAAG;IAEpC,YAAY,EAAE,MAAM,CAAC;IAErB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAE9B,mBAAmB,EAAE,MAAM,CAAC;CAE7B,CAAC;AAIF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAE7C,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,cAAc,EAAE,OAAO,GAAG,kBAAkB,CAAC;IAE7C,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;CAEpB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAsSnC;AAID,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAE5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;CAEjB;;;;;;;;;;;;GA8BA"} \ No newline at end of file +{"version":3,"file":"adminCreditService.d.ts","sourceRoot":"","sources":["../../src/services/adminCreditService.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH,qBAAa,gBAAiB,SAAQ,KAAK;gBAE7B,OAAO,EAAE,MAAM;CAQ5B;AAID,MAAM,MAAM,uBAAuB,GAAG;IAEpC,YAAY,EAAE,MAAM,CAAC;IAErB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAE9B,mBAAmB,EAAE,MAAM,CAAC;CAE7B,CAAC;AAIF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAE7C,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,cAAc,EAAE,OAAO,GAAG,kBAAkB,CAAC;IAE7C,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAwSnC;AAID,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAE5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;CAEjB;;;;;;;;;;;;GA8BA"} \ No newline at end of file diff --git a/backend/dist/services/adminCreditService.js b/backend/dist/services/adminCreditService.js index 74920889..c65072b6 100644 --- a/backend/dist/services/adminCreditService.js +++ b/backend/dist/services/adminCreditService.js @@ -103,9 +103,9 @@ async function grantLedgerCredit(input) { if (!account) { throw new AdminCreditError('Ledger account not found'); } - const adjustmentResult = await client.query(`INSERT INTO ledger_adjustments (user_id, wallet_type_id, adjustment_type, amount, reason_encrypted, approved_by) + const adjustmentResult = await client.query(`INSERT INTO ledger_adjustments (user_id, wallet_type_id, adjustment_type, amount, reason_encrypted, approved_by, requested_by) - VALUES ($1, $2, $3, $4, $5, $6) + VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id`, [ input.userId, @@ -114,6 +114,7 @@ async function grantLedgerCredit(input) { amount.toString(), (0, crypto_1.encryptSensitive)(reason), input.approvedBy, + input.requestedBy ?? input.approvedBy, ]); const adjustmentId = adjustmentResult.rows[0]?.id; if (!adjustmentId) diff --git a/backend/dist/services/adminCreditService.js.map b/backend/dist/services/adminCreditService.js.map index d003a579..d5c292e3 100644 --- a/backend/dist/services/adminCreditService.js.map +++ b/backend/dist/services/adminCreditService.js.map @@ -1 +1 @@ -{"version":3,"file":"adminCreditService.js","sourceRoot":"","sources":["../../src/services/adminCreditService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"adminCreditService.js","sourceRoot":"","sources":["../../src/services/adminCreditService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/adminService.d.ts b/backend/dist/services/adminService.d.ts index bc080b5a..7ed9e1c2 100644 --- a/backend/dist/services/adminService.d.ts +++ b/backend/dist/services/adminService.d.ts @@ -108,7 +108,7 @@ export declare function batchGrantLedgerCredit(userIds: string[], input: { adjustmentType: 'bonus' | 'admin_adjustment'; amountRaw: string; reason: string; -}, approvedBy: string): Promise; +}, requestedBy: string): Promise; /** * Marks a user's email as verified (admin support action). */ @@ -125,6 +125,7 @@ export declare function getUserDetails(userId: string): Promise<{ email: string | null; role_id: number; role_name: string; + roles: UserRoleName[]; email_verified: boolean; totp_enabled: boolean; is_enabled: boolean; @@ -143,9 +144,13 @@ export declare function getUserDetails(userId: string): Promise<{ locked: string; }>; }>; -export type UserRoleName = 'user' | 'moderator' | 'admin'; +export type UserRoleName = 'user' | 'moderator' | 'admin' | 'super_admin'; export declare function updateUserRole(targetUserId: string, role: UserRoleName, adminUserId: string): Promise<{ userId: string; role: UserRoleName; }>; +export declare function updateUserRoles(targetUserId: string, roles: UserRoleName[], adminUserId: string): Promise<{ + userId: string; + roles: UserRoleName[]; +}>; //# sourceMappingURL=adminService.d.ts.map \ No newline at end of file diff --git a/backend/dist/services/adminService.d.ts.map b/backend/dist/services/adminService.d.ts.map index c9381f8f..2c0098ac 100644 --- a/backend/dist/services/adminService.d.ts.map +++ b/backend/dist/services/adminService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminService.d.ts","sourceRoot":"","sources":["../../src/services/adminService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"adminService.d.ts","sourceRoot":"","sources":["../../src/services/adminService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/adminService.js b/backend/dist/services/adminService.js index adc52b62..7556e5ea 100644 --- a/backend/dist/services/adminService.js +++ b/backend/dist/services/adminService.js @@ -45,10 +45,12 @@ exports.batchGrantLedgerCredit = batchGrantLedgerCredit; exports.markUserEmailVerified = markUserEmailVerified; exports.getUserDetails = getUserDetails; exports.updateUserRole = updateUserRole; +exports.updateUserRoles = updateUserRoles; const userRepository = __importStar(require("../repositories/userRepository")); const auditLogRepository = __importStar(require("../repositories/auditLogRepository")); +const roleRepository = __importStar(require("../repositories/roleRepository")); +const fundApprovalService = __importStar(require("./fundApprovalService")); const walletService = __importStar(require("./walletService")); -const adminCreditService = __importStar(require("./adminCreditService")); const crypto_1 = require("../utils/crypto"); function parseOptionalBigInt(value) { if (!value?.trim()) @@ -238,25 +240,28 @@ async function batchUpdateUserSecurity(userIds, body) { } return result; } -async function batchGrantLedgerCredit(userIds, input, approvedBy) { +async function batchGrantLedgerCredit(userIds, input, requestedBy) { const unique = [...new Set(userIds.filter(Boolean))]; const result = { succeeded: [], failed: [] }; for (const userId of unique) { try { - await adminCreditService.grantLedgerCredit({ - userId, - walletTypeId: input.walletTypeId, - adjustmentType: input.adjustmentType, - amountRaw: input.amountRaw, - reason: input.reason, - approvedBy, + await fundApprovalService.createFundRequest({ + operationType: 'ledger_credit', + payload: { + userId, + walletTypeId: input.walletTypeId, + adjustmentType: input.adjustmentType, + amountRaw: input.amountRaw, + reason: input.reason, + }, + requestedBy, }); result.succeeded.push(userId); } catch (e) { result.failed.push({ userId, - error: e instanceof Error ? e.message : 'Credit failed', + error: e instanceof Error ? e.message : 'Credit request failed', }); } } @@ -296,6 +301,7 @@ async function getUserDetails(userId) { email: decryptEmail(row.email_encrypted), role_id: row.role_id, role_name: row.role_name, + roles: await roleRepository.getUserRoleNames(userId), email_verified: row.email_verified, totp_enabled: row.totp_enabled, is_enabled: row.is_enabled, @@ -316,34 +322,11 @@ async function getUserDetails(userId) { }; } async function updateUserRole(targetUserId, role, adminUserId) { - if (!['user', 'moderator', 'admin'].includes(role)) { - throw new Error('Invalid role'); - } - const target = await userRepository.findById(targetUserId); - if (!target) - throw new Error('User not found'); - const currentRole = (await userRepository.getRoleName(target.role_id)); - const roleId = await userRepository.getRoleIdByName(role); - if (currentRole === role) { - return { userId: targetUserId, role }; - } - if (currentRole === 'admin' && role !== 'admin') { - const adminCount = await userRepository.countUsersWithRole('admin'); - if (adminCount <= 1) { - throw new Error('Cannot change role: at least one administrator must remain on the platform'); - } - } - if (targetUserId === adminUserId && currentRole === 'admin' && role !== 'admin') { - throw new Error('You cannot remove your own administrator role'); - } - await userRepository.updateUserRole(targetUserId, roleId); - await auditLogRepository.create({ - userId: adminUserId, - action: 'admin_user_role_changed', - resourceType: 'user', - resourceId: targetUserId, - metadata: { from: currentRole, to: role }, - }); - return { userId: targetUserId, role }; + const result = await fundApprovalService.updateUserRoles(targetUserId, [role], adminUserId); + const primary = roleRepository.resolvePrimaryRole(result.roles); + return { userId: targetUserId, role: primary }; +} +async function updateUserRoles(targetUserId, roles, adminUserId) { + return fundApprovalService.updateUserRoles(targetUserId, roles, adminUserId); } //# sourceMappingURL=adminService.js.map \ No newline at end of file diff --git a/backend/dist/services/adminService.js.map b/backend/dist/services/adminService.js.map index 88a45728..aed0ca93 100644 --- a/backend/dist/services/adminService.js.map +++ b/backend/dist/services/adminService.js.map @@ -1 +1 @@ -{"version":3,"file":"adminService.js","sourceRoot":"","sources":["../../src/services/adminService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"adminService.js","sourceRoot":"","sources":["../../src/services/adminService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/adminUserExportService.d.ts b/backend/dist/services/adminUserExportService.d.ts index 061f5c1d..aa417f86 100644 --- a/backend/dist/services/adminUserExportService.d.ts +++ b/backend/dist/services/adminUserExportService.d.ts @@ -5,7 +5,7 @@ import type { AdminSortBy } from '../repositories/userRepository'; export type ExportJobStatus = 'queued' | 'running' | 'completed' | 'failed'; export type AdminUserExportRequest = { search?: string; - roleName?: 'user' | 'moderator' | 'admin'; + roleName?: 'user' | 'moderator' | 'admin' | 'super_admin'; emailVerified?: boolean; country?: string; inactiveSinceDays?: number; diff --git a/backend/dist/services/adminUserExportService.d.ts.map b/backend/dist/services/adminUserExportService.d.ts.map index 5e4129f3..c6e82011 100644 --- a/backend/dist/services/adminUserExportService.d.ts.map +++ b/backend/dist/services/adminUserExportService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminUserExportService.d.ts","sourceRoot":"","sources":["../../src/services/adminUserExportService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAgBH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAWlE,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE5E,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC;IAC1C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAiCF,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,aAAa,CAAC,CA4BxB;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAG/B;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAKxD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAyB7C;AAED,iBAAS,gBAAgB,IAAI,IAAI,CAMhC;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"adminUserExportService.d.ts","sourceRoot":"","sources":["../../src/services/adminUserExportService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAgBH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAWlE,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE5E,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,aAAa,CAAC;IAC1D,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAiCF,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,aAAa,CAAC,CA4BxB;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAG/B;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAKxD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAyB7C;AAED,iBAAS,gBAAgB,IAAI,IAAI,CAMhC;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"} \ No newline at end of file diff --git a/backend/dist/services/authService.d.ts b/backend/dist/services/authService.d.ts index e69c0fd0..a119babf 100644 --- a/backend/dist/services/authService.d.ts +++ b/backend/dist/services/authService.d.ts @@ -5,6 +5,13 @@ import { SystemSettings } from '../models'; import { type UserGender } from '../models/userGender'; import { JwtPayload, RoleName } from '../types'; +/** Builds JWT claims from current DB roles and permissions. */ +export declare function buildJwtPayload(user: { + id: string; + email_hash: string; +}): Promise; +/** Normalizes legacy JWT payloads that only contain a single `role`. */ +export declare function normalizeJwtPayload(decoded: JwtPayload): JwtPayload; /** * Validates a password against the system password policy from settings. * @param password Plain-text password to validate @@ -53,6 +60,9 @@ export declare function login(email: string, password: string, totpCode?: string id: string; emailHash: string; role: RoleName; + roles: RoleName[]; + permissions: string[]; + primaryRole: RoleName; }; }>; /** diff --git a/backend/dist/services/authService.d.ts.map b/backend/dist/services/authService.d.ts.map index c79dea57..9dab6c6a 100644 --- a/backend/dist/services/authService.d.ts.map +++ b/backend/dist/services/authService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAuBhD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAgB/E;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,yBAAyB,EAAE,OAAO,CAAA;CAAE,CAAC,CAoFxF;AAED;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CACzB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7F,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAA;CAAE,CAAC,CAmDpI;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAa7G;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACxD,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAwBD;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAAC,IAAI,CAAC,CAqEf;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAShH;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAS9F;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5E;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjF;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAG1E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAI9E"} \ No newline at end of file +{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/authService.js b/backend/dist/services/authService.js index 4d371610..d015446f 100644 --- a/backend/dist/services/authService.js +++ b/backend/dist/services/authService.js @@ -40,6 +40,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.buildJwtPayload = buildJwtPayload; +exports.normalizeJwtPayload = normalizeJwtPayload; exports.validatePassword = validatePassword; exports.register = register; exports.login = login; @@ -69,8 +71,35 @@ const referralService = __importStar(require("./referralService")); const countryService = __importStar(require("./countryService")); const supportService_1 = require("./supportService"); const userGender_1 = require("../models/userGender"); +const roleRepository = __importStar(require("../repositories/roleRepository")); const uuid_1 = require("uuid"); otplib_1.authenticator.options = { digits: 6, step: 30 }; +/** Builds JWT claims from current DB roles and permissions. */ +async function buildJwtPayload(user) { + const roles = await roleRepository.getUserRoleNames(user.id); + const permissions = await roleRepository.getUserPermissions(user.id); + const primaryRole = roleRepository.resolvePrimaryRole(roles); + return { + userId: user.id, + emailHash: user.email_hash, + roles, + permissions, + primaryRole, + role: primaryRole, + }; +} +/** Normalizes legacy JWT payloads that only contain a single `role`. */ +function normalizeJwtPayload(decoded) { + const roles = decoded.roles?.length ? decoded.roles : decoded.role ? [decoded.role] : ['user']; + const primaryRole = roleRepository.resolvePrimaryRole(roles); + return { + ...decoded, + roles, + permissions: decoded.permissions ?? [], + primaryRole, + role: primaryRole, + }; +} /** * Converts a duration string (e.g. "7d", "15m") to milliseconds. * Falls back to 7 days when the format is unrecognized. @@ -233,8 +262,7 @@ async function login(email, password, totpCode, auditContext) { if (!valid) throw new Error('Invalid 2FA code'); } - const role = (await userRepository.getRoleName(user.role_id)); - const payload = { userId: user.id, emailHash: user.email_hash, role }; + const payload = await buildJwtPayload(user); const accessExpiry = settings.access_token_expiry || config_1.config.jwt.accessExpiry; const accessToken = jsonwebtoken_1.default.sign(payload, config_1.config.jwt.secret, { expiresIn: accessExpiry }); const refreshToken = (0, uuid_1.v4)(); @@ -256,7 +284,14 @@ async function login(email, password, totpCode, auditContext) { accessToken, refreshToken, expiresIn: decoded.exp - Math.floor(Date.now() / 1000), - user: { id: user.id, emailHash: user.email_hash, role }, + user: { + id: user.id, + emailHash: user.email_hash, + role: payload.primaryRole, + roles: payload.roles, + permissions: payload.permissions, + primaryRole: payload.primaryRole, + }, }; } /** @@ -273,10 +308,9 @@ async function refreshTokens(refreshToken) { const user = await userRepository.findById(row.user_id); if (!user) throw new Error('User not found'); - const role = (await userRepository.getRoleName(user.role_id)); const settings = await settingsRepository.getSettings(); const accessExpiry = settings.access_token_expiry || config_1.config.jwt.accessExpiry; - const payload = { userId: user.id, emailHash: user.email_hash, role }; + const payload = await buildJwtPayload(user); const accessToken = jsonwebtoken_1.default.sign(payload, config_1.config.jwt.secret, { expiresIn: accessExpiry }); const decoded = jsonwebtoken_1.default.decode(accessToken); return { accessToken, expiresIn: decoded.exp - Math.floor(Date.now() / 1000) }; @@ -468,7 +502,7 @@ async function verifyTotp(userId, totpCode) { */ async function verifyToken(accessToken) { const decoded = jsonwebtoken_1.default.verify(accessToken, config_1.config.jwt.secret); - return decoded; + return normalizeJwtPayload(decoded); } /** * Returns a guard function that throws if the JWT payload role is not allowed. @@ -478,7 +512,10 @@ async function verifyToken(accessToken) { */ function requireRole(allowed) { return (payload) => { - if (!allowed.includes(payload.role)) + const roles = payload.roles ?? (payload.role ? [payload.role] : []); + const ok = allowed.some((r) => roles.includes(r)) || + (allowed.includes('admin') && roles.includes('super_admin')); + if (!ok) throw new Error('Forbidden'); }; } diff --git a/backend/dist/services/authService.js.map b/backend/dist/services/authService.js.map index 202e352f..59fd5274 100644 --- a/backend/dist/services/authService.js.map +++ b/backend/dist/services/authService.js.map @@ -1 +1 @@ -{"version":3,"file":"authService.js","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"authService.js","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/setupService.d.ts.map b/backend/dist/services/setupService.d.ts.map index 4f35f68a..1a76b0bd 100644 --- a/backend/dist/services/setupService.d.ts.map +++ b/backend/dist/services/setupService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"setupService.d.ts","sourceRoot":"","sources":["../../src/services/setupService.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAoBF,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAM3D;AASD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA+C/C;AAED,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAkC7D"} \ No newline at end of file +{"version":3,"file":"setupService.d.ts","sourceRoot":"","sources":["../../src/services/setupService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAoBF,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAM3D;AASD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAgD/C;AAED,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAmC7D"} \ No newline at end of file diff --git a/backend/dist/services/setupService.js b/backend/dist/services/setupService.js index 16f30cc9..4e740b77 100644 --- a/backend/dist/services/setupService.js +++ b/backend/dist/services/setupService.js @@ -46,6 +46,7 @@ const crypto_1 = __importDefault(require("crypto")); const argon2_1 = __importDefault(require("argon2")); const config_1 = require("../config"); const userRepository = __importStar(require("../repositories/userRepository")); +const roleRepository = __importStar(require("../repositories/roleRepository")); const auditLogRepository = __importStar(require("../repositories/auditLogRepository")); const crypto_2 = require("../utils/crypto"); function assertSetupAllowed() { @@ -106,6 +107,7 @@ async function createFirstAdmin(input) { lastName, }); await userRepository.setEmailVerified(user.id, true); + await roleRepository.setUserRoles(user.id, ['admin', 'super_admin']); await auditLogRepository.create({ userId: user.id, action: 'setup_first_admin_created', @@ -134,6 +136,7 @@ async function promoteExistingUserToAdmin(input) { } const roleId = await userRepository.getRoleIdByName(targetRole); await userRepository.updateUserRole(user.id, roleId); + await roleRepository.setUserRoles(user.id, ['admin', 'super_admin']); await userRepository.setEmailVerified(user.id, true); await auditLogRepository.create({ userId: user.id, diff --git a/backend/dist/services/setupService.js.map b/backend/dist/services/setupService.js.map index ec24faa3..9c816ee7 100644 --- a/backend/dist/services/setupService.js.map +++ b/backend/dist/services/setupService.js.map @@ -1 +1 @@ -{"version":3,"file":"setupService.js","sourceRoot":"","sources":["../../src/services/setupService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setupService.js","sourceRoot":"","sources":["../../src/services/setupService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/sweepService.d.ts b/backend/dist/services/sweepService.d.ts index 405c5827..3a30a703 100644 --- a/backend/dist/services/sweepService.d.ts +++ b/backend/dist/services/sweepService.d.ts @@ -2,6 +2,11 @@ * Sweeps on-chain deposits from user HD addresses to cold storage. */ export declare function enqueueSweepAfterDeposit(userId: string, walletTypeId: number, amount: bigint, depositTransactionId: string): Promise; -export declare function processPendingSweeps(): Promise; +export declare function processPendingSweeps(opts?: { + unbatchedOnly?: boolean; + batchId?: string; + limit?: number; +}): Promise; +export declare function executeApprovedBatch(batchId: string): Promise; export declare function getSweepPollIntervalMs(): number; //# sourceMappingURL=sweepService.d.ts.map \ No newline at end of file diff --git a/backend/dist/services/sweepService.d.ts.map b/backend/dist/services/sweepService.d.ts.map index d41bb7fa..222e22ba 100644 --- a/backend/dist/services/sweepService.d.ts.map +++ b/backend/dist/services/sweepService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"sweepService.d.ts","sourceRoot":"","sources":["../../src/services/sweepService.ts"],"names":[],"mappings":"AAAA;;GAEG;AA4CH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Bf;AA0ED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAqB5D;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C"} \ No newline at end of file +{"version":3,"file":"sweepService.d.ts","sourceRoot":"","sources":["../../src/services/sweepService.ts"],"names":[],"mappings":"AAAA;;GAEG;AA6CH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Bf;AA0ED,wBAAsB,oBAAoB,CAAC,IAAI,CAAC,EAAE;IAChD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBlB;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU3E;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C"} \ No newline at end of file diff --git a/backend/dist/services/sweepService.js b/backend/dist/services/sweepService.js index 04c163b1..07b77f4f 100644 --- a/backend/dist/services/sweepService.js +++ b/backend/dist/services/sweepService.js @@ -38,6 +38,7 @@ var __importStar = (this && this.__importStar) || (function () { Object.defineProperty(exports, "__esModule", { value: true }); exports.enqueueSweepAfterDeposit = enqueueSweepAfterDeposit; exports.processPendingSweeps = processPendingSweeps; +exports.executeApprovedBatch = executeApprovedBatch; exports.getSweepPollIntervalMs = getSweepPollIntervalMs; const bip39 = __importStar(require("bip39")); const config_1 = require("../config"); @@ -45,6 +46,7 @@ const hdWallet_1 = require("./hdWallet"); const walletRepository = __importStar(require("../repositories/walletRepository")); const coldWalletRepository = __importStar(require("../repositories/coldWalletRepository")); const depositSweepRepository = __importStar(require("../repositories/depositSweepRepository")); +const depositSweepBatchRepository = __importStar(require("../repositories/depositSweepBatchRepository")); const hotWalletRepository = __importStar(require("../repositories/hotWalletRepository")); const tronService = __importStar(require("./blockchain/tronService")); const polygonService = __importStar(require("./blockchain/polygonService")); @@ -90,6 +92,7 @@ async function enqueueSweepAfterDeposit(userId, walletTypeId, amount, depositTra return; if (amount < minSweepAmount()) return; + const batch = await depositSweepBatchRepository.getOrCreateOpenBatch(); await depositSweepRepository.createSweep({ userId, walletTypeId, @@ -97,7 +100,9 @@ async function enqueueSweepAfterDeposit(userId, walletTypeId, amount, depositTra toColdAddress: cold.address, amount, depositTransactionId, + batchId: batch.id, }); + await depositSweepBatchRepository.incrementBatchCount(batch.id); } async function ensureTronGasForTokenSweep(depositAddress) { const trxBalance = await tronService.getTrxBalanceSun(depositAddress); @@ -162,10 +167,13 @@ async function executeSweep(sweep) { } await depositSweepRepository.updateSweepStatus(sweep.id, 'completed', { blockchainTxId: txId }); } -async function processPendingSweeps() { +async function processPendingSweeps(opts) { if (!config_1.config.treasury.sweepEnabled) return 0; - const pending = await depositSweepRepository.listPendingSweeps(10); + const pending = await depositSweepRepository.listPendingSweeps(opts?.limit ?? 10, { + unbatchedOnly: opts?.unbatchedOnly, + batchId: opts?.batchId, + }); let processed = 0; for (const sweep of pending) { try { @@ -183,6 +191,18 @@ async function processPendingSweeps() { } return processed; } +async function executeApprovedBatch(batchId) { + await depositSweepBatchRepository.markBatchStatus(batchId, 'executing'); + try { + const processed = await processPendingSweeps({ batchId, limit: 100 }); + await depositSweepBatchRepository.markBatchStatus(batchId, 'completed'); + return processed; + } + catch (e) { + await depositSweepBatchRepository.markBatchStatus(batchId, 'failed'); + throw e; + } +} function getSweepPollIntervalMs() { return config_1.config.treasury.sweepPollIntervalMs; } diff --git a/backend/dist/services/sweepService.js.map b/backend/dist/services/sweepService.js.map index 64413522..1ecb5469 100644 --- a/backend/dist/services/sweepService.js.map +++ b/backend/dist/services/sweepService.js.map @@ -1 +1 @@ -{"version":3,"file":"sweepService.js","sourceRoot":"","sources":["../../src/services/sweepService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"sweepService.js","sourceRoot":"","sources":["../../src/services/sweepService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/services/treasuryService.d.ts b/backend/dist/services/treasuryService.d.ts index 1411acca..b6bf6e96 100644 --- a/backend/dist/services/treasuryService.d.ts +++ b/backend/dist/services/treasuryService.d.ts @@ -76,10 +76,11 @@ export declare function listSweeps(opts: { }[]; total: number; }>; -export declare function requestColdToHotFunding(adminUserId: string, input: { +export declare function requestColdToHotFunding(requestedBy: string, input: { walletTypeId: number; amountRaw: bigint; notes?: string; + approvedBy?: string; }): Promise<{ id: string; status: string; diff --git a/backend/dist/services/treasuryService.d.ts.map b/backend/dist/services/treasuryService.d.ts.map index 5f672b46..dcae3b03 100644 --- a/backend/dist/services/treasuryService.d.ts.map +++ b/backend/dist/services/treasuryService.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"treasuryService.d.ts","sourceRoot":"","sources":["../../src/services/treasuryService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,wBAAsB,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2ExC;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;GAcA;AAED,wBAAsB,eAAe;;;;;;;KAUpC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;GAoB1F;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;IACL,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;GA2BF;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM;;;;GAcvB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;GAkB3F;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,iBAEpD"} \ No newline at end of file +{"version":3,"file":"treasuryService.d.ts","sourceRoot":"","sources":["../../src/services/treasuryService.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,wBAAsB,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2ExC;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;GAcA;AAED,wBAAsB,eAAe;;;;;;;KAUpC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;GAoB1F;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;IACL,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;;;;;;;GA4BF;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM;;;;GAcvB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;GAkB3F;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,iBAEpD"} \ No newline at end of file diff --git a/backend/dist/services/treasuryService.js b/backend/dist/services/treasuryService.js index 39eb88c4..104f47e7 100644 --- a/backend/dist/services/treasuryService.js +++ b/backend/dist/services/treasuryService.js @@ -164,7 +164,7 @@ async function listSweeps(opts) { total: result.total, }; } -async function requestColdToHotFunding(adminUserId, input) { +async function requestColdToHotFunding(requestedBy, input) { const cold = await coldWalletRepository.getActiveColdWallet(input.walletTypeId); const hot = await hotWalletRepository.getActiveHotWallet(input.walletTypeId); if (!cold) @@ -180,7 +180,8 @@ async function requestColdToHotFunding(adminUserId, input) { fromAddress: cold.address, toAddress: hot.address, notes: input.notes, - approvedBy: adminUserId, + requestedBy, + approvedBy: input.approvedBy, }); return { id: row.id, diff --git a/backend/dist/services/treasuryService.js.map b/backend/dist/services/treasuryService.js.map index 872a5ffc..d85420d3 100644 --- a/backend/dist/services/treasuryService.js.map +++ b/backend/dist/services/treasuryService.js.map @@ -1 +1 @@ -{"version":3,"file":"treasuryService.js","sourceRoot":"","sources":["../../src/services/treasuryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"treasuryService.js","sourceRoot":"","sources":["../../src/services/treasuryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/tests/helpers/testAuth.d.ts.map b/backend/dist/tests/helpers/testAuth.d.ts.map index c578cad6..52cf254e 100644 --- a/backend/dist/tests/helpers/testAuth.d.ts.map +++ b/backend/dist/tests/helpers/testAuth.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"testAuth.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,eAAO,MAAM,YAAY,yCAAyC,CAAC;AACnE,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAO,CAAC,UAAU,CAAM,GAAG,MAAM,CAQjF;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAEnE"} \ No newline at end of file +{"version":3,"file":"testAuth.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,eAAO,MAAM,YAAY,yCAAyC,CAAC;AACnE,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAO,CAAC,UAAU,CAAM,GAAG,MAAM,CAWjF;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAEnE"} \ No newline at end of file diff --git a/backend/dist/tests/helpers/testAuth.js b/backend/dist/tests/helpers/testAuth.js index 8c375ee8..0a692c71 100644 --- a/backend/dist/tests/helpers/testAuth.js +++ b/backend/dist/tests/helpers/testAuth.js @@ -16,6 +16,9 @@ function createTestAccessToken(overrides = {}) { userId: exports.TEST_USER_ID, emailHash: exports.TEST_EMAIL_HASH, role: 'user', + roles: ['user'], + permissions: [], + primaryRole: 'user', ...overrides, }; return jsonwebtoken_1.default.sign(payload, config_1.config.jwt.secret, { expiresIn: '1h' }); diff --git a/backend/dist/tests/helpers/testAuth.js.map b/backend/dist/tests/helpers/testAuth.js.map index d6caf024..b59a2cf3 100644 --- a/backend/dist/tests/helpers/testAuth.js.map +++ b/backend/dist/tests/helpers/testAuth.js.map @@ -1 +1 @@ -{"version":3,"file":"testAuth.js","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":";;;;;;AASA,sDAQC;AAED,gCAEC;AArBD,gEAA+B;AAE/B,yCAAsC;AAGzB,QAAA,YAAY,GAAG,sCAAsC,CAAC;AACtD,QAAA,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE9C,gFAAgF;AAChF,SAAgB,qBAAqB,CAAC,YAAiC,EAAE;IACvE,MAAM,OAAO,GAAe;QAC1B,MAAM,EAAE,oBAAY;QACpB,SAAS,EAAE,uBAAe;QAC1B,IAAI,EAAE,MAAM;QACZ,GAAG,SAAS;KACb,CAAC;IACF,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,eAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;AAC9C,CAAC"} \ No newline at end of file +{"version":3,"file":"testAuth.js","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":";;;;;;AASA,sDAWC;AAED,gCAEC;AAxBD,gEAA+B;AAE/B,yCAAsC;AAGzB,QAAA,YAAY,GAAG,sCAAsC,CAAC;AACtD,QAAA,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE9C,gFAAgF;AAChF,SAAgB,qBAAqB,CAAC,YAAiC,EAAE;IACvE,MAAM,OAAO,GAAe;QAC1B,MAAM,EAAE,oBAAY;QACpB,SAAS,EAAE,uBAAe;QAC1B,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,MAAM;QACnB,GAAG,SAAS;KACb,CAAC;IACF,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,eAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;AAC9C,CAAC"} \ No newline at end of file diff --git a/backend/dist/types/index.d.ts b/backend/dist/types/index.d.ts index 1dde060a..2a05a07c 100644 --- a/backend/dist/types/index.d.ts +++ b/backend/dist/types/index.d.ts @@ -8,6 +8,10 @@ export type { RoleName }; export interface JwtPayload { userId: string; emailHash: string; - role: RoleName; + /** @deprecated Use roles[] — kept for backward compatibility during transition */ + role?: RoleName; + roles: RoleName[]; + permissions: string[]; + primaryRole: RoleName; } //# sourceMappingURL=index.d.ts.map \ No newline at end of file diff --git a/backend/dist/types/index.d.ts.map b/backend/dist/types/index.d.ts.map index 4c7092b5..f3722356 100644 --- a/backend/dist/types/index.d.ts.map +++ b/backend/dist/types/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,YAAY,EAAE,QAAQ,EAAE,CAAC;AAEzB,kFAAkF;AAClF,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;CAChB"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,YAAY,EAAE,QAAQ,EAAE,CAAC;AAEzB,kFAAkF;AAClF,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;CACvB"} \ No newline at end of file diff --git a/backend/dist/utils/adminUserListQuery.d.ts.map b/backend/dist/utils/adminUserListQuery.d.ts.map index da29e7d7..8a522dc5 100644 --- a/backend/dist/utils/adminUserListQuery.d.ts.map +++ b/backend/dist/utils/adminUserListQuery.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"adminUserListQuery.d.ts","sourceRoot":"","sources":["../../src/utils/adminUserListQuery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,gCAAgC,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,sBAAsB,EAAE,WAAW,EAgB/C,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAIvF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI3E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAK3E;AAED,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAiCnF,mEAAmE;AACnE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,WAAW,GAAG;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAWA;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,WAAW,EACnB,SAAS,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GACzC,qBAAqB,CAyDvB;AAED,eAAO,MAAM,yBAAyB,qkBA+B5B,CAAC;AAEX,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/E,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,qBAAqB,EAAE,CAY/E"} \ No newline at end of file +{"version":3,"file":"adminUserListQuery.d.ts","sourceRoot":"","sources":["../../src/utils/adminUserListQuery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,gCAAgC,CAAC;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,sBAAsB,EAAE,WAAW,EAgB/C,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAIvF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI3E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAK3E;AAED,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAiCnF,mEAAmE;AACnE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,WAAW,GAAG;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAWA;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,WAAW,EACnB,SAAS,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GACzC,qBAAqB,CA2DvB;AAED,eAAO,MAAM,yBAAyB,qkBA+B5B,CAAC;AAEX,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/E,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,qBAAqB,EAAE,CAY/E"} \ No newline at end of file diff --git a/backend/dist/utils/adminUserListQuery.js b/backend/dist/utils/adminUserListQuery.js index 7943aaa4..c25359e9 100644 --- a/backend/dist/utils/adminUserListQuery.js +++ b/backend/dist/utils/adminUserListQuery.js @@ -105,7 +105,9 @@ function parseAdminUserListOptions(source, overrides) { const maxAge = parseAgeQuery(q(source, 'maxAge') || undefined); return { search: search.trim() || undefined, - roleName: role === 'admin' || role === 'moderator' || role === 'user' ? role : undefined, + roleName: role === 'admin' || role === 'moderator' || role === 'user' || role === 'super_admin' + ? role + : undefined, emailVerified: parseBoolQuery(q(source, 'emailVerified') || undefined), country: q(source, 'country').trim() || undefined, inactiveSinceDays: parseIntQuery(q(source, 'inactiveSinceDays') || undefined), diff --git a/backend/dist/utils/adminUserListQuery.js.map b/backend/dist/utils/adminUserListQuery.js.map index 009abc38..58d9a293 100644 --- a/backend/dist/utils/adminUserListQuery.js.map +++ b/backend/dist/utils/adminUserListQuery.js.map @@ -1 +1 @@ -{"version":3,"file":"adminUserListQuery.js","sourceRoot":"","sources":["../../src/utils/adminUserListQuery.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"adminUserListQuery.js","sourceRoot":"","sources":["../../src/utils/adminUserListQuery.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/src/bootstrap/appBootstrap.ts b/backend/src/bootstrap/appBootstrap.ts index bce5f396..984a0022 100644 --- a/backend/src/bootstrap/appBootstrap.ts +++ b/backend/src/bootstrap/appBootstrap.ts @@ -9,7 +9,10 @@ import { startRegisteredGameEngines } from '../games/engineRunner'; import { processTronDeposits } from '../services/depositMonitorService'; import { runLedgerIntegrityCheck, getIntegrityCheckIntervalMs } from '../services/securityService'; import { processDbTamperEvents, getTamperCheckIntervalMs } from '../services/dbTamperService'; -import { processPendingSweeps, getSweepPollIntervalMs } from '../services/sweepService'; +import { + createSweepBatchApprovalRequests, + SWEEP_BATCH_INTERVAL_MS, +} from '../services/sweepBatchService'; import { ensureCountriesSeeded } from '../services/countryService'; import { scheduleAdminStatsBackfill } from '../services/userAdminStatsService'; import { startAdminExportWorker } from '../services/adminUserExportService'; @@ -67,20 +70,19 @@ function startDbTamperMonitor(): void { setTimeout(run, 15_000); } -function startSweepMonitor(): void { - const intervalMs = getSweepPollIntervalMs(); +function startSweepBatchMonitor(): void { const run = async () => { try { - const n = await processPendingSweeps(); + const n = await createSweepBatchApprovalRequests(); if (n > 0 && process.env.NODE_ENV !== 'production') { - console.log(`[sweep] Processed ${n} sweep(s)`); + console.log(`[sweep-batch] Enqueued ${n} batch approval request(s)`); } } catch (e) { - console.error('Sweep monitor error:', e); + console.error('Sweep batch job error:', e); } - setTimeout(run, intervalMs); + setTimeout(run, SWEEP_BATCH_INTERVAL_MS); }; - setTimeout(run, 45_000); + setTimeout(run, 60_000); } function startReferralCommissionMonitor(): void { @@ -147,7 +149,7 @@ export async function bootstrapCore(opts: BootstrapOptions = {}): Promise startDepositMonitor(); startLedgerIntegrityMonitor(); startDbTamperMonitor(); - startSweepMonitor(); + startSweepBatchMonitor(); startReferralCommissionMonitor(); } diff --git a/backend/src/controllers/adminController.ts b/backend/src/controllers/adminController.ts index 842fdb54..7fd9f5d7 100644 --- a/backend/src/controllers/adminController.ts +++ b/backend/src/controllers/adminController.ts @@ -245,3 +245,19 @@ export async function updateUserRole(req: AuthRequest, res: Response): Promise { + try { + const userId = req.params.userId; + const { roles } = req.body as { roles?: adminService.UserRoleName[] }; + if (!roles?.length) { + res.status(400).json({ error: 'roles array is required' }); + return; + } + const result = await adminService.updateUserRoles(userId, roles, req.user!.userId); + res.json(result); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Failed to update roles'; + res.status(400).json({ error: msg }); + } +} diff --git a/backend/src/controllers/adminCreditController.ts b/backend/src/controllers/adminCreditController.ts index 25aac96f..4311568f 100644 --- a/backend/src/controllers/adminCreditController.ts +++ b/backend/src/controllers/adminCreditController.ts @@ -1,6 +1,6 @@ import { Response } from 'express'; import { AuthRequest } from '../middleware/auth'; -import * as adminCreditService from '../services/adminCreditService'; +import * as fundApprovalService from '../services/fundApprovalService'; export async function grantCredit(req: AuthRequest, res: Response): Promise { try { @@ -19,18 +19,19 @@ export async function grantCredit(req: AuthRequest, res: Response): Promise { + try { + const { operationType, payload } = req.body as { + operationType?: FundOperationType; + payload?: Record; + }; + if (!operationType || !payload) { + res.status(400).json({ error: 'operationType and payload are required' }); + return; + } + const result = await fundApprovalService.createFundRequest({ + operationType, + payload, + requestedBy: req.user!.userId, + }); + res.status(202).json({ requestId: result.id, status: result.status, request: result }); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Failed to create request'; + res.status(400).json({ error: msg }); + } +} + +export async function listFundRequests(req: AuthRequest, res: Response): Promise { + try { + const status = (req.query.status as FundOperationStatus) || undefined; + const operationType = (req.query.operationType as FundOperationType) || undefined; + const limit = parseInt((req.query.limit as string) || '50', 10); + const offset = parseInt((req.query.offset as string) || '0', 10); + const result = await fundApprovalService.listFundRequests({ + status, + operationType, + limit, + offset, + }); + res.json(result); + } catch (e) { + res.status(500).json({ error: e instanceof Error ? e.message : 'Failed to list requests' }); + } +} + +export async function getFundRequest(req: AuthRequest, res: Response): Promise { + try { + const result = await fundApprovalService.getFundRequest(req.params.id); + if (!result) { + res.status(404).json({ error: 'Request not found' }); + return; + } + res.json(result); + } catch (e) { + res.status(500).json({ error: e instanceof Error ? e.message : 'Failed to load request' }); + } +} + +export async function approveFundRequest(req: AuthRequest, res: Response): Promise { + try { + const result = await fundApprovalService.approveFundRequest(req.params.id, req.user!.userId); + res.json(result); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Approval failed'; + res.status(400).json({ error: msg }); + } +} + +export async function rejectFundRequest(req: AuthRequest, res: Response): Promise { + try { + const { reason } = req.body as { reason?: string }; + if (!reason?.trim()) { + res.status(400).json({ error: 'reason is required' }); + return; + } + const result = await fundApprovalService.rejectFundRequest( + req.params.id, + req.user!.userId, + reason + ); + res.json(result); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Rejection failed'; + res.status(400).json({ error: msg }); + } +} + +export async function cancelFundRequest(req: AuthRequest, res: Response): Promise { + try { + const result = await fundApprovalService.cancelFundRequest(req.params.id, req.user!.userId); + res.json(result); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Cancel failed'; + res.status(400).json({ error: msg }); + } +} diff --git a/backend/src/controllers/referralController.ts b/backend/src/controllers/referralController.ts index d343e819..97774ca8 100644 --- a/backend/src/controllers/referralController.ts +++ b/backend/src/controllers/referralController.ts @@ -199,9 +199,17 @@ export async function fundBonusPool(req: AuthRequest, res: Response): Promise { try { @@ -50,12 +50,20 @@ export async function listSweeps(req: AuthRequest, res: Response): Promise } } -export async function runSweeps(_req: AuthRequest, res: Response): Promise { +export async function runSweeps(req: AuthRequest, res: Response): Promise { try { - const processed = await sweepService.processPendingSweeps(); - res.json({ processed }); + const result = await fundApprovalService.createFundRequest({ + operationType: 'sweep_manual', + payload: {}, + requestedBy: req.user!.userId, + }); + res.status(202).json({ + requestId: result.id, + status: result.status, + message: 'Sweep run submitted — pending super-admin approval', + }); } catch (e) { - res.status(500).json({ error: e instanceof Error ? e.message : 'Sweep run failed' }); + res.status(400).json({ error: e instanceof Error ? e.message : 'Sweep request failed' }); } } @@ -70,12 +78,20 @@ export async function requestFunding(req: AuthRequest, res: Response): Promise assigned.includes(r as RoleName)); +} + /** * Verifies the Authorization bearer token and attaches the decoded user to the request. - * @param req Express request (extended as AuthRequest on success) - * @param res Express response; sends 401 when the token is missing, invalid, or expired - * @param next Calls next() when authentication succeeds */ export async function authMiddleware(req: AuthRequest, res: Response, next: NextFunction): Promise { const authHeader = req.headers.authorization; @@ -38,10 +47,8 @@ export async function authMiddleware(req: AuthRequest, res: Response, next: Next } /** - * Returns middleware that restricts access to requests whose user role is in the allowed list. - * Must run after authMiddleware so req.user is populated. - * @param roles One or more role names that are permitted (e.g. 'admin') - * @returns Express middleware that responds 401 without a user or 403 when the role is not allowed + * Restricts access to users whose roles intersect the allowed list. + * `super_admin` satisfies routes that require `admin`. */ export function requireRoles(...roles: string[]) { return (req: AuthRequest, res: Response, next: NextFunction): void => { @@ -49,15 +56,40 @@ export function requireRoles(...roles: string[]) { res.status(401).json({ error: 'Unauthorized' }); return; } - if (!roles.includes(req.user.role)) { - res.status(403).json({ error: 'Forbidden' }); + if (userHasAnyRole(req.user, roles)) { + next(); return; } - next(); + if (roles.includes('admin') && userHasAnyRole(req.user, ['super_admin'])) { + next(); + return; + } + res.status(403).json({ error: 'Forbidden' }); }; } -/** Admin or moderator — support desk and similar staff tools. */ -export function requireStaff() { - return requireRoles('admin', 'moderator'); +/** Requires every listed permission on the JWT payload. */ +export function requirePermissions(...perms: string[]) { + return (req: AuthRequest, res: Response, next: NextFunction): void => { + if (!req.user) { + res.status(401).json({ error: 'Unauthorized' }); + return; + } + const userPerms = req.user.permissions ?? []; + if (perms.every((p) => userPerms.includes(p))) { + next(); + return; + } + res.status(403).json({ error: 'Forbidden' }); + }; +} + +/** Admin or super_admin. */ +export function requireAdmin() { + return requireRoles('admin', 'super_admin'); +} + +/** Admin, moderator, or super_admin — support desk and similar staff tools. */ +export function requireStaff() { + return requireRoles('admin', 'moderator', 'super_admin'); } diff --git a/backend/src/models/user.model.ts b/backend/src/models/user.model.ts index 21906a26..bd26faf9 100644 --- a/backend/src/models/user.model.ts +++ b/backend/src/models/user.model.ts @@ -4,7 +4,7 @@ */ /** Role name values from the `roles.name` column. */ -export type RoleName = 'user' | 'moderator' | 'admin'; +export type RoleName = 'user' | 'moderator' | 'admin' | 'super_admin'; /** Row shape for the `users` table (excludes PII columns stored only in DTO queries). */ export interface User { diff --git a/backend/src/repositories/depositSweepBatchRepository.ts b/backend/src/repositories/depositSweepBatchRepository.ts new file mode 100644 index 00000000..e6813b30 --- /dev/null +++ b/backend/src/repositories/depositSweepBatchRepository.ts @@ -0,0 +1,111 @@ +/** + * Batched deposit sweeps awaiting super-admin approval. + */ + +import { query } from '../db/connection'; + +export type SweepBatchStatus = + | 'pending_batch' + | 'pending_approval' + | 'approved' + | 'executing' + | 'completed' + | 'failed' + | 'cancelled'; + +export type DepositSweepBatchRow = { + id: string; + status: SweepBatchStatus; + sweep_count: number; + fund_request_id: string | null; + created_at: Date; + updated_at: Date; +}; + +export async function createBatch(): Promise { + const rows = await query( + `INSERT INTO deposit_sweep_batches (status, sweep_count) VALUES ('pending_batch', 0) RETURNING *` + ); + return rows[0]; +} + +export async function getOrCreateOpenBatch(): Promise { + const rows = await query( + `SELECT * FROM deposit_sweep_batches + WHERE status = 'pending_batch' + ORDER BY created_at ASC + LIMIT 1` + ); + if (rows[0]) return rows[0]; + return createBatch(); +} + +export async function incrementBatchCount(batchId: string): Promise { + await query( + `UPDATE deposit_sweep_batches + SET sweep_count = sweep_count + 1, updated_at = NOW() + WHERE id = $1`, + [batchId] + ); +} + +export async function linkFundRequest(batchId: string, fundRequestId: string): Promise { + await query( + `UPDATE deposit_sweep_batches + SET status = 'pending_approval', fund_request_id = $2, updated_at = NOW() + WHERE id = $1`, + [batchId, fundRequestId] + ); +} + +export async function markBatchStatus(batchId: string, status: SweepBatchStatus): Promise { + await query( + `UPDATE deposit_sweep_batches SET status = $2, updated_at = NOW() WHERE id = $1`, + [batchId, status] + ); +} + +export async function findById(id: string): Promise { + const rows = await query(`SELECT * FROM deposit_sweep_batches WHERE id = $1`, [ + id, + ]); + return rows[0] ?? null; +} + +export async function listSweepIdsInBatch(batchId: string): Promise { + const rows = await query<{ id: string }[]>( + `SELECT id FROM deposit_sweeps WHERE batch_id = $1 AND status = 'pending'`, + [batchId] + ); + return rows.map((r) => r.id); +} + +export async function countPendingUnbatchedSweeps(): Promise { + const rows = await query<{ count: string }[]>( + `SELECT COUNT(*)::text AS count FROM deposit_sweeps WHERE batch_id IS NULL AND status = 'pending'` + ); + return parseInt(rows[0]?.count ?? '0', 10); +} + +export async function queryOpenBatchesReadyForApproval(): Promise { + return query( + `SELECT * FROM deposit_sweep_batches + WHERE status = 'pending_batch' AND sweep_count > 0 AND fund_request_id IS NULL + ORDER BY created_at ASC` + ); +} + +export async function closeBatchForNewSweeps(batchId: string): Promise { + await query( + `UPDATE deposit_sweep_batches SET status = 'pending_approval', updated_at = NOW() WHERE id = $1`, + [batchId] + ); + const rows = await query(`SELECT * FROM deposit_sweep_batches WHERE id = $1`, [ + batchId, + ]); + return rows[0]; +} + +export async function createFreshBatch(): Promise { + return createBatch(); +} diff --git a/backend/src/repositories/depositSweepRepository.ts b/backend/src/repositories/depositSweepRepository.ts index 19e0cb36..9fefa99b 100644 --- a/backend/src/repositories/depositSweepRepository.ts +++ b/backend/src/repositories/depositSweepRepository.ts @@ -10,6 +10,7 @@ export type DepositSweepRow = { blockchain_tx_id: string | null; status: string; deposit_transaction_id: string | null; + batch_id: string | null; error_message_encrypted: string | null; created_at: Date; updated_at: Date; @@ -32,10 +33,11 @@ export async function createSweep(input: { toColdAddress: string; amount: bigint; depositTransactionId?: string; + batchId?: string; }): Promise { const rows = await query( - `INSERT INTO deposit_sweeps (user_id, wallet_type_id, from_address, to_cold_address, amount, deposit_transaction_id, status) - VALUES ($1, $2, $3, $4, $5, $6, 'pending') + `INSERT INTO deposit_sweeps (user_id, wallet_type_id, from_address, to_cold_address, amount, deposit_transaction_id, batch_id, status) + VALUES ($1, $2, $3, $4, $5, $6, $7, 'pending') RETURNING *, amount::text`, [ input.userId, @@ -44,6 +46,7 @@ export async function createSweep(input: { input.toColdAddress, input.amount.toString(), input.depositTransactionId ?? null, + input.batchId ?? null, ] ); return rows[0]; @@ -74,15 +77,31 @@ export async function listSweeps(opts: { return { items, total: Number(countRows[0]?.count ?? 0) }; } -export async function listPendingSweeps(limit = 20): Promise { +export async function listPendingSweeps(limit = 20, opts?: { unbatchedOnly?: boolean; batchId?: string }): Promise { + if (opts?.batchId) { + return query( + `SELECT *, amount::text FROM deposit_sweeps + WHERE batch_id = $1 AND status IN ('pending', 'gas_funding', 'broadcasting') + ORDER BY created_at ASC LIMIT $2`, + [opts.batchId, limit] + ); + } + const batchFilter = opts?.unbatchedOnly ? 'AND batch_id IS NULL' : ''; return query( `SELECT *, amount::text FROM deposit_sweeps - WHERE status IN ('pending', 'gas_funding', 'broadcasting') + WHERE status IN ('pending', 'gas_funding', 'broadcasting') ${batchFilter} ORDER BY created_at ASC LIMIT $1`, [limit] ); } +export async function assignSweepToBatch(sweepId: string, batchId: string): Promise { + await query( + `UPDATE deposit_sweeps SET batch_id = $2, updated_at = NOW() WHERE id = $1`, + [sweepId, batchId] + ); +} + export async function summarizeInProgressSweeps(): Promise<{ count: number; totalAmountRaw: string }> { const rows = await query<{ count: string; total: string }[]>( `SELECT COUNT(*)::text AS count, COALESCE(SUM(amount), 0)::text AS total diff --git a/backend/src/repositories/exchangeFundingRepository.ts b/backend/src/repositories/exchangeFundingRepository.ts index ee61d102..00387745 100644 --- a/backend/src/repositories/exchangeFundingRepository.ts +++ b/backend/src/repositories/exchangeFundingRepository.ts @@ -24,11 +24,12 @@ export async function createFunding(input: { fromAddress?: string; toAddress?: string; notes?: string; + requestedBy?: string; approvedBy?: string; }): Promise { const rows = await query( - `INSERT INTO exchange_funding (wallet_type_id, direction, amount, status, from_address, to_address, notes_encrypted, approved_by) - VALUES ($1, $2, $3, 'pending', $4, $5, $6, $7) + `INSERT INTO exchange_funding (wallet_type_id, direction, amount, status, from_address, to_address, notes_encrypted, approved_by, requested_by) + VALUES ($1, $2, $3, 'pending', $4, $5, $6, $7, $8) RETURNING *, amount::text`, [ input.walletTypeId, @@ -38,6 +39,7 @@ export async function createFunding(input: { input.toAddress ?? null, input.notes ? encryptSensitive(input.notes) : null, input.approvedBy ?? null, + input.requestedBy ?? null, ] ); return rows[0]; diff --git a/backend/src/repositories/fundOperationRequestRepository.ts b/backend/src/repositories/fundOperationRequestRepository.ts new file mode 100644 index 00000000..2db11364 --- /dev/null +++ b/backend/src/repositories/fundOperationRequestRepository.ts @@ -0,0 +1,148 @@ +/** + * Fund operation approval requests — unified queue for sensitive platform fund ops. + */ + +import { query } from '../db/connection'; + +export type FundOperationType = + | 'ledger_credit' + | 'treasury_cold_to_hot' + | 'bonus_pool_fund' + | 'sweep_manual' + | 'sweep_batch'; + +export type FundOperationStatus = + | 'pending_approval' + | 'approved' + | 'rejected' + | 'executed' + | 'failed' + | 'cancelled'; + +export type FundOperationRequestRow = { + id: string; + operation_type: FundOperationType; + status: FundOperationStatus; + payload: Record; + requested_by: string; + approved_by: string | null; + rejection_reason: string | null; + execution_result: Record | null; + created_at: Date; + approved_at: Date | null; + executed_at: Date | null; +}; + +export async function createRequest(input: { + operationType: FundOperationType; + payload: Record; + requestedBy: string; +}): Promise { + const rows = await query( + `INSERT INTO fund_operation_requests (operation_type, payload, requested_by) + VALUES ($1, $2::jsonb, $3) + RETURNING *`, + [input.operationType, JSON.stringify(input.payload), input.requestedBy] + ); + return rows[0]; +} + +export async function findById(id: string): Promise { + const rows = await query( + `SELECT * FROM fund_operation_requests WHERE id = $1`, + [id] + ); + return rows[0] ?? null; +} + +export async function listRequests(filters: { + status?: FundOperationStatus; + operationType?: FundOperationType; + limit?: number; + offset?: number; +}): Promise<{ items: FundOperationRequestRow[]; total: number }> { + const where: string[] = []; + const values: unknown[] = []; + let i = 1; + if (filters.status) { + where.push(`status = $${i++}`); + values.push(filters.status); + } + if (filters.operationType) { + where.push(`operation_type = $${i++}`); + values.push(filters.operationType); + } + const whereSql = where.length ? `WHERE ${where.join(' AND ')}` : ''; + const limit = Math.min(filters.limit ?? 50, 200); + const offset = filters.offset ?? 0; + + const countRows = await query<{ count: string }[]>( + `SELECT COUNT(*)::text AS count FROM fund_operation_requests ${whereSql}`, + values + ); + const items = await query( + `SELECT * FROM fund_operation_requests ${whereSql} + ORDER BY created_at DESC + LIMIT $${i++} OFFSET $${i}`, + [...values, limit, offset] + ); + return { items, total: parseInt(countRows[0]?.count ?? '0', 10) }; +} + +export async function markApproved(id: string, approvedBy: string): Promise { + const rows = await query( + `UPDATE fund_operation_requests + SET status = 'approved', approved_by = $2, approved_at = NOW() + WHERE id = $1 AND status = 'pending_approval' + RETURNING *`, + [id, approvedBy] + ); + return rows[0] ?? null; +} + +export async function markRejected( + id: string, + approvedBy: string, + reason: string +): Promise { + const rows = await query( + `UPDATE fund_operation_requests + SET status = 'rejected', approved_by = $2, rejection_reason = $3, approved_at = NOW() + WHERE id = $1 AND status = 'pending_approval' + RETURNING *`, + [id, approvedBy, reason] + ); + return rows[0] ?? null; +} + +export async function markExecuted( + id: string, + executionResult: Record +): Promise { + await query( + `UPDATE fund_operation_requests + SET status = 'executed', executed_at = NOW(), execution_result = $2::jsonb + WHERE id = $1`, + [id, JSON.stringify(executionResult)] + ); +} + +export async function markFailed(id: string, errorMessage: string): Promise { + await query( + `UPDATE fund_operation_requests + SET status = 'failed', executed_at = NOW(), execution_result = $2::jsonb + WHERE id = $1`, + [id, JSON.stringify({ error: errorMessage })] + ); +} + +export async function markCancelled(id: string): Promise { + const rows = await query( + `UPDATE fund_operation_requests + SET status = 'cancelled' + WHERE id = $1 AND status = 'pending_approval' + RETURNING *`, + [id] + ); + return rows[0] ?? null; +} diff --git a/backend/src/repositories/roleRepository.ts b/backend/src/repositories/roleRepository.ts new file mode 100644 index 00000000..64017744 --- /dev/null +++ b/backend/src/repositories/roleRepository.ts @@ -0,0 +1,126 @@ +/** + * Roles, permissions, and user_roles (many-to-many). + */ + +import { query } from '../db/connection'; +import type { RoleName } from '../models'; + +const ALL_ROLE_NAMES: RoleName[] = ['user', 'moderator', 'admin', 'super_admin']; + +export function isValidRoleName(name: string): name is RoleName { + return (ALL_ROLE_NAMES as string[]).includes(name); +} + +export async function getUserRoleNames(userId: string): Promise { + const rows = await query<{ name: string }[]>( + `SELECT r.name + FROM user_roles ur + JOIN roles r ON r.id = ur.role_id + WHERE ur.user_id = $1 + ORDER BY r.id`, + [userId] + ); + if (rows.length > 0) { + return rows.map((r) => r.name as RoleName); + } + const legacy = await query<{ name: string }[]>( + `SELECT r.name FROM users u JOIN roles r ON r.id = u.role_id WHERE u.id = $1`, + [userId] + ); + return legacy[0] ? [legacy[0].name as RoleName] : ['user']; +} + +export async function getUserPermissions(userId: string): Promise { + const rows = await query<{ key: string }[]>( + `SELECT DISTINCT p.key + FROM user_roles ur + JOIN role_permissions rp ON rp.role_id = ur.role_id + JOIN permissions p ON p.id = rp.permission_id + WHERE ur.user_id = $1 + ORDER BY p.key`, + [userId] + ); + if (rows.length > 0) return rows.map((r) => r.key); + const legacy = await query<{ key: string }[]>( + `SELECT DISTINCT p.key + FROM users u + JOIN role_permissions rp ON rp.role_id = u.role_id + JOIN permissions p ON p.id = rp.permission_id + WHERE u.id = $1 + ORDER BY p.key`, + [userId] + ); + return legacy.map((r) => r.key); +} + +export async function userHasPermission(userId: string, permissionKey: string): Promise { + const perms = await getUserPermissions(userId); + return perms.includes(permissionKey); +} + +export async function userHasRole(userId: string, roleName: RoleName): Promise { + const roles = await getUserRoleNames(userId); + return roles.includes(roleName); +} + +export async function countUsersWithRoleName(roleName: RoleName): Promise { + const rows = await query<{ count: string }[]>( + `SELECT COUNT(DISTINCT ur.user_id)::text AS count + FROM user_roles ur + JOIN roles r ON r.id = ur.role_id + WHERE r.name = $1`, + [roleName] + ); + return parseInt(rows[0]?.count ?? '0', 10); +} + +export async function setUserRoles(userId: string, roleNames: RoleName[]): Promise { + const unique = [...new Set(roleNames)].filter(isValidRoleName); + if (!unique.length) throw new Error('At least one role is required'); + + const roleRows = await query<{ id: number; name: string }[]>( + `SELECT id, name FROM roles WHERE name = ANY($1::text[])`, + [unique] + ); + if (roleRows.length !== unique.length) { + throw new Error('Unknown role in assignment'); + } + + const primary = + roleRows.find((r) => r.name === 'super_admin') ?? + roleRows.find((r) => r.name === 'admin') ?? + roleRows.find((r) => r.name === 'moderator') ?? + roleRows[0]; + + await query('DELETE FROM user_roles WHERE user_id = $1', [userId]); + for (const row of roleRows) { + await query('INSERT INTO user_roles (user_id, role_id) VALUES ($1, $2) ON CONFLICT DO NOTHING', [ + userId, + row.id, + ]); + } + await query('UPDATE users SET role_id = $1, updated_at = NOW() WHERE id = $2', [primary.id, userId]); +} + +export async function addUserRole(userId: string, roleName: RoleName): Promise { + const rows = await query<{ id: number }[]>('SELECT id FROM roles WHERE name = $1', [roleName]); + if (!rows[0]) throw new Error(`Unknown role: ${roleName}`); + await query('INSERT INTO user_roles (user_id, role_id) VALUES ($1, $2) ON CONFLICT DO NOTHING', [ + userId, + rows[0].id, + ]); +} + +export async function ensureUserHasDefaultRole(userId: string, roleId: number): Promise { + await query('INSERT INTO user_roles (user_id, role_id) VALUES ($1, $2) ON CONFLICT DO NOTHING', [ + userId, + roleId, + ]); +} + +export function resolvePrimaryRole(roles: RoleName[]): RoleName { + if (roles.includes('super_admin')) return 'super_admin'; + if (roles.includes('admin')) return 'admin'; + if (roles.includes('moderator')) return 'moderator'; + return roles[0] ?? 'user'; +} diff --git a/backend/src/repositories/userRepository.ts b/backend/src/repositories/userRepository.ts index ae7f849e..0035d5b6 100644 --- a/backend/src/repositories/userRepository.ts +++ b/backend/src/repositories/userRepository.ts @@ -15,6 +15,7 @@ import { decodeAdminListCursor, type AdminListPageResult, } from './adminListCursor'; +import * as roleRepository from './roleRepository'; /** * Repository for user account persistence and administration. @@ -114,7 +115,9 @@ export async function create(data: { data.registrationIp ?? null, ] ); - return rows[0]; + const user = rows[0]; + await roleRepository.ensureUserHasDefaultRole(user.id, data.roleId ?? 1); + return user; } /** @@ -171,7 +174,7 @@ export type UserActivityFilter = export type AdminListFilters = { search?: string; - roleName?: 'user' | 'moderator' | 'admin'; + roleName?: 'user' | 'moderator' | 'admin' | 'super_admin'; emailVerified?: boolean; country?: string; inactiveSinceDays?: number; @@ -789,7 +792,7 @@ export async function countUsersWithRole(roleName: string): Promise { } export async function getRoleIdByName( - roleName: 'user' | 'moderator' | 'admin' + roleName: 'user' | 'moderator' | 'admin' | 'super_admin' ): Promise { const rows = await query<{ id: number }[]>('SELECT id FROM roles WHERE name = $1', [roleName]); if (!rows[0]) throw new Error(`Unknown role: ${roleName}`); diff --git a/backend/src/routes/index.ts b/backend/src/routes/index.ts index 3c25be75..c53395b3 100644 --- a/backend/src/routes/index.ts +++ b/backend/src/routes/index.ts @@ -4,7 +4,7 @@ */ import { Router } from 'express'; -import { authMiddleware, requireRoles } from '../middleware/auth'; +import { authMiddleware, requireRoles, requirePermissions } from '../middleware/auth'; import { apiLimiter, loginLimiter, verificationEmailLimiter, passwordResetLimiter } from '../middleware/rateLimit'; import * as authController from '../controllers/authController'; import * as walletController from '../controllers/walletController'; @@ -35,6 +35,7 @@ import { requireStaff } from '../middleware/auth'; import * as faqController from '../controllers/faqController'; import { faqUpload } from '../middleware/faqUpload'; import * as setupController from '../controllers/setupController'; +import * as fundApprovalController from '../controllers/fundApprovalController'; const router = Router(); @@ -167,6 +168,30 @@ router.post('/admin/users/batch/ledger-credit', requireRoles('admin'), adminCont router.get('/admin/users/:userId', requireRoles('admin'), adminController.getUserDetails); router.patch('/admin/users/:userId/flags', requireRoles('admin'), adminController.updateUserFlags); router.patch('/admin/users/:userId/role', requireRoles('admin'), adminController.updateUserRole); +router.patch('/admin/users/:userId/roles', requireRoles('admin'), adminController.updateUserRoles); + +router.post( + '/admin/fund-requests', + requirePermissions('fund_operation.request'), + fundApprovalController.createFundRequest +); +router.get('/admin/fund-requests', requireRoles('admin'), fundApprovalController.listFundRequests); +router.get('/admin/fund-requests/:id', requireRoles('admin'), fundApprovalController.getFundRequest); +router.post( + '/admin/fund-requests/:id/approve', + requirePermissions('fund_operation.approve'), + fundApprovalController.approveFundRequest +); +router.post( + '/admin/fund-requests/:id/reject', + requirePermissions('fund_operation.approve'), + fundApprovalController.rejectFundRequest +); +router.delete( + '/admin/fund-requests/:id', + requireRoles('admin'), + fundApprovalController.cancelFundRequest +); router.post( '/admin/users/:userId/verify-email', requireRoles('admin'), diff --git a/backend/src/scripts/grantSuperAdminToAdmins.ts b/backend/src/scripts/grantSuperAdminToAdmins.ts new file mode 100644 index 00000000..e8f33472 --- /dev/null +++ b/backend/src/scripts/grantSuperAdminToAdmins.ts @@ -0,0 +1,32 @@ +/** + * One-shot migration: grant super_admin to all users who currently have admin role. + * Run: npx ts-node src/scripts/grantSuperAdminToAdmins.ts + */ + +import { query } from '../db/connection'; + +async function main(): Promise { + const adminRole = await query<{ id: number }[]>(`SELECT id FROM roles WHERE name = 'admin'`); + const superRole = await query<{ id: number }[]>(`SELECT id FROM roles WHERE name = 'super_admin'`); + if (!adminRole[0] || !superRole[0]) { + throw new Error('admin or super_admin role missing — run migrations first'); + } + + const result = await query<{ user_id: string }[]>( + `INSERT INTO user_roles (user_id, role_id) + SELECT ur.user_id, $2 + FROM user_roles ur + WHERE ur.role_id = $1 + ON CONFLICT DO NOTHING + RETURNING user_id`, + [adminRole[0].id, superRole[0].id] + ); + + console.log(`Granted super_admin to ${result.length} administrator(s).`); + process.exit(0); +} + +main().catch((e) => { + console.error(e); + process.exit(1); +}); diff --git a/backend/src/services/adminCreditService.ts b/backend/src/services/adminCreditService.ts index 50547b8a..d7439ea8 100644 --- a/backend/src/services/adminCreditService.ts +++ b/backend/src/services/adminCreditService.ts @@ -67,7 +67,7 @@ export async function grantLedgerCredit(input: { reason: string; approvedBy: string; - + requestedBy?: string; }): Promise { if (!AUTHORIZED_LEDGER_TYPES.has(input.adjustmentType)) { @@ -182,9 +182,9 @@ export async function grantLedgerCredit(input: { const adjustmentResult = await client.query<{ id: string }>( - `INSERT INTO ledger_adjustments (user_id, wallet_type_id, adjustment_type, amount, reason_encrypted, approved_by) + `INSERT INTO ledger_adjustments (user_id, wallet_type_id, adjustment_type, amount, reason_encrypted, approved_by, requested_by) - VALUES ($1, $2, $3, $4, $5, $6) + VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id`, @@ -202,6 +202,8 @@ export async function grantLedgerCredit(input: { input.approvedBy, + input.requestedBy ?? input.approvedBy, + ] ); diff --git a/backend/src/services/adminService.ts b/backend/src/services/adminService.ts index 17d33336..11f710f7 100644 --- a/backend/src/services/adminService.ts +++ b/backend/src/services/adminService.ts @@ -5,6 +5,8 @@ import * as userRepository from '../repositories/userRepository'; import * as auditLogRepository from '../repositories/auditLogRepository'; +import * as roleRepository from '../repositories/roleRepository'; +import * as fundApprovalService from './fundApprovalService'; import * as walletService from './walletService'; import * as adminCreditService from './adminCreditService'; import { decrypt } from '../utils/crypto'; @@ -318,26 +320,29 @@ export async function batchGrantLedgerCredit( amountRaw: string; reason: string; }, - approvedBy: string + requestedBy: string ): Promise { const unique = [...new Set(userIds.filter(Boolean))]; const result: BatchOperationResult = { succeeded: [], failed: [] }; for (const userId of unique) { try { - await adminCreditService.grantLedgerCredit({ - userId, - walletTypeId: input.walletTypeId, - adjustmentType: input.adjustmentType, - amountRaw: input.amountRaw, - reason: input.reason, - approvedBy, + await fundApprovalService.createFundRequest({ + operationType: 'ledger_credit', + payload: { + userId, + walletTypeId: input.walletTypeId, + adjustmentType: input.adjustmentType, + amountRaw: input.amountRaw, + reason: input.reason, + }, + requestedBy, }); result.succeeded.push(userId); } catch (e) { result.failed.push({ userId, - error: e instanceof Error ? e.message : 'Credit failed', + error: e instanceof Error ? e.message : 'Credit request failed', }); } } @@ -376,6 +381,7 @@ export async function getUserDetails(userId: string): Promise<{ email: string | null; role_id: number; role_name: string; + roles: UserRoleName[]; email_verified: boolean; totp_enabled: boolean; is_enabled: boolean; @@ -405,6 +411,7 @@ export async function getUserDetails(userId: string): Promise<{ email: decryptEmail(row.email_encrypted), role_id: row.role_id, role_name: row.role_name, + roles: await roleRepository.getUserRoleNames(userId), email_verified: row.email_verified, totp_enabled: row.totp_enabled, is_enabled: row.is_enabled, @@ -425,47 +432,22 @@ export async function getUserDetails(userId: string): Promise<{ }; } -export type UserRoleName = 'user' | 'moderator' | 'admin'; +export type UserRoleName = 'user' | 'moderator' | 'admin' | 'super_admin'; export async function updateUserRole( targetUserId: string, role: UserRoleName, adminUserId: string ): Promise<{ userId: string; role: UserRoleName }> { - if (!['user', 'moderator', 'admin'].includes(role)) { - throw new Error('Invalid role'); - } - - const target = await userRepository.findById(targetUserId); - if (!target) throw new Error('User not found'); - - const currentRole = (await userRepository.getRoleName(target.role_id)) as UserRoleName; - const roleId = await userRepository.getRoleIdByName(role); - - if (currentRole === role) { - return { userId: targetUserId, role }; - } - - if (currentRole === 'admin' && role !== 'admin') { - const adminCount = await userRepository.countUsersWithRole('admin'); - if (adminCount <= 1) { - throw new Error('Cannot change role: at least one administrator must remain on the platform'); - } - } - - if (targetUserId === adminUserId && currentRole === 'admin' && role !== 'admin') { - throw new Error('You cannot remove your own administrator role'); - } - - await userRepository.updateUserRole(targetUserId, roleId); - - await auditLogRepository.create({ - userId: adminUserId, - action: 'admin_user_role_changed', - resourceType: 'user', - resourceId: targetUserId, - metadata: { from: currentRole, to: role }, - }); - - return { userId: targetUserId, role }; + const result = await fundApprovalService.updateUserRoles(targetUserId, [role], adminUserId); + const primary = roleRepository.resolvePrimaryRole(result.roles); + return { userId: targetUserId, role: primary }; +} + +export async function updateUserRoles( + targetUserId: string, + roles: UserRoleName[], + adminUserId: string +): Promise<{ userId: string; roles: UserRoleName[] }> { + return fundApprovalService.updateUserRoles(targetUserId, roles, adminUserId); } diff --git a/backend/src/services/adminUserExportService.ts b/backend/src/services/adminUserExportService.ts index 69dc6c67..10d11bd5 100644 --- a/backend/src/services/adminUserExportService.ts +++ b/backend/src/services/adminUserExportService.ts @@ -31,7 +31,7 @@ export type ExportJobStatus = 'queued' | 'running' | 'completed' | 'failed'; export type AdminUserExportRequest = { search?: string; - roleName?: 'user' | 'moderator' | 'admin'; + roleName?: 'user' | 'moderator' | 'admin' | 'super_admin'; emailVerified?: boolean; country?: string; inactiveSinceDays?: number; diff --git a/backend/src/services/authService.ts b/backend/src/services/authService.ts index 927bab44..240feaec 100644 --- a/backend/src/services/authService.ts +++ b/backend/src/services/authService.ts @@ -22,10 +22,40 @@ import { mergeVisitorSupportForUser } from './supportService'; import { SystemSettings } from '../models'; import { parseUserGender, type UserGender } from '../models/userGender'; import { JwtPayload, RoleName } from '../types'; +import * as roleRepository from '../repositories/roleRepository'; import { v4 as uuidv4 } from 'uuid'; authenticator.options = { digits: 6, step: 30 }; +/** Builds JWT claims from current DB roles and permissions. */ +export async function buildJwtPayload(user: { id: string; email_hash: string }): Promise { + const roles = await roleRepository.getUserRoleNames(user.id); + const permissions = await roleRepository.getUserPermissions(user.id); + const primaryRole = roleRepository.resolvePrimaryRole(roles); + return { + userId: user.id, + emailHash: user.email_hash, + roles, + permissions, + primaryRole, + role: primaryRole, + }; +} + +/** Normalizes legacy JWT payloads that only contain a single `role`. */ +export function normalizeJwtPayload(decoded: JwtPayload): JwtPayload { + const roles = + decoded.roles?.length ? decoded.roles : decoded.role ? [decoded.role] : (['user'] as RoleName[]); + const primaryRole = roleRepository.resolvePrimaryRole(roles); + return { + ...decoded, + roles, + permissions: decoded.permissions ?? [], + primaryRole, + role: primaryRole, + }; +} + /** * Converts a duration string (e.g. "7d", "15m") to milliseconds. * Falls back to 7 days when the format is unrecognized. @@ -183,7 +213,19 @@ export async function login( password: string, totpCode?: string, auditContext?: { ipAddress?: string; userAgent?: string; visitorSupportToken?: string | null } -): Promise<{ accessToken: string; refreshToken: string; expiresIn: number; user: { id: string; emailHash: string; role: RoleName } }> { +): Promise<{ + accessToken: string; + refreshToken: string; + expiresIn: number; + user: { + id: string; + emailHash: string; + role: RoleName; + roles: RoleName[]; + permissions: string[]; + primaryRole: RoleName; + }; +}> { const emailHash = hashForIndex(email); const user = await userRepository.findByEmailHash(emailHash); if (!user) throw new Error('Invalid credentials'); @@ -209,8 +251,7 @@ export async function login( const valid = authenticator.verify({ token: totpCode, secret }); if (!valid) throw new Error('Invalid 2FA code'); } - const role = (await userRepository.getRoleName(user.role_id)) as RoleName; - const payload: JwtPayload = { userId: user.id, emailHash: user.email_hash, role }; + const payload = await buildJwtPayload(user); const accessExpiry = settings.access_token_expiry || config.jwt.accessExpiry; const accessToken = jwt.sign(payload, config.jwt.secret, { expiresIn: accessExpiry } as jwt.SignOptions); const refreshToken = uuidv4(); @@ -232,7 +273,14 @@ export async function login( accessToken, refreshToken, expiresIn: decoded.exp - Math.floor(Date.now() / 1000), - user: { id: user.id, emailHash: user.email_hash, role }, + user: { + id: user.id, + emailHash: user.email_hash, + role: payload.primaryRole, + roles: payload.roles, + permissions: payload.permissions, + primaryRole: payload.primaryRole, + }, }; } @@ -248,10 +296,9 @@ export async function refreshTokens(refreshToken: string): Promise<{ accessToken if (!row) throw new Error('Invalid refresh token'); const user = await userRepository.findById(row.user_id); if (!user) throw new Error('User not found'); - const role = (await userRepository.getRoleName(user.role_id)) as RoleName; const settings = await settingsRepository.getSettings(); const accessExpiry = settings.access_token_expiry || config.jwt.accessExpiry; - const payload: JwtPayload = { userId: user.id, emailHash: user.email_hash, role }; + const payload = await buildJwtPayload(user); const accessToken = jwt.sign(payload, config.jwt.secret, { expiresIn: accessExpiry } as jwt.SignOptions); const decoded = jwt.decode(accessToken) as { exp: number }; return { accessToken, expiresIn: decoded.exp - Math.floor(Date.now() / 1000) }; @@ -468,7 +515,7 @@ export async function verifyTotp(userId: string, totpCode?: string): Promise { const decoded = jwt.verify(accessToken, config.jwt.secret) as JwtPayload; - return decoded; + return normalizeJwtPayload(decoded); } /** @@ -479,6 +526,10 @@ export async function verifyToken(accessToken: string): Promise { */ export function requireRole(allowed: RoleName[]): (payload: JwtPayload) => void { return (payload: JwtPayload) => { - if (!allowed.includes(payload.role)) throw new Error('Forbidden'); + const roles = payload.roles ?? (payload.role ? [payload.role] : []); + const ok = + allowed.some((r) => roles.includes(r)) || + (allowed.includes('admin') && roles.includes('super_admin')); + if (!ok) throw new Error('Forbidden'); }; } diff --git a/backend/src/services/fundApprovalService.ts b/backend/src/services/fundApprovalService.ts new file mode 100644 index 00000000..9633847d --- /dev/null +++ b/backend/src/services/fundApprovalService.ts @@ -0,0 +1,304 @@ +/** + * Super-admin approval workflow for sensitive platform fund operations. + */ + +import * as fundOperationRequestRepository from '../repositories/fundOperationRequestRepository'; +import type { + FundOperationRequestRow, + FundOperationStatus, + FundOperationType, +} from '../repositories/fundOperationRequestRepository'; +import * as roleRepository from '../repositories/roleRepository'; +import * as auditLogRepository from '../repositories/auditLogRepository'; +import * as adminCreditService from './adminCreditService'; +import * as treasuryService from './treasuryService'; +import * as bonusPoolRepository from '../repositories/bonusPoolRepository'; +import * as sweepService from './sweepService'; +import * as depositSweepBatchRepository from '../repositories/depositSweepBatchRepository'; +import type { RoleName } from '../models'; + +export class FundApprovalError extends Error { + constructor(message: string) { + super(message); + this.name = 'FundApprovalError'; + } +} + +export type FundRequestDto = { + id: string; + operationType: FundOperationType; + status: FundOperationStatus; + payload: Record; + requestedBy: string; + approvedBy: string | null; + rejectionReason: string | null; + executionResult: Record | null; + createdAt: string; + approvedAt: string | null; + executedAt: string | null; +}; + +function toDto(row: FundOperationRequestRow): FundRequestDto { + return { + id: row.id, + operationType: row.operation_type, + status: row.status, + payload: row.payload, + requestedBy: row.requested_by, + approvedBy: row.approved_by, + rejectionReason: row.rejection_reason, + executionResult: row.execution_result, + createdAt: row.created_at.toISOString(), + approvedAt: row.approved_at?.toISOString() ?? null, + executedAt: row.executed_at?.toISOString() ?? null, + }; +} + +export async function createFundRequest(input: { + operationType: FundOperationType; + payload: Record; + requestedBy: string; +}): Promise { + const canRequest = await roleRepository.userHasPermission( + input.requestedBy, + 'fund_operation.request' + ); + if (!canRequest) throw new FundApprovalError('Permission denied: fund_operation.request'); + + const row = await fundOperationRequestRepository.createRequest({ + operationType: input.operationType, + payload: input.payload, + requestedBy: input.requestedBy, + }); + + await auditLogRepository.create({ + userId: input.requestedBy, + action: 'fund_operation_requested', + resourceType: 'fund_operation_request', + resourceId: row.id, + metadata: { operation_type: input.operationType }, + }); + + return toDto(row); +} + +async function executeApprovedRequest( + request: FundOperationRequestRow, + approverId: string +): Promise> { + const approvedBy = approverId; + + switch (request.operation_type) { + case 'ledger_credit': { + const { userId, walletTypeId, adjustmentType, amountRaw, reason } = request.payload as { + userId: string; + walletTypeId: number; + adjustmentType: 'bonus' | 'admin_adjustment'; + amountRaw: string; + reason: string; + }; + const result = await adminCreditService.grantLedgerCredit({ + userId, + walletTypeId, + adjustmentType, + amountRaw, + reason, + approvedBy, + requestedBy: request.requested_by, + }); + return result; + } + case 'treasury_cold_to_hot': { + const { walletTypeId, amountRaw, notes } = request.payload as { + walletTypeId: number; + amountRaw: string; + notes?: string; + }; + const result = await treasuryService.requestColdToHotFunding(request.requested_by, { + walletTypeId, + amountRaw: BigInt(amountRaw), + notes, + approvedBy, + }); + return result; + } + case 'bonus_pool_fund': { + const { walletTypeId, amountRaw } = request.payload as { + walletTypeId: number; + amountRaw: string; + }; + const amount = BigInt(amountRaw); + await bonusPoolRepository.fundPool(walletTypeId, amount); + const pools = await bonusPoolRepository.listPools(); + return { message: 'Pool funded', pools }; + } + case 'sweep_manual': { + const processed = await sweepService.processPendingSweeps({ unbatchedOnly: true }); + return { processed }; + } + case 'sweep_batch': { + const { batchId } = request.payload as { batchId: string }; + const processed = await sweepService.executeApprovedBatch(batchId); + return { batchId, processed }; + } + default: + throw new FundApprovalError(`Unknown operation type: ${request.operation_type}`); + } +} + +export async function approveFundRequest( + requestId: string, + approverId: string +): Promise { + const canApprove = await roleRepository.userHasPermission(approverId, 'fund_operation.approve'); + if (!canApprove) throw new FundApprovalError('Permission denied: fund_operation.approve'); + + const existing = await fundOperationRequestRepository.findById(requestId); + if (!existing) throw new FundApprovalError('Request not found'); + if (existing.status !== 'pending_approval') { + throw new FundApprovalError(`Request is not pending (status: ${existing.status})`); + } + + const approved = await fundOperationRequestRepository.markApproved(requestId, approverId); + if (!approved) throw new FundApprovalError('Failed to approve request'); + + try { + const executionResult = await executeApprovedRequest(approved, approverId); + await fundOperationRequestRepository.markExecuted(requestId, executionResult); + await auditLogRepository.create({ + userId: approverId, + action: 'fund_operation_approved', + resourceType: 'fund_operation_request', + resourceId: requestId, + metadata: { operation_type: approved.operation_type, execution_result: executionResult }, + }); + const final = await fundOperationRequestRepository.findById(requestId); + return toDto(final!); + } catch (e) { + const msg = e instanceof Error ? e.message : 'Execution failed'; + await fundOperationRequestRepository.markFailed(requestId, msg); + await auditLogRepository.create({ + userId: approverId, + action: 'fund_operation_failed', + resourceType: 'fund_operation_request', + resourceId: requestId, + metadata: { error: msg }, + }); + throw new FundApprovalError(msg); + } +} + +export async function rejectFundRequest( + requestId: string, + approverId: string, + reason: string +): Promise { + const canApprove = await roleRepository.userHasPermission(approverId, 'fund_operation.approve'); + if (!canApprove) throw new FundApprovalError('Permission denied: fund_operation.approve'); + + const trimmed = reason?.trim(); + if (!trimmed) throw new FundApprovalError('Rejection reason is required'); + + const rejected = await fundOperationRequestRepository.markRejected(requestId, approverId, trimmed); + if (!rejected) throw new FundApprovalError('Request not found or not pending'); + + await auditLogRepository.create({ + userId: approverId, + action: 'fund_operation_rejected', + resourceType: 'fund_operation_request', + resourceId: requestId, + metadata: { reason: trimmed }, + }); + + return toDto(rejected); +} + +export async function cancelFundRequest( + requestId: string, + actorId: string +): Promise { + const existing = await fundOperationRequestRepository.findById(requestId); + if (!existing) throw new FundApprovalError('Request not found'); + if (existing.status !== 'pending_approval') { + throw new FundApprovalError('Only pending requests can be cancelled'); + } + + const isRequester = existing.requested_by === actorId; + const isSuperAdmin = await roleRepository.userHasRole(actorId, 'super_admin'); + if (!isRequester && !isSuperAdmin) { + throw new FundApprovalError('Only the requester or a super admin can cancel'); + } + + const cancelled = await fundOperationRequestRepository.markCancelled(requestId); + if (!cancelled) throw new FundApprovalError('Failed to cancel request'); + return toDto(cancelled); +} + +export async function getFundRequest(requestId: string): Promise { + const row = await fundOperationRequestRepository.findById(requestId); + return row ? toDto(row) : null; +} + +export async function listFundRequests(filters: { + status?: FundOperationStatus; + operationType?: FundOperationType; + limit?: number; + offset?: number; +}): Promise<{ items: FundRequestDto[]; total: number }> { + const result = await fundOperationRequestRepository.listRequests(filters); + return { items: result.items.map(toDto), total: result.total }; +} + +export type UserRoleName = RoleName; + +export async function updateUserRoles( + targetUserId: string, + roleNames: RoleName[], + adminUserId: string +): Promise<{ userId: string; roles: RoleName[] }> { + const canManage = await roleRepository.userHasPermission(adminUserId, 'user.manage_roles'); + if (!canManage) throw new FundApprovalError('Permission denied: user.manage_roles'); + + const unique = [...new Set(roleNames)].filter((r) => + ['user', 'moderator', 'admin', 'super_admin'].includes(r) + ) as RoleName[]; + if (!unique.length) throw new FundApprovalError('At least one role is required'); + + const currentRoles = await roleRepository.getUserRoleNames(targetUserId); + const removingSuperAdmin = + currentRoles.includes('super_admin') && !unique.includes('super_admin'); + if (removingSuperAdmin) { + const count = await roleRepository.countUsersWithRoleName('super_admin'); + if (count <= 1) { + throw new FundApprovalError('At least one super administrator must remain on the platform'); + } + } + + const removingAdmin = currentRoles.includes('admin') && !unique.includes('admin'); + if (removingAdmin) { + const adminCount = await roleRepository.countUsersWithRoleName('admin'); + if (adminCount <= 1) { + throw new FundApprovalError('At least one administrator must remain on the platform'); + } + } + + if ( + targetUserId === adminUserId && + currentRoles.includes('admin') && + !unique.includes('admin') + ) { + throw new FundApprovalError('You cannot remove your own administrator role'); + } + + await roleRepository.setUserRoles(targetUserId, unique); + + await auditLogRepository.create({ + userId: adminUserId, + action: 'admin_user_roles_changed', + resourceType: 'user', + resourceId: targetUserId, + metadata: { from: currentRoles, to: unique }, + }); + + return { userId: targetUserId, roles: unique }; +} diff --git a/backend/src/services/setupService.ts b/backend/src/services/setupService.ts index ed502987..7781f2f2 100644 --- a/backend/src/services/setupService.ts +++ b/backend/src/services/setupService.ts @@ -6,6 +6,7 @@ import crypto from 'crypto'; import argon2 from 'argon2'; import { config } from '../config'; import * as userRepository from '../repositories/userRepository'; +import * as roleRepository from '../repositories/roleRepository'; import * as auditLogRepository from '../repositories/auditLogRepository'; import { hashForIndex, encrypt } from '../utils/crypto'; @@ -86,6 +87,7 @@ export async function createFirstAdmin(input: { }); await userRepository.setEmailVerified(user.id, true); + await roleRepository.setUserRoles(user.id, ['admin', 'super_admin']); await auditLogRepository.create({ userId: user.id, @@ -124,6 +126,7 @@ export async function promoteExistingUserToAdmin(input: { const roleId = await userRepository.getRoleIdByName(targetRole); await userRepository.updateUserRole(user.id, roleId); + await roleRepository.setUserRoles(user.id, ['admin', 'super_admin']); await userRepository.setEmailVerified(user.id, true); await auditLogRepository.create({ diff --git a/backend/src/services/sweepBatchService.ts b/backend/src/services/sweepBatchService.ts new file mode 100644 index 00000000..29faae78 --- /dev/null +++ b/backend/src/services/sweepBatchService.ts @@ -0,0 +1,51 @@ +/** + * Periodic batching of auto-enqueued deposit sweeps for super-admin approval. + */ + +import { query } from '../db/connection'; +import * as depositSweepBatchRepository from '../repositories/depositSweepBatchRepository'; +import * as fundApprovalService from './fundApprovalService'; + +export const SWEEP_BATCH_INTERVAL_MS = 15 * 60 * 1000; + +async function getAutomatedRequesterId(): Promise { + const superRows = await query<{ user_id: string }[]>( + `SELECT ur.user_id + FROM user_roles ur + JOIN roles r ON r.id = ur.role_id + WHERE r.name = 'super_admin' + LIMIT 1` + ); + if (superRows[0]) return superRows[0].user_id; + + const adminRows = await query<{ user_id: string }[]>( + `SELECT ur.user_id + FROM user_roles ur + JOIN roles r ON r.id = ur.role_id + WHERE r.name = 'admin' + LIMIT 1` + ); + if (adminRows[0]) return adminRows[0].user_id; + throw new Error('No administrator available for automated sweep batch request'); +} + +export async function createSweepBatchApprovalRequests(): Promise { + const batches = await depositSweepBatchRepository.queryOpenBatchesReadyForApproval(); + let created = 0; + + for (const batch of batches) { + if (batch.sweep_count <= 0) continue; + + const requesterId = await getAutomatedRequesterId(); + const request = await fundApprovalService.createFundRequest({ + operationType: 'sweep_batch', + payload: { batchId: batch.id, sweepCount: batch.sweep_count, automated: true }, + requestedBy: requesterId, + }); + + await depositSweepBatchRepository.linkFundRequest(batch.id, request.id); + created++; + } + + return created; +} diff --git a/backend/src/services/sweepService.ts b/backend/src/services/sweepService.ts index f97802e9..ce1bd381 100644 --- a/backend/src/services/sweepService.ts +++ b/backend/src/services/sweepService.ts @@ -12,6 +12,7 @@ import { import * as walletRepository from '../repositories/walletRepository'; import * as coldWalletRepository from '../repositories/coldWalletRepository'; import * as depositSweepRepository from '../repositories/depositSweepRepository'; +import * as depositSweepBatchRepository from '../repositories/depositSweepBatchRepository'; import * as hotWalletRepository from '../repositories/hotWalletRepository'; import * as tronService from './blockchain/tronService'; import * as polygonService from './blockchain/polygonService'; @@ -68,6 +69,7 @@ export async function enqueueSweepAfterDeposit( if (amount < minSweepAmount()) return; + const batch = await depositSweepBatchRepository.getOrCreateOpenBatch(); await depositSweepRepository.createSweep({ userId, walletTypeId, @@ -75,7 +77,9 @@ export async function enqueueSweepAfterDeposit( toColdAddress: cold.address, amount, depositTransactionId, + batchId: batch.id, }); + await depositSweepBatchRepository.incrementBatchCount(batch.id); } async function ensureTronGasForTokenSweep(depositAddress: string): Promise { @@ -150,10 +154,17 @@ async function executeSweep(sweep: depositSweepRepository.DepositSweepRow): Prom await depositSweepRepository.updateSweepStatus(sweep.id, 'completed', { blockchainTxId: txId }); } -export async function processPendingSweeps(): Promise { +export async function processPendingSweeps(opts?: { + unbatchedOnly?: boolean; + batchId?: string; + limit?: number; +}): Promise { if (!config.treasury.sweepEnabled) return 0; - const pending = await depositSweepRepository.listPendingSweeps(10); + const pending = await depositSweepRepository.listPendingSweeps(opts?.limit ?? 10, { + unbatchedOnly: opts?.unbatchedOnly, + batchId: opts?.batchId, + }); let processed = 0; for (const sweep of pending) { @@ -173,6 +184,18 @@ export async function processPendingSweeps(): Promise { return processed; } +export async function executeApprovedBatch(batchId: string): Promise { + await depositSweepBatchRepository.markBatchStatus(batchId, 'executing'); + try { + const processed = await processPendingSweeps({ batchId, limit: 100 }); + await depositSweepBatchRepository.markBatchStatus(batchId, 'completed'); + return processed; + } catch (e) { + await depositSweepBatchRepository.markBatchStatus(batchId, 'failed'); + throw e; + } +} + export function getSweepPollIntervalMs(): number { return config.treasury.sweepPollIntervalMs; } diff --git a/backend/src/services/treasuryService.ts b/backend/src/services/treasuryService.ts index e1c31eac..ea50834f 100644 --- a/backend/src/services/treasuryService.ts +++ b/backend/src/services/treasuryService.ts @@ -144,11 +144,12 @@ export async function listSweeps(opts: { status?: string; limit?: number; offset } export async function requestColdToHotFunding( - adminUserId: string, + requestedBy: string, input: { walletTypeId: number; amountRaw: bigint; notes?: string; + approvedBy?: string; } ) { const cold = await coldWalletRepository.getActiveColdWallet(input.walletTypeId); @@ -164,7 +165,8 @@ export async function requestColdToHotFunding( fromAddress: cold.address, toAddress: hot.address, notes: input.notes, - approvedBy: adminUserId, + requestedBy, + approvedBy: input.approvedBy, }); return { diff --git a/backend/src/tests/authMultiRoles.test.ts b/backend/src/tests/authMultiRoles.test.ts new file mode 100644 index 00000000..2f4daa5b --- /dev/null +++ b/backend/src/tests/authMultiRoles.test.ts @@ -0,0 +1,49 @@ +import { describe, test } from 'node:test'; +import assert from 'node:assert/strict'; + +import { normalizeJwtPayload, requireRole } from '../services/authService'; +import type { JwtPayload } from '../types'; + +describe('auth multi-roles', () => { + test('normalizes legacy JWT with single role', () => { + const legacy: JwtPayload = { + userId: 'u1', + emailHash: 'hash', + role: 'admin', + roles: [], + permissions: [], + primaryRole: 'user', + }; + const normalized = normalizeJwtPayload(legacy); + assert.deepEqual(normalized.roles, ['admin']); + assert.equal(normalized.primaryRole, 'admin'); + }); + + test('requireRole accepts super_admin for admin routes', () => { + const guard = requireRole(['admin']); + assert.doesNotThrow(() => + guard({ + userId: 'u1', + emailHash: 'h', + roles: ['super_admin'], + permissions: [], + primaryRole: 'super_admin', + }) + ); + }); + + test('requireRole rejects user without matching role', () => { + const guard = requireRole(['admin']); + assert.throws( + () => + guard({ + userId: 'u1', + emailHash: 'h', + roles: ['user'], + permissions: [], + primaryRole: 'user', + }), + /Forbidden/ + ); + }); +}); diff --git a/backend/src/tests/fundApprovalService.test.ts b/backend/src/tests/fundApprovalService.test.ts new file mode 100644 index 00000000..f869246d --- /dev/null +++ b/backend/src/tests/fundApprovalService.test.ts @@ -0,0 +1,19 @@ +import { describe, test } from 'node:test'; +import assert from 'node:assert/strict'; + +import { resolvePrimaryRole } from '../repositories/roleRepository'; + +describe('resolvePrimaryRole', () => { + test('prefers super_admin over admin', () => { + assert.equal(resolvePrimaryRole(['user', 'admin', 'super_admin']), 'super_admin'); + }); +}); + +describe('fundApprovalService', () => { + test('FundApprovalError has correct name', async () => { + const { FundApprovalError } = await import('../services/fundApprovalService'); + const err = new FundApprovalError('test'); + assert.equal(err.name, 'FundApprovalError'); + assert.match(err.message, /test/); + }); +}); diff --git a/backend/src/tests/helpers/testAuth.ts b/backend/src/tests/helpers/testAuth.ts index b67011c9..d74a7999 100644 --- a/backend/src/tests/helpers/testAuth.ts +++ b/backend/src/tests/helpers/testAuth.ts @@ -12,6 +12,9 @@ export function createTestAccessToken(overrides: Partial = {}): stri userId: TEST_USER_ID, emailHash: TEST_EMAIL_HASH, role: 'user', + roles: ['user'], + permissions: [], + primaryRole: 'user', ...overrides, }; return jwt.sign(payload, config.jwt.secret, { expiresIn: '1h' }); diff --git a/backend/src/types/index.ts b/backend/src/types/index.ts index e779b7cd..81dbd085 100644 --- a/backend/src/types/index.ts +++ b/backend/src/types/index.ts @@ -11,5 +11,9 @@ export type { RoleName }; export interface JwtPayload { userId: string; emailHash: string; - role: RoleName; + /** @deprecated Use roles[] — kept for backward compatibility during transition */ + role?: RoleName; + roles: RoleName[]; + permissions: string[]; + primaryRole: RoleName; } diff --git a/backend/src/utils/adminUserListQuery.ts b/backend/src/utils/adminUserListQuery.ts index fbfe524d..629b9d1e 100644 --- a/backend/src/utils/adminUserListQuery.ts +++ b/backend/src/utils/adminUserListQuery.ts @@ -117,7 +117,9 @@ export function parseAdminUserListOptions( return { search: search.trim() || undefined, roleName: - role === 'admin' || role === 'moderator' || role === 'user' ? (role as RoleName) : undefined, + role === 'admin' || role === 'moderator' || role === 'user' || role === 'super_admin' + ? (role as RoleName) + : undefined, emailVerified: parseBoolQuery(q(source, 'emailVerified') || undefined), country: q(source, 'country').trim() || undefined, inactiveSinceDays: parseIntQuery(q(source, 'inactiveSinceDays') || undefined), diff --git a/prediqo_web/src/app/router/router.tsx b/prediqo_web/src/app/router/router.tsx index 36a61157..b353aa79 100644 --- a/prediqo_web/src/app/router/router.tsx +++ b/prediqo_web/src/app/router/router.tsx @@ -21,6 +21,7 @@ import { ProfilePage } from '../../features/profile/ProfilePage'; import { HomePage } from '../../features/home/HomePage'; import { CatalogAdminPage } from '../../features/catalog/CatalogAdminPage'; import { TreasuryAdminPage } from '../../features/treasury/TreasuryAdminPage'; +import { ApprovalsPage } from '../../features/approvals/ApprovalsPage'; import { ReferralAdminPage } from '../../features/referral/ReferralAdminPage'; import { ReferralPage } from '../../features/referral/ReferralPage'; import { ReferralFraudDashboardPage } from '../../features/referral/ReferralFraudDashboardPage'; @@ -97,6 +98,7 @@ export const router = createBrowserRouter([ { path: 'admin/settings', element: }, { path: 'admin/catalog', element: }, { path: 'admin/treasury', element: }, + { path: 'admin/approvals', element: }, { path: 'admin/security', element: }, { path: 'admin/referral', element: }, { path: 'admin/referral/fraud', element: }, diff --git a/prediqo_web/src/features/approvals/ApprovalsPage.tsx b/prediqo_web/src/features/approvals/ApprovalsPage.tsx new file mode 100644 index 00000000..d4daf572 --- /dev/null +++ b/prediqo_web/src/features/approvals/ApprovalsPage.tsx @@ -0,0 +1,202 @@ +/** + * Super-admin inbox for pending fund operation approvals. + */ +import { + Alert, + Box, + Button, + Chip, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + Stack, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography, +} from '@mui/material'; +import GavelRoundedIcon from '@mui/icons-material/GavelRounded'; +import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { useState } from 'react'; +import { api } from '../../shared/services/api'; +import { PageHeader, RefreshIconButton } from '../../shared/components/PageHeader'; +import { useAuth } from '../../shared/auth/AuthContext'; +import { ScrollableTable } from '../../shared/components/ScrollableTable'; + +type FundRequest = { + id: string; + operationType: string; + status: string; + payload: Record; + requestedBy: string; + approvedBy: string | null; + rejectionReason: string | null; + createdAt: string; +}; + +const OP_LABELS: Record = { + ledger_credit: 'Ledger credit', + treasury_cold_to_hot: 'Cold → Hot funding', + bonus_pool_fund: 'Bonus pool fund', + sweep_manual: 'Manual sweeps', + sweep_batch: 'Auto sweep batch', +}; + +export function ApprovalsPage() { + const qc = useQueryClient(); + const { canApproveFundOps } = useAuth(); + const [rejectId, setRejectId] = useState(null); + const [rejectReason, setRejectReason] = useState(''); + const [message, setMessage] = useState(null); + + const listQ = useQuery({ + queryKey: ['admin-fund-requests'], + queryFn: async () => { + const res = await api.get<{ items: FundRequest[]; total: number }>('/api/v1/admin/fund-requests', { + params: { status: 'pending_approval', limit: 100 }, + }); + return res.data; + }, + enabled: canApproveFundOps, + }); + + const approveMut = useMutation({ + mutationFn: (id: string) => api.post(`/api/v1/admin/fund-requests/${id}/approve`), + onSuccess: () => { + setMessage('Request approved and executed.'); + void qc.invalidateQueries({ queryKey: ['admin-fund-requests'] }); + }, + }); + + const rejectMut = useMutation({ + mutationFn: ({ id, reason }: { id: string; reason: string }) => + api.post(`/api/v1/admin/fund-requests/${id}/reject`, { reason }), + onSuccess: () => { + setRejectId(null); + setRejectReason(''); + setMessage('Request rejected.'); + void qc.invalidateQueries({ queryKey: ['admin-fund-requests'] }); + }, + }); + + if (!canApproveFundOps) { + return ( + You do not have permission to approve fund operations. + ); + } + + const items = listQ.data?.items ?? []; + + return ( + + } + title="Approvals" + subtitle="Review and approve sensitive fund operations" + actions={ + void listQ.refetch()} /> + } + /> + + {message && ( + setMessage(null)} sx={{ mb: 2 }}> + {message} + + )} + + {listQ.isError && ( + + Failed to load approval queue. + + )} + + + + + + Type + Requested by + Created + Status + Actions + + + + {items.length === 0 ? ( + + + + No pending approvals. + + + + ) : ( + items.map((r) => ( + + {OP_LABELS[r.operationType] ?? r.operationType} + + {r.requestedBy.slice(0, 8)}… + + {new Date(r.createdAt).toLocaleString()} + + + + + + + + + + + )) + )} + +
+
+ + setRejectId(null)} maxWidth="sm" fullWidth> + Reject request + + + Provide a reason for rejection. + + setRejectReason(e.target.value)} + /> + + + + + + +
+ ); +} diff --git a/prediqo_web/src/features/auth/LoginPage.tsx b/prediqo_web/src/features/auth/LoginPage.tsx index 9bffc273..18d12c14 100644 --- a/prediqo_web/src/features/auth/LoginPage.tsx +++ b/prediqo_web/src/features/auth/LoginPage.tsx @@ -14,7 +14,14 @@ type LoginResponse = { accessToken: string; refreshToken: string; expiresIn: number; - user: { id: string; emailHash: string; role: string }; + user: { + id: string; + emailHash: string; + role: string; + roles: string[]; + permissions: string[]; + primaryRole: string; + }; }; /** Sign-in form with optional TOTP; redirects to `from` route on success. */ @@ -88,7 +95,9 @@ export function LoginPage() { accessToken: res.data.accessToken, refreshToken: res.data.refreshToken, userId: res.data.user.id, - role: res.data.user.role, + role: res.data.user.primaryRole ?? res.data.user.role, + roles: res.data.user.roles ?? [res.data.user.role], + permissions: res.data.user.permissions ?? [], }); nav(from, { replace: true }); } catch (e: any) { diff --git a/prediqo_web/src/features/referral/ReferralAdminPage.tsx b/prediqo_web/src/features/referral/ReferralAdminPage.tsx index 4fc10b82..8487511f 100644 --- a/prediqo_web/src/features/referral/ReferralAdminPage.tsx +++ b/prediqo_web/src/features/referral/ReferralAdminPage.tsx @@ -99,6 +99,7 @@ export function ReferralAdminPage() { const [fundForm, setFundForm] = useState({ walletTypeId: '2', amountDisplay: '' }); const [settingsForm, setSettingsForm] = useState(null); const [rejectReasons, setRejectReasons] = useState>({}); + const [fundPendingMsg, setFundPendingMsg] = useState(null); const configQ = useQuery({ queryKey: ['admin-referral-config'], @@ -204,12 +205,17 @@ export function ReferralAdminPage() { const whole = parts[0] || '0'; const frac = (parts[1] ?? '').padEnd(decimals, '0').slice(0, decimals); const amountRaw = (BigInt(whole) * 10n ** 6n + BigInt(frac || '0')).toString(); - return api.post('/api/v1/admin/referral/pool/fund', { + return api.post<{ message?: string }>('/api/v1/admin/referral/pool/fund', { walletTypeId: Number(fundForm.walletTypeId), amountRaw, }); }, - onSuccess: () => void qc.invalidateQueries({ queryKey: ['admin-referral-config'] }), + onSuccess: (res) => { + setFundPendingMsg( + res.data.message ?? 'Bonus pool funding submitted — pending super-admin approval' + ); + void qc.invalidateQueries({ queryKey: ['admin-referral-config'] }); + }, }); const config = configQ.data; @@ -228,6 +234,12 @@ export function ReferralAdminPage() { + {fundPendingMsg && ( + setFundPendingMsg(null)} sx={{ mb: 2 }}> + {fundPendingMsg} + + )} + {configQ.isError && Failed to load referral configuration.} {s && ( diff --git a/prediqo_web/src/features/security/SecurityAdminPage.tsx b/prediqo_web/src/features/security/SecurityAdminPage.tsx index 634abaf8..d9b4fc62 100644 --- a/prediqo_web/src/features/security/SecurityAdminPage.tsx +++ b/prediqo_web/src/features/security/SecurityAdminPage.tsx @@ -399,24 +399,21 @@ export function SecurityAdminPage() { if (amountRaw === '0') { throw new Error('Enter a valid amount greater than zero'); } - const res = await api.post<{ - adjustmentId: string; - transactionId: string; - accountKind: 'main' | 'bonus'; - availableBalanceRaw: string; - }>(`/api/v1/admin/users/${creditForm.userId.trim()}/ledger-credit`, { - walletTypeId: creditForm.walletTypeId, - adjustmentType: creditForm.adjustmentType, - amountRaw, - reason: creditForm.reason.trim(), - }); - return { ...res.data, decimals, walletCode: wt?.code ?? USDT_WALLET_CODE }; + const res = await api.post<{ message?: string }>( + `/api/v1/admin/users/${creditForm.userId.trim()}/ledger-credit`, + { + walletTypeId: creditForm.walletTypeId, + adjustmentType: creditForm.adjustmentType, + amountRaw, + reason: creditForm.reason.trim(), + } + ); + return { ...res.data, decimals, walletCode: wt?.code ?? USDT_WALLET_CODE, message: res.data.message }; }, onSuccess: (data) => { - const humanBal = formatRaw(data.availableBalanceRaw, data.decimals); - const dest = data.accountKind === 'bonus' ? 'bonus wallet' : 'main wallet'; setCreditSuccess( - `Credited ${creditForm.amountDisplay} ${data.walletCode.replace('_TRC20', '')} to ${dest}. New available balance: ${humanBal}.` + data.message ?? + 'Credit request submitted — pending super-admin approval.' ); setCreditOpen(false); setCreditForm({ diff --git a/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx b/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx index 647fefef..a2605267 100644 --- a/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx +++ b/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx @@ -85,6 +85,7 @@ export function TreasuryAdminPage() { const [coldForms, setColdForms] = useState>({}); const [fundingForm, setFundingForm] = useState({ walletTypeId: 2, amount: '', notes: '' }); const [confirmFunding, setConfirmFunding] = useState<{ id: string; txId: string } | null>(null); + const [pendingMsg, setPendingMsg] = useState(null); const overviewQ = useQuery({ queryKey: ['admin-treasury-overview'], @@ -113,8 +114,9 @@ export function TreasuryAdminPage() { }); const runSweepsMut = useMutation({ - mutationFn: () => api.post('/api/v1/admin/treasury/sweeps/run'), - onSuccess: () => { + mutationFn: () => api.post<{ message?: string }>('/api/v1/admin/treasury/sweeps/run'), + onSuccess: (res) => { + setPendingMsg(res.data.message ?? 'Sweep request submitted — pending super-admin approval'); void qc.invalidateQueries({ queryKey: ['admin-treasury-sweeps'] }); void qc.invalidateQueries({ queryKey: ['admin-treasury-overview'] }); }, @@ -122,8 +124,9 @@ export function TreasuryAdminPage() { const requestFundingMut = useMutation({ mutationFn: (body: { walletTypeId: number; amount: string; notes?: string }) => - api.post('/api/v1/admin/treasury/funding', body), - onSuccess: () => { + api.post<{ message?: string }>('/api/v1/admin/treasury/funding', body), + onSuccess: (res) => { + setPendingMsg(res.data.message ?? 'Funding request submitted — pending super-admin approval'); void qc.invalidateQueries({ queryKey: ['admin-treasury-overview'] }); setFundingForm((f) => ({ ...f, amount: '', notes: '' })); }, @@ -156,6 +159,12 @@ export function TreasuryAdminPage() { } /> + {pendingMsg && ( + setPendingMsg(null)} sx={{ mb: 2 }}> + {pendingMsg} + + )} + {overviewQ.isError && ( Failed to load treasury overview. @@ -296,7 +305,7 @@ export function TreasuryAdminPage() { }) } > - Request funding + Request funding for approval {overview?.pendingColdToHotFunding?.length ? ( @@ -351,7 +360,7 @@ export function TreasuryAdminPage() { onClick={() => void runSweepsMut.mutateAsync()} sx={{ alignSelf: { xs: 'stretch', sm: 'auto' } }} > - Run sweeps now + Submit sweeps for approval diff --git a/prediqo_web/src/features/users/UserManagementPage.tsx b/prediqo_web/src/features/users/UserManagementPage.tsx index 1925f9ed..53bad02d 100644 --- a/prediqo_web/src/features/users/UserManagementPage.tsx +++ b/prediqo_web/src/features/users/UserManagementPage.tsx @@ -15,6 +15,9 @@ import { DialogContent, DialogTitle, FormControl, + FormControlLabel, + FormGroup, + Checkbox, Grid, IconButton, InputLabel, @@ -223,9 +226,11 @@ export function UserManagementPage() { const [roleDialog, setRoleDialog] = useState(null); - const [roleDraft, setRoleDraft] = useState<'user' | 'moderator' | 'admin'>('user'); + const [roleDraft, setRoleDraft] = useState(['user']); + + const ALL_ROLES = ['user', 'moderator', 'admin', 'super_admin'] as const; const [columnVisibilityModel, setColumnVisibilityModel] = useState>(() => { try { @@ -397,11 +402,11 @@ export function UserManagementPage() { }); const roleMut = useMutation({ - mutationFn: (body: { userId: string; role: 'user' | 'moderator' | 'admin' }) => - api.patch(`/api/v1/admin/users/${body.userId}/role`, { role: body.role }), + mutationFn: (body: { userId: string; roles: string[] }) => + api.patch(`/api/v1/admin/users/${body.userId}/roles`, { roles: body.roles }), onSuccess: () => { setRoleDialog(null); - setToast('Role updated'); + setToast('Roles updated'); void qc.invalidateQueries({ queryKey: ['admin-users'] }); }, onError: (e: unknown) => { @@ -410,11 +415,21 @@ export function UserManagementPage() { }, }); - const openRoleDialog = useCallback((u: AdminUser) => { - const role = - u.role_name === 'moderator' || u.role_name === 'admin' ? u.role_name : 'user'; - setRoleDraft(role); - setRoleDialog({ userId: u.id, email: u.email, role: u.role_name }); + const openRoleDialog = useCallback(async (u: AdminUser) => { + try { + const res = await api.get<{ user: { roles?: string[]; role_name: string } }>( + `/api/v1/admin/users/${u.id}` + ); + const roles = res.data.user.roles?.length + ? res.data.user.roles + : [res.data.user.role_name || 'user']; + setRoleDraft(roles); + setRoleDialog({ userId: u.id, email: u.email, roles }); + } catch { + const fallback = u.role_name ? [u.role_name] : ['user']; + setRoleDraft(fallback); + setRoleDialog({ userId: u.id, email: u.email, roles: fallback }); + } }, []); const users = q.data?.users ?? []; @@ -1637,24 +1652,31 @@ export function UserManagementPage() { setRoleDialog(null)} maxWidth="xs" fullWidth> - Change user role + Manage user roles {roleDialog?.email ?? roleDialog?.userId} - - Role - - + + {ALL_ROLES.map((role) => ( + { + setRoleDraft((prev) => { + if (e.target.checked) return [...new Set([...prev, role])]; + const next = prev.filter((r) => r !== role); + return next.length ? next : ['user']; + }); + }} + /> + } + label={role === 'super_admin' ? 'Super administrator' : role.charAt(0).toUpperCase() + role.slice(1)} + /> + ))} +