After adding permissions administration
This commit is contained in:
parent
6ee8461734
commit
5b9306fba3
6
backend/dist/controllers/authController.d.ts
vendored
6
backend/dist/controllers/authController.d.ts
vendored
@ -11,9 +11,13 @@ import { AuthRequest } from '../middleware/auth';
|
||||
export declare function register(req: Request, res: Response): Promise<void>;
|
||||
export declare function validateReferralCode(req: Request, res: Response): Promise<void>;
|
||||
/**
|
||||
* Public captcha configuration for the login form (Turnstile).
|
||||
* Public captcha configuration for the login form (Turnstile or built-in math).
|
||||
*/
|
||||
export declare function getCaptchaConfig(_req: Request, res: Response): Promise<void>;
|
||||
/**
|
||||
* Issues a fresh captcha challenge (math prompt, or Turnstile site key hint).
|
||||
*/
|
||||
export declare function getCaptchaChallenge(_req: Request, res: Response): Promise<void>;
|
||||
/**
|
||||
* Authenticates a user with email and password, optionally requiring a TOTP code when 2FA is enabled.
|
||||
* @param req - Request body: `email`, `password`, optional `totpCode`. IP and user-agent are forwarded for audit.
|
||||
|
||||
@ -1 +1 @@
|
||||
{"version":3,"file":"authController.d.ts","sourceRoot":"","sources":["../../src/controllers/authController.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMjD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CzE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF;AAED;;;;GAIG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BtE;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxE;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB5F;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF"}
|
||||
{"version":3,"file":"authController.d.ts","sourceRoot":"","sources":["../../src/controllers/authController.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMjD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CzE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUlF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOrF;AAED;;;;GAIG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCtE;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxE;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB5F;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF"}
|
||||
26
backend/dist/controllers/authController.js
vendored
26
backend/dist/controllers/authController.js
vendored
@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.register = register;
|
||||
exports.validateReferralCode = validateReferralCode;
|
||||
exports.getCaptchaConfig = getCaptchaConfig;
|
||||
exports.getCaptchaChallenge = getCaptchaChallenge;
|
||||
exports.login = login;
|
||||
exports.refresh = refresh;
|
||||
exports.setup2FA = setup2FA;
|
||||
@ -120,16 +121,30 @@ async function validateReferralCode(req, res) {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Public captcha configuration for the login form (Turnstile).
|
||||
* Public captcha configuration for the login form (Turnstile or built-in math).
|
||||
*/
|
||||
async function getCaptchaConfig(_req, res) {
|
||||
const settings = await settingsRepository.getSettings();
|
||||
const afterFailures = settings.login_captcha_after_failures;
|
||||
const provider = captchaService.getCaptchaProvider();
|
||||
res.json({
|
||||
enabled: captchaService.isCaptchaConfigured(),
|
||||
siteKey: captchaService.getCaptchaSiteKey(),
|
||||
afterFailures: settings.login_captcha_after_failures,
|
||||
enabled: captchaService.isCaptchaAvailable(afterFailures),
|
||||
provider,
|
||||
siteKey: provider === 'turnstile' ? captchaService.getCaptchaSiteKey() : null,
|
||||
afterFailures,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* Issues a fresh captcha challenge (math prompt, or Turnstile site key hint).
|
||||
*/
|
||||
async function getCaptchaChallenge(_req, res) {
|
||||
const settings = await settingsRepository.getSettings();
|
||||
if (!captchaService.isCaptchaAvailable(settings.login_captcha_after_failures)) {
|
||||
res.status(404).json({ error: 'Captcha is disabled' });
|
||||
return;
|
||||
}
|
||||
res.json(captchaService.createLoginCaptchaChallenge());
|
||||
}
|
||||
/**
|
||||
* Authenticates a user with email and password, optionally requiring a TOTP code when 2FA is enabled.
|
||||
* @param req - Request body: `email`, `password`, optional `totpCode`. IP and user-agent are forwarded for audit.
|
||||
@ -164,6 +179,9 @@ async function login(req, res) {
|
||||
...(e.retryAfterMinutes != null
|
||||
? { retryAfterMinutes: e.retryAfterMinutes }
|
||||
: {}),
|
||||
...(e.captcha
|
||||
? { captcha: e.captcha }
|
||||
: {}),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
2
backend/dist/db/connection.d.ts.map
vendored
2
backend/dist/db/connection.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAuFtC,QAAA,MAAM,IAAI,MAIT,CAAC;AAUF,sGAAsG;AACtG,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhB;AAED,kFAAkF;AAClF,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhB;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,CAAC,GAAG,OAAO,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAAC,CAAC,CAAC,CAkBZ;AAED,4DAA4D;AAC5D,wBAAsB,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC,CAErD;AAED;;;;GAIG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAoBnD;AAED,6DAA6D;AAC7D,eAAe,IAAI,CAAC"}
|
||||
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAuFtC,QAAA,MAAM,IAAI,MAIT,CAAC;AAUF,sGAAsG;AACtG,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhB;AAED,kFAAkF;AAClF,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhB;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,CAAC,GAAG,OAAO,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAAC,CAAC,CAAC,CAkBZ;AAED,4DAA4D;AAC5D,wBAAsB,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC,CAErD;AAED;;;;GAIG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAsBnD;AAED,6DAA6D;AAC7D,eAAe,IAAI,CAAC"}
|
||||
2
backend/dist/db/connection.js
vendored
2
backend/dist/db/connection.js
vendored
@ -190,6 +190,8 @@ async function runMigrations() {
|
||||
try {
|
||||
await client.query(`SET app.authorized_change = '1'`);
|
||||
await client.query(sql);
|
||||
const { syncPermissionCatalog } = await Promise.resolve().then(() => __importStar(require('../rbac/syncPermissions')));
|
||||
await syncPermissionCatalog();
|
||||
}
|
||||
finally {
|
||||
client.release();
|
||||
|
||||
2
backend/dist/db/connection.js.map
vendored
2
backend/dist/db/connection.js.map
vendored
File diff suppressed because one or more lines are too long
5
backend/dist/games/types.d.ts
vendored
5
backend/dist/games/types.d.ts
vendored
@ -2,7 +2,6 @@
|
||||
* Multi-game platform contract.
|
||||
* Each prediction game implements GameModule and registers at startup.
|
||||
*/
|
||||
import type { RoleName } from '../models';
|
||||
export type GameImplementationKey = 'candle-predict';
|
||||
/** Actions exposed via the generic game API (subset shared across games). */
|
||||
export type GameApiAction = 'state' | 'placeBet' | 'myBets' | 'auto.get' | 'auto.update';
|
||||
@ -17,8 +16,8 @@ export type GameCapabilities = {
|
||||
};
|
||||
export type GameRequestContext = {
|
||||
userId?: string;
|
||||
role?: RoleName;
|
||||
roles?: RoleName[];
|
||||
role?: string;
|
||||
roles?: string[];
|
||||
query: Record<string, unknown>;
|
||||
body: Record<string, unknown>;
|
||||
params: Record<string, string>;
|
||||
|
||||
2
backend/dist/games/types.d.ts.map
vendored
2
backend/dist/games/types.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/games/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC;AAErD,6EAA6E;AAC7E,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,UAAU,GACV,QAAQ,GACR,UAAU,GACV,aAAa,CAAC;AAElB,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,gBAAgB,CAAC;IAE/B,WAAW,CAAC,IAAI,IAAI,CAAC;IACrB,UAAU,CAAC,IAAI,IAAI,CAAC;IAEpB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,SAAS,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,eAAe,CAAC,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,kBAAkB,CAAC,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,YAAY,CAAC,CACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,EACnD,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB,CAAC"}
|
||||
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/games/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC;AAErD,6EAA6E;AAC7E,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,UAAU,GACV,QAAQ,GACR,UAAU,GACV,aAAa,CAAC;AAElB,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,gBAAgB,CAAC;IAE/B,WAAW,CAAC,IAAI,IAAI,CAAC;IACrB,UAAU,CAAC,IAAI,IAAI,CAAC;IAEpB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,SAAS,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,eAAe,CAAC,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,kBAAkB,CAAC,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,YAAY,CAAC,CACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,EACnD,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB,CAAC"}
|
||||
2
backend/dist/middleware/auth.d.ts.map
vendored
2
backend/dist/middleware/auth.d.ts.map
vendored
@ -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;AAStC,0EAA0E;AAC1E,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAmDD;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BvG;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IAC/B,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA2BlF;AAED,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IACrC,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAclF;AAED,4BAA4B;AAC5B,wBAAgB,YAAY,UAhDP,WAAW,OAAO,QAAQ,QAAQ,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAkDlF;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,KACZ,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA2BlF"}
|
||||
{"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;AAUtC,0EAA0E;AAC1E,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAoDD;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BvG;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IAC/B,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA2BlF;AAED,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,IACrC,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAclF;AAED,4BAA4B;AAC5B,wBAAgB,YAAY,UAhDP,WAAW,OAAO,QAAQ,QAAQ,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAkDlF;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,KACZ,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA2BlF"}
|
||||
7
backend/dist/middleware/auth.js
vendored
7
backend/dist/middleware/auth.js
vendored
@ -46,6 +46,7 @@ exports.requireStaff = requireStaff;
|
||||
const authService_1 = require("../services/authService");
|
||||
const onlinePresence_1 = require("../realtime/redis/onlinePresence");
|
||||
const roleAccess_1 = require("../utils/roleAccess");
|
||||
const permissionResolver_1 = require("../rbac/permissionResolver");
|
||||
const securityAudit_1 = require("../utils/securityAudit");
|
||||
const config_1 = require("../config");
|
||||
const settingsRepository = __importStar(require("../repositories/settingsRepository"));
|
||||
@ -77,6 +78,8 @@ function roleCheckPassed(req, roles) {
|
||||
return false;
|
||||
if (userHasAnyRole(req.user, roles))
|
||||
return true;
|
||||
if (roles.includes('admin') && (0, roleAccess_1.hasAdminPanelAccess)(req.user))
|
||||
return true;
|
||||
if (roles.includes('admin') && (0, roleAccess_1.hasAdminAccess)(req.user))
|
||||
return true;
|
||||
if (roles.includes('moderator') && (0, roleAccess_1.hasStaffAccess)(req.user))
|
||||
@ -177,7 +180,7 @@ function requirePermissions(...perms) {
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
const userPerms = req.user.permissions ?? [];
|
||||
if (perms.every((p) => userPerms.includes(p))) {
|
||||
if ((0, permissionResolver_1.userHasAllPermissions)(userPerms, perms)) {
|
||||
next();
|
||||
return;
|
||||
}
|
||||
@ -196,12 +199,12 @@ function requireStaff() {
|
||||
res.status(401).json({ error: 'Unauthorized' });
|
||||
return;
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
if (!(0, roleAccess_1.hasStaffAccess)(req.user)) {
|
||||
(0, securityAudit_1.logAccessDenied)(req, 'missing_staff_role');
|
||||
res.status(403).json({ error: 'Forbidden' });
|
||||
return;
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
try {
|
||||
const ok2fa = await enforceAdmin2faIfRequired(req, ['admin']);
|
||||
if (!ok2fa) {
|
||||
|
||||
2
backend/dist/middleware/auth.js.map
vendored
2
backend/dist/middleware/auth.js.map
vendored
File diff suppressed because one or more lines are too long
2
backend/dist/models/settings.model.d.ts
vendored
2
backend/dist/models/settings.model.d.ts
vendored
@ -38,7 +38,7 @@ export interface SystemSettings {
|
||||
login_max_failed_attempts: number;
|
||||
/** Lockout duration in minutes after max failed attempts. */
|
||||
login_lockout_minutes: number;
|
||||
/** Require Turnstile captcha after this many prior failed logins (when configured). */
|
||||
/** Require captcha after this many prior failed logins (math built-in, or Turnstile when configured). */
|
||||
login_captcha_after_failures: number;
|
||||
/** When true, Sybil block threshold auto-suspends beneficiary accounts. */
|
||||
sybil_auto_suspend_accounts: boolean;
|
||||
|
||||
2
backend/dist/models/settings.model.d.ts.map
vendored
2
backend/dist/models/settings.model.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"settings.model.d.ts","sourceRoot":"","sources":["../../src/models/settings.model.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,8FAA8F;AAC9F,MAAM,WAAW,cAAc;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,0BAA0B,EAAE,OAAO,CAAC;IACpC,0BAA0B,EAAE,OAAO,CAAC;IACpC,uBAAuB,EAAE,OAAO,CAAC;IACjC,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oCAAoC,EAAE,OAAO,CAAC;IAC9C,sDAAsD;IACtD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,4EAA4E;IAC5E,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,sDAAsD;IACtD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,0BAA0B,EAAE,MAAM,CAAC;IACnC,8BAA8B,EAAE,MAAM,CAAC;IACvC,6BAA6B,EAAE,MAAM,CAAC;IACtC,oCAAoC,EAAE,MAAM,CAAC;IAC7C,mCAAmC,EAAE,MAAM,CAAC;IAC5C,gCAAgC,EAAE,MAAM,CAAC;IACzC,0FAA0F;IAC1F,iCAAiC,EAAE,MAAM,CAAC;IAC1C,sEAAsE;IACtE,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uFAAuF;IACvF,sBAAsB,EAAE,OAAO,CAAC;IAChC,kEAAkE;IAClE,uBAAuB,EAAE,MAAM,CAAC;IAChC,6DAA6D;IAC7D,yBAAyB,EAAE,MAAM,CAAC;IAClC,6DAA6D;IAC7D,qBAAqB,EAAE,MAAM,CAAC;IAC9B,uFAAuF;IACvF,4BAA4B,EAAE,MAAM,CAAC;IACrC,2EAA2E;IAC3E,2BAA2B,EAAE,OAAO,CAAC;IACrC,yEAAyE;IACzE,gCAAgC,EAAE,OAAO,CAAC;IAC1C,6EAA6E;IAC7E,iCAAiC,EAAE,MAAM,CAAC;CAC3C"}
|
||||
{"version":3,"file":"settings.model.d.ts","sourceRoot":"","sources":["../../src/models/settings.model.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,8FAA8F;AAC9F,MAAM,WAAW,cAAc;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,0BAA0B,EAAE,OAAO,CAAC;IACpC,0BAA0B,EAAE,OAAO,CAAC;IACpC,uBAAuB,EAAE,OAAO,CAAC;IACjC,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oCAAoC,EAAE,OAAO,CAAC;IAC9C,sDAAsD;IACtD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,4EAA4E;IAC5E,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,sDAAsD;IACtD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,0BAA0B,EAAE,MAAM,CAAC;IACnC,8BAA8B,EAAE,MAAM,CAAC;IACvC,6BAA6B,EAAE,MAAM,CAAC;IACtC,oCAAoC,EAAE,MAAM,CAAC;IAC7C,mCAAmC,EAAE,MAAM,CAAC;IAC5C,gCAAgC,EAAE,MAAM,CAAC;IACzC,0FAA0F;IAC1F,iCAAiC,EAAE,MAAM,CAAC;IAC1C,sEAAsE;IACtE,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uFAAuF;IACvF,sBAAsB,EAAE,OAAO,CAAC;IAChC,kEAAkE;IAClE,uBAAuB,EAAE,MAAM,CAAC;IAChC,6DAA6D;IAC7D,yBAAyB,EAAE,MAAM,CAAC;IAClC,6DAA6D;IAC7D,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yGAAyG;IACzG,4BAA4B,EAAE,MAAM,CAAC;IACrC,2EAA2E;IAC3E,2BAA2B,EAAE,OAAO,CAAC;IACrC,yEAAyE;IACzE,gCAAgC,EAAE,OAAO,CAAC;IAC1C,6EAA6E;IAC7E,iCAAiC,EAAE,MAAM,CAAC;CAC3C"}
|
||||
2
backend/dist/reports/definitions.d.ts.map
vendored
2
backend/dist/reports/definitions.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/reports/definitions.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,CAAC;AAE3E,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,aAAa,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAyThD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAE7E;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAKjE,CAAC"}
|
||||
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/reports/definitions.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,CAAC;AAE3E,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,aAAa,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAmUhD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAE7E;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAKjE,CAAC"}
|
||||
9
backend/dist/reports/definitions.js
vendored
9
backend/dist/reports/definitions.js
vendored
@ -160,6 +160,15 @@ exports.REPORT_DEFINITIONS = [
|
||||
defaultSortField: 'created_at',
|
||||
defaultSortDir: 'desc',
|
||||
},
|
||||
{
|
||||
key: 'financial-commission-history',
|
||||
category: 'financial',
|
||||
title: 'Historique des commissions',
|
||||
description: 'Commissions de parrainage (tous statuts et sources : prédiction, dépôt, retrait) avec montants et niveaux.',
|
||||
source: 'reports-api',
|
||||
defaultSortField: 'created_at',
|
||||
defaultSortDir: 'desc',
|
||||
},
|
||||
{
|
||||
key: 'financial-adjustments',
|
||||
category: 'financial',
|
||||
|
||||
2
backend/dist/reports/definitions.js.map
vendored
2
backend/dist/reports/definitions.js.map
vendored
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
{"version":3,"file":"reportsRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/reportsRepository.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACnD,mEAAmE;IACnE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAiEF,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA2CzG;AAywBD,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAEhH"}
|
||||
{"version":3,"file":"reportsRepository.d.ts","sourceRoot":"","sources":["../../src/repositories/reportsRepository.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACnD,mEAAmE;IACnE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAiEF,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6CzG;AAu5BD,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAEhH"}
|
||||
116
backend/dist/repositories/reportsRepository.js
vendored
116
backend/dist/repositories/reportsRepository.js
vendored
@ -77,6 +77,8 @@ async function runReport(reportKey, options) {
|
||||
return listBonuses(reportKey, normalized);
|
||||
case 'financial-encouragement-grants':
|
||||
return listEncouragementGrants(reportKey, normalized);
|
||||
case 'financial-commission-history':
|
||||
return listCommissionHistory(reportKey, normalized);
|
||||
case 'financial-adjustments':
|
||||
return listAdjustments(reportKey, normalized);
|
||||
case 'financial-wallet-balances':
|
||||
@ -310,6 +312,120 @@ async function listEncouragementGrants(reportKey, options) {
|
||||
summary,
|
||||
};
|
||||
}
|
||||
async function listCommissionHistory(reportKey, options) {
|
||||
const columns = [
|
||||
{ field: 'id', headerName: 'ID', type: 'string' },
|
||||
{ field: 'beneficiary_user_id', headerName: 'Beneficiary user ID', type: 'string' },
|
||||
{ field: 'referred_user_id', headerName: 'Referred user ID', type: 'string' },
|
||||
{ field: 'level_number', headerName: 'Level', type: 'number' },
|
||||
{ field: 'commission_source', headerName: 'Source', type: 'string' },
|
||||
{ field: 'status', headerName: 'Status', type: 'string' },
|
||||
{ field: 'base_amount', headerName: 'Base amount (USDT)', type: 'money' },
|
||||
{ field: 'commission_percent', headerName: 'Commission %', type: 'number' },
|
||||
{ field: 'commission_amount', headerName: 'Commission (USDT)', type: 'money' },
|
||||
{ field: 'eligible_at', headerName: 'Eligible at', type: 'date' },
|
||||
{ field: 'paid_at', headerName: 'Paid at', type: 'date' },
|
||||
{ field: 'created_at', headerName: 'Date', type: 'date' },
|
||||
];
|
||||
const date = dateClause('p.created_at', options.from, options.to, 1);
|
||||
const values = [...date.values];
|
||||
let i = values.length + 1;
|
||||
const parts = [date.sql];
|
||||
if (options.search?.trim()) {
|
||||
parts.push(`(p.id::text ILIKE $${i} OR p.beneficiary_user_id::text ILIKE $${i} OR p.referred_user_id::text ILIKE $${i} OR p.status ILIKE $${i} OR p.commission_source ILIKE $${i})`);
|
||||
values.push(`%${options.search.trim()}%`);
|
||||
i += 1;
|
||||
}
|
||||
const statusPreset = options.preset?.status;
|
||||
if (typeof statusPreset === 'string' && statusPreset.trim()) {
|
||||
parts.push(`p.status = $${i++}`);
|
||||
values.push(statusPreset.trim());
|
||||
}
|
||||
const sourcePreset = options.preset?.commission_source ?? options.preset?.source;
|
||||
if (typeof sourcePreset === 'string' && sourcePreset.trim()) {
|
||||
parts.push(`p.commission_source = $${i++}`);
|
||||
values.push(sourcePreset.trim());
|
||||
}
|
||||
const idClause = idsFilter('p.id', options.ids, values, i);
|
||||
i = idClause.nextIdx;
|
||||
const whereSql = `${parts.join(' AND ')}${idClause.sql}`;
|
||||
const sortDir = options.sortDir === 'asc' ? 'asc' : 'desc';
|
||||
const summaryRows = await (0, connection_1.query)(`SELECT COUNT(*)::text AS total_count,
|
||||
COUNT(DISTINCT p.beneficiary_user_id)::text AS unique_users,
|
||||
COALESCE(SUM(p.commission_amount), 0)::text AS total_amount
|
||||
FROM referral_commission_payouts p
|
||||
WHERE ${whereSql}`, values);
|
||||
const summary = {
|
||||
totalCount: num(summaryRows[0]?.total_count),
|
||||
uniqueUsers: num(summaryRows[0]?.unique_users),
|
||||
totalAmountRaw: num(summaryRows[0]?.total_amount),
|
||||
};
|
||||
const selectSql = `SELECT p.id, p.beneficiary_user_id, p.referred_user_id, p.level_number,
|
||||
p.commission_source, p.status,
|
||||
p.deposit_amount::text AS base_amount,
|
||||
p.commission_percent::text AS commission_percent,
|
||||
p.commission_amount::text AS commission_amount,
|
||||
p.eligible_at, p.paid_at, p.created_at
|
||||
FROM referral_commission_payouts p`;
|
||||
const serializeCommissionRows = (rows) => rows.map((r) => ({
|
||||
...r,
|
||||
created_at: r.created_at instanceof Date ? r.created_at.toISOString() : r.created_at,
|
||||
eligible_at: r.eligible_at instanceof Date ? r.eligible_at.toISOString() : r.eligible_at,
|
||||
paid_at: r.paid_at instanceof Date ? r.paid_at.toISOString() : r.paid_at,
|
||||
}));
|
||||
if (useKeysetPagination(reportKey, options)) {
|
||||
const decoded = options.cursor ? (0, reportListCursor_1.decodeReportCursor)(options.cursor) : null;
|
||||
let keysetSql = '';
|
||||
if (decoded) {
|
||||
values.push(decoded.createdAt, decoded.id);
|
||||
const op = sortDir === 'asc' ? '>' : '<';
|
||||
keysetSql = ` AND (p.created_at, p.id) ${op} ($${i}::timestamptz, $${i + 1}::uuid)`;
|
||||
i += 2;
|
||||
}
|
||||
const includeTotal = options.includeTotal !== false && !options.cursor;
|
||||
const total = includeTotal ? summary.totalCount ?? 0 : 0;
|
||||
values.push(options.limit + 1);
|
||||
const rows = await (0, connection_1.query)(`${selectSql}
|
||||
WHERE ${whereSql}${keysetSql}
|
||||
ORDER BY p.created_at ${sortDir === 'asc' ? 'ASC' : 'DESC'}, p.id ${sortDir === 'asc' ? 'ASC' : 'DESC'}
|
||||
LIMIT $${i}`, values);
|
||||
const hasMore = rows.length > options.limit;
|
||||
const items = serializeCommissionRows(hasMore ? rows.slice(0, options.limit) : rows);
|
||||
const last = items[items.length - 1];
|
||||
const nextCursor = hasMore && last
|
||||
? (0, reportListCursor_1.buildCursorFromRow)(sortDir, {
|
||||
created_at: last.created_at,
|
||||
id: last.id,
|
||||
})
|
||||
: null;
|
||||
return { items, total, columns, nextCursor, hasMore, totalIsExact: includeTotal, summary };
|
||||
}
|
||||
const countRows = await (0, connection_1.query)(`SELECT COUNT(*)::text AS c FROM referral_commission_payouts p WHERE ${whereSql}`, values);
|
||||
const allowedSort = new Set([
|
||||
'created_at',
|
||||
'beneficiary_user_id',
|
||||
'referred_user_id',
|
||||
'level_number',
|
||||
'commission_amount',
|
||||
'status',
|
||||
'commission_source',
|
||||
]);
|
||||
const sortField = options.sortBy && allowedSort.has(options.sortBy) ? options.sortBy : 'created_at';
|
||||
const sortSql = `p.${sortField} ${sortDir === 'asc' ? 'ASC' : 'DESC'}`;
|
||||
const offset = options.offset ?? 0;
|
||||
values.push(options.limit, offset);
|
||||
const rows = await (0, connection_1.query)(`${selectSql}
|
||||
WHERE ${whereSql}
|
||||
ORDER BY ${sortSql}
|
||||
LIMIT $${i++} OFFSET $${i}`, values);
|
||||
return {
|
||||
items: serializeCommissionRows(rows),
|
||||
total: parseInt(countRows[0]?.c ?? '0', 10),
|
||||
columns,
|
||||
totalIsExact: true,
|
||||
summary,
|
||||
};
|
||||
}
|
||||
async function listBonuses(reportKey, options) {
|
||||
const columns = [
|
||||
{ field: 'id', headerName: 'ID', type: 'string' },
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
45
backend/dist/repositories/userRepository.js
vendored
45
backend/dist/repositories/userRepository.js
vendored
@ -65,6 +65,7 @@ exports.updateUserRole = updateUserRole;
|
||||
const connection_1 = require("../db/connection");
|
||||
const onlineUsersRepository_1 = require("./onlineUsersRepository");
|
||||
const crypto_1 = require("../utils/crypto");
|
||||
const adminUserSearch_1 = require("../utils/adminUserSearch");
|
||||
const adminListCursor_1 = require("./adminListCursor");
|
||||
const roleRepository = __importStar(require("./roleRepository"));
|
||||
/**
|
||||
@ -200,12 +201,44 @@ function buildAdminListWhere(filters) {
|
||||
let i = 1;
|
||||
if (filters.search?.trim()) {
|
||||
const term = filters.search.trim();
|
||||
const emailHash = (0, crypto_1.hashForIndex)(term);
|
||||
const idPattern = `${term}%`;
|
||||
whereParts.push(`(u.id::text = $${i} OR u.id::text LIKE $${i + 1} OR u.email_hash = $${i + 2}
|
||||
OR UPPER(u.referral_code) = UPPER($${i + 3}) OR u.referral_code ILIKE $${i + 4})`);
|
||||
values.push(term, idPattern, emailHash, term, `${term}%`);
|
||||
i += 5;
|
||||
const kind = (0, adminUserSearch_1.classifyAdminUserSearch)(term);
|
||||
const searchParts = [];
|
||||
if (kind === 'uuid') {
|
||||
const uuid = (0, adminUserSearch_1.tryParseUuid)(term);
|
||||
searchParts.push(`u.id = $${i}::uuid`);
|
||||
values.push(uuid);
|
||||
i += 1;
|
||||
}
|
||||
else if (kind === 'email') {
|
||||
searchParts.push(`u.email_hash = $${i}`);
|
||||
values.push((0, crypto_1.hashForIndex)(term));
|
||||
i += 1;
|
||||
}
|
||||
else {
|
||||
// Exact email hash still (in case the address has no @ typo edge cases — rare).
|
||||
searchParts.push(`u.email_hash = $${i}`);
|
||||
values.push((0, crypto_1.hashForIndex)(term));
|
||||
i += 1;
|
||||
// Referral code: exact (case-insensitive) or prefix.
|
||||
searchParts.push(`UPPER(u.referral_code) = UPPER($${i})`);
|
||||
values.push(term);
|
||||
i += 1;
|
||||
searchParts.push(`u.referral_code ILIKE $${i} ESCAPE '\\'`);
|
||||
values.push(`${(0, adminUserSearch_1.escapeLikePattern)(term)}%`);
|
||||
i += 1;
|
||||
// Display name (helps loadtest_* and users with blank email column).
|
||||
const namePattern = `%${(0, adminUserSearch_1.escapeLikePattern)(term)}%`;
|
||||
searchParts.push(`(u.first_name ILIKE $${i} ESCAPE '\\' OR u.middle_name ILIKE $${i} ESCAPE '\\' OR u.last_name ILIKE $${i} ESCAPE '\\' OR CONCAT_WS(' ', u.first_name, u.middle_name, u.last_name) ILIKE $${i} ESCAPE '\\')`);
|
||||
values.push(namePattern);
|
||||
i += 1;
|
||||
// UUID / id prefix (lowercase) when the term looks like a partial id.
|
||||
if ((0, adminUserSearch_1.isUuidPrefix)(term) || term.length >= 8) {
|
||||
searchParts.push(`LOWER(u.id::text) LIKE $${i} ESCAPE '\\'`);
|
||||
values.push(`${(0, adminUserSearch_1.escapeLikePattern)(term.toLowerCase())}%`);
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
whereParts.push(`(${searchParts.join(' OR ')})`);
|
||||
}
|
||||
if (filters.roleName) {
|
||||
whereParts.push(`r.name = $${i++}`);
|
||||
|
||||
File diff suppressed because one or more lines are too long
2
backend/dist/routes/index.d.ts.map
vendored
2
backend/dist/routes/index.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2HH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAmYxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"}
|
||||
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA4HH,QAAA,MAAM,MAAM,4CAAW,CAAC;AA6YxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"}
|
||||
10
backend/dist/routes/index.js
vendored
10
backend/dist/routes/index.js
vendored
@ -79,6 +79,7 @@ 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 rbacController = __importStar(require("../controllers/rbacController"));
|
||||
const router = (0, express_1.Router)();
|
||||
router.use(rateLimit_1.apiLimiter);
|
||||
/** One-time platform setup (before any administrator exists). */
|
||||
@ -90,6 +91,7 @@ router.get('/auth/referral/validate/:code', (0, errorHandler_1.asyncHandler)(aut
|
||||
router.get('/countries', countryController.listRegistrationCountries);
|
||||
router.post('/auth/login', rateLimit_1.loginLimiter, (0, validate_1.validateBody)(schemas_1.loginBodySchema), (0, errorHandler_1.asyncHandler)(authController.login));
|
||||
router.get('/auth/captcha-config', (0, errorHandler_1.asyncHandler)(authController.getCaptchaConfig));
|
||||
router.get('/auth/captcha-challenge', (0, errorHandler_1.asyncHandler)(authController.getCaptchaChallenge));
|
||||
router.post('/auth/refresh', (0, validate_1.validateBody)(schemas_1.refreshBodySchema), authController.refresh);
|
||||
router.post('/auth/logout', (0, validate_1.validateBody)(schemas_1.logoutBodySchema), authController.logout);
|
||||
router.post('/auth/verify-email', (0, validate_1.validateBody)(adminSchemas_1.verifyEmailBodySchema), authController.verifyEmail);
|
||||
@ -193,6 +195,14 @@ router.get('/admin/users/:userId', (0, auth_1.requireRoles)('admin'), (0, auth_1
|
||||
router.patch('/admin/users/:userId/flags', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), (0, validate_1.validateBody)(adminSchemas_1.adminUserFlagsBodySchema), adminController.updateUserFlags);
|
||||
router.patch('/admin/users/:userId/role', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('user.manage_roles'), (0, validate_1.validateBody)(adminSchemas_1.adminUserRoleBodySchema), adminController.updateUserRole);
|
||||
router.patch('/admin/users/:userId/roles', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('user.manage_roles'), (0, validate_1.validateBody)(adminSchemas_1.adminUserRolesBodySchema), adminController.updateUserRoles);
|
||||
// RBAC — roles & permissions management
|
||||
router.get('/admin/rbac/permissions', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.view'), (0, errorHandler_1.asyncHandler)(rbacController.listPermissions));
|
||||
router.get('/admin/rbac/roles', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.view'), (0, errorHandler_1.asyncHandler)(rbacController.listRoles));
|
||||
router.get('/admin/rbac/roles/:roleId', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.view'), (0, errorHandler_1.asyncHandler)(rbacController.getRole));
|
||||
router.post('/admin/rbac/roles', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.manage'), (0, errorHandler_1.asyncHandler)(rbacController.createRole));
|
||||
router.patch('/admin/rbac/roles/:roleId', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.manage'), (0, errorHandler_1.asyncHandler)(rbacController.updateRole));
|
||||
router.delete('/admin/rbac/roles/:roleId', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('admin.rbac.manage'), (0, errorHandler_1.asyncHandler)(rbacController.deleteRole));
|
||||
router.get('/admin/rbac/me', auth_1.authMiddleware, (0, errorHandler_1.asyncHandler)(rbacController.getMyPermissions));
|
||||
router.delete('/admin/users/:userId', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), (0, validate_1.validateBody)(adminSchemas_1.adminDeleteUserBodySchema), adminController.deleteUser);
|
||||
router.post('/admin/fund-requests', (0, auth_1.requirePermissions)('fund_operation.request'), (0, validate_1.validateBody)(adminSchemas_1.fundRequestCreateBodySchema), fundApprovalController.createFundRequest);
|
||||
router.get('/admin/fund-requests', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('fund_operation.request'), fundApprovalController.listFundRequests);
|
||||
|
||||
2
backend/dist/routes/index.js.map
vendored
2
backend/dist/routes/index.js.map
vendored
File diff suppressed because one or more lines are too long
11
backend/dist/services/adminService.d.ts
vendored
11
backend/dist/services/adminService.d.ts
vendored
@ -144,7 +144,7 @@ export declare function getUserDetails(userId: string): Promise<{
|
||||
email: string | null;
|
||||
role_id: number;
|
||||
role_name: string;
|
||||
roles: UserRoleName[];
|
||||
roles: string[];
|
||||
email_verified: boolean;
|
||||
totp_enabled: boolean;
|
||||
is_enabled: boolean;
|
||||
@ -163,19 +163,20 @@ export declare function getUserDetails(userId: string): Promise<{
|
||||
locked: string;
|
||||
}>;
|
||||
}>;
|
||||
/** @deprecated Prefer string[] — kept for legacy single-role API */
|
||||
export type UserRoleName = 'user' | 'moderator' | 'admin' | 'super_admin';
|
||||
export declare function updateUserRole(targetUserId: string, role: UserRoleName, adminUserId: string, notifyCtx?: {
|
||||
export declare function updateUserRole(targetUserId: string, role: string, adminUserId: string, notifyCtx?: {
|
||||
ipAddress?: string;
|
||||
userAgent?: string;
|
||||
}): Promise<{
|
||||
userId: string;
|
||||
role: UserRoleName;
|
||||
role: string;
|
||||
}>;
|
||||
export declare function updateUserRoles(targetUserId: string, roles: UserRoleName[], adminUserId: string, notifyCtx?: {
|
||||
export declare function updateUserRoles(targetUserId: string, roles: string[], adminUserId: string, notifyCtx?: {
|
||||
ipAddress?: string;
|
||||
userAgent?: string;
|
||||
}): Promise<{
|
||||
userId: string;
|
||||
roles: UserRoleName[];
|
||||
roles: string[];
|
||||
}>;
|
||||
//# sourceMappingURL=adminService.d.ts.map
|
||||
2
backend/dist/services/adminService.d.ts.map
vendored
2
backend/dist/services/adminService.d.ts.map
vendored
File diff suppressed because one or more lines are too long
2
backend/dist/services/adminService.js.map
vendored
2
backend/dist/services/adminService.js.map
vendored
File diff suppressed because one or more lines are too long
10
backend/dist/services/authService.d.ts
vendored
10
backend/dist/services/authService.d.ts
vendored
@ -4,7 +4,7 @@
|
||||
*/
|
||||
import { SystemSettings } from '../models';
|
||||
import { type UserGender } from '../models/userGender';
|
||||
import { JwtPayload, RoleName } from '../types';
|
||||
import { JwtPayload } from '../types';
|
||||
/** Builds JWT claims from current DB roles and permissions. */
|
||||
export declare function buildJwtPayload(user: {
|
||||
id: string;
|
||||
@ -60,10 +60,10 @@ export declare function login(email: string, password: string, totpCode?: string
|
||||
user: {
|
||||
id: string;
|
||||
emailHash: string;
|
||||
role: RoleName;
|
||||
roles: RoleName[];
|
||||
role: string;
|
||||
roles: string[];
|
||||
permissions: string[];
|
||||
primaryRole: RoleName;
|
||||
primaryRole: string;
|
||||
};
|
||||
}>;
|
||||
/**
|
||||
@ -209,5 +209,5 @@ export declare function verifyToken(accessToken: string): Promise<JwtPayload>;
|
||||
* @returns Callback that validates payload.role against allowed list
|
||||
* @throws {Error} Forbidden when role is not in allowed
|
||||
*/
|
||||
export declare function requireRole(allowed: RoleName[]): (payload: JwtPayload) => void;
|
||||
export declare function requireRole(allowed: string[]): (payload: JwtPayload) => void;
|
||||
//# sourceMappingURL=authService.d.ts.map
|
||||
2
backend/dist/services/authService.d.ts.map
vendored
2
backend/dist/services/authService.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2BH,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAmCtC,+DAA+D;AAC/D,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,UAAU,CAAC,CAatB;AAED,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,CAWnE;AAoBD;;;;;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,CAsFxF;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,EAC9F,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,WAAW,EAAE,MAAM,EAAE,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC,CAiKD;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CA+BD;AAED;;GAEG;AACH,wBAAsB,MAAM,CAC1B,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CASf;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,CAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACzG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAiChD;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA4BtC;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKjF;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnG;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAoBtC;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAG1E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAQ5E"}
|
||||
11
backend/dist/services/authService.js
vendored
11
backend/dist/services/authService.js
vendored
@ -313,9 +313,14 @@ async function login(email, password, totpCode, auditContext, captchaToken) {
|
||||
}
|
||||
const settings = await settingsRepository.getSettings();
|
||||
const failedCount = await userRepository.getFailedLoginCount(user.id);
|
||||
if (captchaService.isCaptchaConfigured() &&
|
||||
failedCount >= settings.login_captcha_after_failures) {
|
||||
await captchaService.verifyCaptchaToken(captchaToken, auditIp);
|
||||
const afterFailures = settings.login_captcha_after_failures;
|
||||
if (afterFailures > 0 && failedCount >= afterFailures) {
|
||||
try {
|
||||
await captchaService.verifyCaptchaToken(captchaToken, auditIp);
|
||||
}
|
||||
catch (e) {
|
||||
throw captchaService.withCaptchaChallenge(e);
|
||||
}
|
||||
}
|
||||
if (user.is_enabled === false) {
|
||||
(0, securityAudit_1.logSecurityEvent)('login_failed', {
|
||||
|
||||
2
backend/dist/services/authService.js.map
vendored
2
backend/dist/services/authService.js.map
vendored
File diff suppressed because one or more lines are too long
7
backend/dist/types/index.d.ts
vendored
7
backend/dist/types/index.d.ts
vendored
@ -9,10 +9,11 @@ export interface JwtPayload {
|
||||
userId: string;
|
||||
emailHash: string;
|
||||
/** @deprecated Use roles[] — kept for backward compatibility during transition */
|
||||
role?: RoleName;
|
||||
roles: RoleName[];
|
||||
role?: string;
|
||||
/** System roles (user, admin, …) and custom RBAC role names. */
|
||||
roles: string[];
|
||||
permissions: string[];
|
||||
primaryRole: RoleName;
|
||||
primaryRole: string;
|
||||
/** JWT credential version — must match users.token_version (invalidated on password change). */
|
||||
tv?: number;
|
||||
}
|
||||
|
||||
2
backend/dist/types/index.d.ts.map
vendored
2
backend/dist/types/index.d.ts.map
vendored
@ -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,kFAAkF;IAClF,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,gGAAgG;IAChG,EAAE,CAAC,EAAE,MAAM,CAAC;CACb"}
|
||||
{"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,MAAM,CAAC;IACd,gEAAgE;IAChE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,EAAE,CAAC,EAAE,MAAM,CAAC;CACb"}
|
||||
2
backend/dist/utils/reportListCursor.d.ts.map
vendored
2
backend/dist/utils/reportListCursor.d.ts.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"reportListCursor.d.ts","sourceRoot":"","sources":["../../src/utils/reportListCursor.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAcvC,CAAC;AAEH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAEhF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE/D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAWrE;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAE,GACxC,MAAM,CAWR;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,MAAM,CAGhF;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,YAAY,GAAG,IAAI,EAC3B,MAAM,EAAE,OAAO,EAAE,EACjB,UAAU,EAAE,MAAM,GACjB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAQpC"}
|
||||
{"version":3,"file":"reportListCursor.d.ts","sourceRoot":"","sources":["../../src/utils/reportListCursor.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAevC,CAAC;AAEH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAEhF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE/D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAWrE;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAE,GACxC,MAAM,CAWR;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,MAAM,CAGhF;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,YAAY,GAAG,IAAI,EAC3B,MAAM,EAAE,OAAO,EAAE,EACjB,UAAU,EAAE,MAAM,GACjB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAQpC"}
|
||||
1
backend/dist/utils/reportListCursor.js
vendored
1
backend/dist/utils/reportListCursor.js
vendored
@ -13,6 +13,7 @@ exports.CURSOR_PAGINATED_REPORT_KEYS = new Set([
|
||||
'financial-withdrawals',
|
||||
'financial-bonuses',
|
||||
'financial-encouragement-grants',
|
||||
'financial-commission-history',
|
||||
'financial-adjustments',
|
||||
'games-predictions',
|
||||
'games-predictions-real',
|
||||
|
||||
2
backend/dist/utils/reportListCursor.js.map
vendored
2
backend/dist/utils/reportListCursor.js.map
vendored
@ -1 +1 @@
|
||||
{"version":3,"file":"reportListCursor.js","sourceRoot":"","sources":["../../src/utils/reportListCursor.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"reportListCursor.js","sourceRoot":"","sources":["../../src/utils/reportListCursor.ts"],"names":[],"mappings":"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"}
|
||||
114
backend/src/controllers/rbacController.ts
Normal file
114
backend/src/controllers/rbacController.ts
Normal file
@ -0,0 +1,114 @@
|
||||
/**
|
||||
* RBAC HTTP handlers — roles and permissions management.
|
||||
*/
|
||||
|
||||
import { Response } from 'express';
|
||||
import { AuthRequest } from '../middleware/auth';
|
||||
import * as rbacService from '../services/rbacService';
|
||||
|
||||
export async function listPermissions(_req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const data = await rbacService.listPermissions();
|
||||
res.json(data);
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to list permissions';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function listRoles(_req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const roles = await rbacService.listRoles();
|
||||
res.json({ roles });
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to list roles';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function getRole(req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const roleId = parseInt(req.params.roleId, 10);
|
||||
const role = await rbacService.getRole(roleId);
|
||||
if (!role) {
|
||||
res.status(404).json({ error: 'Role not found' });
|
||||
return;
|
||||
}
|
||||
res.json(role);
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to load role';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function createRole(req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const { name, description, permissionKeys } = req.body as {
|
||||
name?: string;
|
||||
description?: string;
|
||||
permissionKeys?: string[];
|
||||
};
|
||||
if (!name?.trim()) {
|
||||
res.status(400).json({ error: 'Role name is required' });
|
||||
return;
|
||||
}
|
||||
const role = await rbacService.createRole(
|
||||
{ name, description, permissionKeys: permissionKeys ?? [] },
|
||||
req.user!.userId
|
||||
);
|
||||
res.status(201).json(role);
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to create role';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function updateRole(req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const roleId = parseInt(req.params.roleId, 10);
|
||||
const { name, description, permissionKeys } = req.body as {
|
||||
name?: string;
|
||||
description?: string;
|
||||
permissionKeys?: string[];
|
||||
};
|
||||
const role = await rbacService.updateRole(
|
||||
roleId,
|
||||
{ name, description, permissionKeys },
|
||||
req.user!.userId
|
||||
);
|
||||
res.json(role);
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to update role';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function deleteRole(req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const roleId = parseInt(req.params.roleId, 10);
|
||||
await rbacService.deleteRole(roleId, req.user!.userId);
|
||||
res.json({ message: 'Role deleted' });
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to delete role';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
|
||||
export async function getMyPermissions(req: AuthRequest, res: Response): Promise<void> {
|
||||
try {
|
||||
const userId = req.user!.userId;
|
||||
const roleRepository = await import('../repositories/roleRepository');
|
||||
const [roles, permissions] = await Promise.all([
|
||||
roleRepository.getUserRoleNames(userId),
|
||||
roleRepository.getUserPermissions(userId),
|
||||
]);
|
||||
res.json({
|
||||
roles,
|
||||
permissions,
|
||||
primaryRole: roleRepository.resolvePrimaryRole(roles),
|
||||
});
|
||||
} catch (e) {
|
||||
const msg = e instanceof Error ? e.message : 'Failed to load permissions';
|
||||
res.status(400).json({ error: msg });
|
||||
}
|
||||
}
|
||||
@ -176,6 +176,8 @@ export async function runMigrations(): Promise<void> {
|
||||
try {
|
||||
await client.query(`SET app.authorized_change = '1'`);
|
||||
await client.query(sql);
|
||||
const { syncPermissionCatalog } = await import('../rbac/syncPermissions');
|
||||
await syncPermissionCatalog();
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
* Each prediction game implements GameModule and registers at startup.
|
||||
*/
|
||||
|
||||
import type { RoleName } from '../models';
|
||||
|
||||
export type GameImplementationKey = 'candle-predict';
|
||||
|
||||
/** Actions exposed via the generic game API (subset shared across games). */
|
||||
@ -27,8 +25,8 @@ export type GameCapabilities = {
|
||||
|
||||
export type GameRequestContext = {
|
||||
userId?: string;
|
||||
role?: RoleName;
|
||||
roles?: RoleName[];
|
||||
role?: string;
|
||||
roles?: string[];
|
||||
query: Record<string, unknown>;
|
||||
body: Record<string, unknown>;
|
||||
params: Record<string, string>;
|
||||
|
||||
@ -9,7 +9,8 @@ import { verifyToken } from '../services/authService';
|
||||
import { touchAppPresence } from '../realtime/redis/onlinePresence';
|
||||
import { JwtPayload } from '../types';
|
||||
import type { RoleName } from '../models';
|
||||
import { hasAdminAccess, hasStaffAccess, userRoleList } from '../utils/roleAccess';
|
||||
import { hasAdminAccess, hasStaffAccess, hasAdminPanelAccess, userRoleList } from '../utils/roleAccess';
|
||||
import { userHasAllPermissions } from '../rbac/permissionResolver';
|
||||
import { logAccessDenied } from '../utils/securityAudit';
|
||||
import { config } from '../config';
|
||||
import * as settingsRepository from '../repositories/settingsRepository';
|
||||
@ -35,18 +36,19 @@ async function syncUserAccessFromDb(req: AuthRequest): Promise<void> {
|
||||
req.user.role = primaryRole;
|
||||
}
|
||||
|
||||
function userRoles(user: JwtPayload): RoleName[] {
|
||||
function userRoles(user: JwtPayload): string[] {
|
||||
return userRoleList(user);
|
||||
}
|
||||
|
||||
function userHasAnyRole(user: JwtPayload, roles: string[]): boolean {
|
||||
const assigned = userRoles(user);
|
||||
return roles.some((r) => assigned.includes(r as RoleName));
|
||||
return roles.some((r) => assigned.includes(r));
|
||||
}
|
||||
|
||||
function roleCheckPassed(req: AuthRequest, roles: string[]): boolean {
|
||||
if (!req.user) return false;
|
||||
if (userHasAnyRole(req.user, roles)) return true;
|
||||
if (roles.includes('admin') && hasAdminPanelAccess(req.user)) return true;
|
||||
if (roles.includes('admin') && hasAdminAccess(req.user)) return true;
|
||||
if (roles.includes('moderator') && hasStaffAccess(req.user)) return true;
|
||||
return false;
|
||||
@ -146,7 +148,7 @@ export function requirePermissions(...perms: string[]) {
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
const userPerms = req.user.permissions ?? [];
|
||||
if (perms.every((p) => userPerms.includes(p))) {
|
||||
if (userHasAllPermissions(userPerms, perms)) {
|
||||
next();
|
||||
return;
|
||||
}
|
||||
@ -167,12 +169,12 @@ export function requireStaff() {
|
||||
res.status(401).json({ error: 'Unauthorized' });
|
||||
return;
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
if (!hasStaffAccess(req.user)) {
|
||||
logAccessDenied(req, 'missing_staff_role');
|
||||
res.status(403).json({ error: 'Forbidden' });
|
||||
return;
|
||||
}
|
||||
await syncUserAccessFromDb(req);
|
||||
try {
|
||||
const ok2fa = await enforceAdmin2faIfRequired(req, ['admin']);
|
||||
if (!ok2fa) {
|
||||
|
||||
252
backend/src/rbac/permissionCatalog.ts
Normal file
252
backend/src/rbac/permissionCatalog.ts
Normal file
@ -0,0 +1,252 @@
|
||||
/**
|
||||
* Canonical permission catalog for the admin platform.
|
||||
* New admin features should register permissions here; syncPermissions() seeds the DB on migrate/bootstrap.
|
||||
*/
|
||||
|
||||
export type PermissionAction =
|
||||
| 'view'
|
||||
| 'create'
|
||||
| 'edit'
|
||||
| 'delete'
|
||||
| 'manage'
|
||||
| 'export'
|
||||
| 'approve'
|
||||
| 'request';
|
||||
|
||||
export type PermissionDef = {
|
||||
key: string;
|
||||
description: string;
|
||||
category: string;
|
||||
resource: string;
|
||||
action: PermissionAction;
|
||||
/** Legacy coarse keys that grant this permission (backward compatibility). */
|
||||
legacyGrants?: string[];
|
||||
};
|
||||
|
||||
/** System roles that cannot be deleted or renamed from the admin UI. */
|
||||
export const SYSTEM_ROLE_NAMES = ['user', 'moderator', 'admin', 'super_admin'] as const;
|
||||
export type SystemRoleName = (typeof SYSTEM_ROLE_NAMES)[number];
|
||||
|
||||
export function isSystemRole(name: string): boolean {
|
||||
return (SYSTEM_ROLE_NAMES as readonly string[]).includes(name);
|
||||
}
|
||||
|
||||
function p(
|
||||
resource: string,
|
||||
action: PermissionAction,
|
||||
description: string,
|
||||
category: string,
|
||||
legacyGrants?: string[]
|
||||
): PermissionDef {
|
||||
return {
|
||||
key: `admin.${resource}.${action}`,
|
||||
description,
|
||||
category,
|
||||
resource,
|
||||
action,
|
||||
legacyGrants,
|
||||
};
|
||||
}
|
||||
|
||||
/** All permissions known to the platform (granular + legacy entries). */
|
||||
export const PERMISSION_CATALOG: PermissionDef[] = [
|
||||
// Legacy coarse keys (kept for existing route guards)
|
||||
{
|
||||
key: 'fund_operation.request',
|
||||
description: 'Submit fund operations for super-admin approval',
|
||||
category: 'fund_operations',
|
||||
resource: 'fund_operations',
|
||||
action: 'request',
|
||||
},
|
||||
{
|
||||
key: 'fund_operation.approve',
|
||||
description: 'Approve or reject pending fund operations',
|
||||
category: 'fund_operations',
|
||||
resource: 'fund_operations',
|
||||
action: 'approve',
|
||||
},
|
||||
{
|
||||
key: 'user.manage_roles',
|
||||
description: 'Assign roles and manage RBAC',
|
||||
category: 'rbac',
|
||||
resource: 'rbac',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'treasury.view',
|
||||
description: 'View treasury and funding data',
|
||||
category: 'treasury',
|
||||
resource: 'treasury',
|
||||
action: 'view',
|
||||
},
|
||||
{
|
||||
key: 'security.admin',
|
||||
description: 'Access security admin console',
|
||||
category: 'security',
|
||||
resource: 'security',
|
||||
action: 'view',
|
||||
},
|
||||
{
|
||||
key: 'ledger.credit',
|
||||
description: 'Request ledger credits (bonus / adjustments)',
|
||||
category: 'users',
|
||||
resource: 'ledger_credit',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'referral.admin',
|
||||
description: 'Manage referral program admin actions',
|
||||
category: 'referral',
|
||||
resource: 'referral',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'settings.admin',
|
||||
description: 'Manage platform settings',
|
||||
category: 'settings',
|
||||
resource: 'settings',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'users.admin',
|
||||
description: 'Full user administration (legacy bundle)',
|
||||
category: 'users',
|
||||
resource: 'users',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'games.admin',
|
||||
description: 'Manage games catalog (legacy bundle)',
|
||||
category: 'games',
|
||||
resource: 'games',
|
||||
action: 'manage',
|
||||
},
|
||||
{
|
||||
key: 'reports.admin',
|
||||
description: 'View admin reports and analytics (legacy bundle)',
|
||||
category: 'reports',
|
||||
resource: 'reports',
|
||||
action: 'view',
|
||||
},
|
||||
|
||||
// Granular — dashboard
|
||||
p('dashboard', 'view', 'View admin overview dashboard', 'dashboard', ['reports.admin']),
|
||||
|
||||
// Granular — users
|
||||
p('users', 'view', 'View user list and profiles', 'users', ['users.admin']),
|
||||
p('users', 'create', 'Create user accounts', 'users', ['users.admin']),
|
||||
p('users', 'edit', 'Edit user profile and flags', 'users', ['users.admin']),
|
||||
p('users', 'delete', 'Disable or delete users', 'users', ['users.admin']),
|
||||
p('users', 'export', 'Export user data', 'users', ['users.admin']),
|
||||
p('users', 'manage', 'Batch operations and advanced user admin', 'users', ['users.admin']),
|
||||
|
||||
// Granular — reports
|
||||
p('reports', 'view', 'View reports hub and run reports', 'reports', ['reports.admin']),
|
||||
p('reports', 'export', 'Export report results', 'reports', ['reports.admin']),
|
||||
|
||||
// Granular — settings
|
||||
p('settings', 'view', 'View platform settings', 'settings', ['settings.admin']),
|
||||
p('settings', 'edit', 'Edit platform settings', 'settings', ['settings.admin']),
|
||||
|
||||
// Granular — games / catalog
|
||||
p('games', 'view', 'View games and catalog', 'games', ['games.admin']),
|
||||
p('games', 'edit', 'Create and edit games and ads', 'games', ['games.admin']),
|
||||
p('games', 'delete', 'Remove games and ads', 'games', ['games.admin']),
|
||||
|
||||
// Granular — treasury
|
||||
p('treasury', 'view', 'View treasury balances', 'treasury', ['treasury.view']),
|
||||
p('treasury', 'manage', 'Manage treasury operations', 'treasury', ['treasury.view']),
|
||||
|
||||
// Granular — security
|
||||
p('security', 'view', 'View security dashboard', 'security', ['security.admin']),
|
||||
p('security', 'manage', 'Manage security alerts and actions', 'security', ['security.admin']),
|
||||
|
||||
// Granular — referral
|
||||
p('referral', 'view', 'View referral program stats', 'referral', ['referral.admin']),
|
||||
p('referral', 'manage', 'Configure referral levels and settings', 'referral', ['referral.admin']),
|
||||
p('referral_fraud', 'view', 'View referral fraud dashboard', 'referral', ['referral.admin']),
|
||||
|
||||
// Granular — fund operations
|
||||
p('fund_operations', 'request', 'Submit fund operation requests', 'fund_operations', ['fund_operation.request']),
|
||||
p('fund_operations', 'approve', 'Approve fund operations', 'fund_operations', ['fund_operation.approve']),
|
||||
|
||||
// Granular — ledger
|
||||
p('ledger_credit', 'manage', 'Grant ledger credits to users', 'users', ['ledger.credit']),
|
||||
|
||||
// Granular — support & FAQ (staff)
|
||||
p('support', 'view', 'View support conversations', 'support'),
|
||||
p('support', 'manage', 'Reply and manage support tickets', 'support'),
|
||||
p('faq', 'view', 'View FAQ admin', 'faq'),
|
||||
p('faq', 'manage', 'Edit FAQ entries', 'faq'),
|
||||
|
||||
// Granular — misc admin pages
|
||||
p('network', 'view', 'View network and deployment status', 'network', ['settings.admin']),
|
||||
p('countries', 'view', 'View country configuration', 'countries', ['settings.admin']),
|
||||
p('countries', 'edit', 'Edit country configuration', 'countries', ['settings.admin']),
|
||||
p('test_wallet', 'view', 'View test wallet settings', 'test_wallet', ['settings.admin']),
|
||||
p('test_wallet', 'manage', 'Manage test wallet credits', 'test_wallet', ['settings.admin']),
|
||||
p('share_cards', 'view', 'View share card templates', 'share_cards', ['games.admin']),
|
||||
p('share_cards', 'edit', 'Edit share card templates', 'share_cards', ['games.admin']),
|
||||
p('solo_encouragement', 'view', 'View solo encouragement settings', 'solo_encouragement', ['games.admin']),
|
||||
p('solo_encouragement', 'edit', 'Edit solo encouragement settings', 'solo_encouragement', ['games.admin']),
|
||||
|
||||
// RBAC self-management
|
||||
p('rbac', 'view', 'View roles and permissions', 'rbac', ['user.manage_roles']),
|
||||
p('rbac', 'manage', 'Create and edit custom roles', 'rbac', ['user.manage_roles']),
|
||||
];
|
||||
|
||||
/** Default permission keys assigned to the `admin` system role (matches pre-RBAC behavior). */
|
||||
export const DEFAULT_ADMIN_PERMISSION_KEYS = [
|
||||
'fund_operation.request',
|
||||
'user.manage_roles',
|
||||
'treasury.view',
|
||||
'security.admin',
|
||||
'ledger.credit',
|
||||
'referral.admin',
|
||||
'settings.admin',
|
||||
'users.admin',
|
||||
'games.admin',
|
||||
'reports.admin',
|
||||
'admin.dashboard.view',
|
||||
'admin.users.view',
|
||||
'admin.users.edit',
|
||||
'admin.users.export',
|
||||
'admin.users.manage',
|
||||
'admin.reports.view',
|
||||
'admin.reports.export',
|
||||
'admin.settings.view',
|
||||
'admin.settings.edit',
|
||||
'admin.games.view',
|
||||
'admin.games.edit',
|
||||
'admin.treasury.view',
|
||||
'admin.security.view',
|
||||
'admin.security.manage',
|
||||
'admin.referral.view',
|
||||
'admin.referral.manage',
|
||||
'admin.referral_fraud.view',
|
||||
'admin.fund_operations.request',
|
||||
'admin.ledger_credit.manage',
|
||||
'admin.network.view',
|
||||
'admin.countries.view',
|
||||
'admin.countries.edit',
|
||||
'admin.test_wallet.view',
|
||||
'admin.test_wallet.manage',
|
||||
'admin.share_cards.view',
|
||||
'admin.share_cards.edit',
|
||||
'admin.solo_encouragement.view',
|
||||
'admin.solo_encouragement.edit',
|
||||
'admin.rbac.view',
|
||||
'admin.rbac.manage',
|
||||
];
|
||||
|
||||
/** Moderator defaults */
|
||||
export const DEFAULT_MODERATOR_PERMISSION_KEYS = [
|
||||
'security.admin',
|
||||
'admin.security.view',
|
||||
'admin.support.view',
|
||||
'admin.support.manage',
|
||||
'admin.faq.view',
|
||||
'admin.faq.manage',
|
||||
];
|
||||
|
||||
export const PERMISSION_KEYS = PERMISSION_CATALOG.map((d) => d.key);
|
||||
51
backend/src/rbac/permissionResolver.ts
Normal file
51
backend/src/rbac/permissionResolver.ts
Normal file
@ -0,0 +1,51 @@
|
||||
/**
|
||||
* Resolves whether a user holds a required permission, including legacy coarse-key aliases.
|
||||
*/
|
||||
|
||||
import { PERMISSION_CATALOG } from './permissionCatalog';
|
||||
|
||||
/** Map legacy coarse key → granular keys it implies. */
|
||||
const LEGACY_IMPLIES = new Map<string, Set<string>>();
|
||||
|
||||
for (const def of PERMISSION_CATALOG) {
|
||||
if (!def.legacyGrants?.length) continue;
|
||||
for (const legacy of def.legacyGrants) {
|
||||
if (!LEGACY_IMPLIES.has(legacy)) LEGACY_IMPLIES.set(legacy, new Set());
|
||||
LEGACY_IMPLIES.get(legacy)!.add(def.key);
|
||||
}
|
||||
// Also: owning the granular key satisfies checks against legacy coarse keys when all granules covered
|
||||
}
|
||||
|
||||
function expandPermissions(userPerms: string[]): Set<string> {
|
||||
const expanded = new Set(userPerms);
|
||||
for (const p of userPerms) {
|
||||
const implied = LEGACY_IMPLIES.get(p);
|
||||
if (implied) implied.forEach((k) => expanded.add(k));
|
||||
}
|
||||
return expanded;
|
||||
}
|
||||
|
||||
/** True if [userPerms] satisfies [required] (direct match or legacy alias). */
|
||||
export function userHasPermission(userPerms: string[], required: string): boolean {
|
||||
if (userPerms.includes(required)) return true;
|
||||
const expanded = expandPermissions(userPerms);
|
||||
if (expanded.has(required)) return true;
|
||||
// User has granular keys that together satisfy a legacy coarse requirement
|
||||
const impliedByLegacy = LEGACY_IMPLIES.get(required);
|
||||
if (impliedByLegacy) {
|
||||
for (const granular of impliedByLegacy) {
|
||||
if (userPerms.includes(granular) || expanded.has(granular)) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** True if user has every listed permission. */
|
||||
export function userHasAllPermissions(userPerms: string[], required: string[]): boolean {
|
||||
return required.every((p) => userHasPermission(userPerms, p));
|
||||
}
|
||||
|
||||
/** True if user has at least one listed permission. */
|
||||
export function userHasAnyPermission(userPerms: string[], required: string[]): boolean {
|
||||
return required.some((p) => userHasPermission(userPerms, p));
|
||||
}
|
||||
71
backend/src/rbac/syncPermissions.ts
Normal file
71
backend/src/rbac/syncPermissions.ts
Normal file
@ -0,0 +1,71 @@
|
||||
/**
|
||||
* Idempotent sync of permission catalog and system role defaults into PostgreSQL.
|
||||
*/
|
||||
|
||||
import { query } from '../db/connection';
|
||||
import {
|
||||
PERMISSION_CATALOG,
|
||||
DEFAULT_ADMIN_PERMISSION_KEYS,
|
||||
DEFAULT_MODERATOR_PERMISSION_KEYS,
|
||||
SYSTEM_ROLE_NAMES,
|
||||
} from './permissionCatalog';
|
||||
|
||||
export async function syncPermissionCatalog(): Promise<void> {
|
||||
// Schema extensions (idempotent)
|
||||
await query(`
|
||||
ALTER TABLE roles ADD COLUMN IF NOT EXISTS is_system BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
ALTER TABLE roles ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();
|
||||
ALTER TABLE roles ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT NOW();
|
||||
`);
|
||||
await query(`
|
||||
ALTER TABLE permissions ADD COLUMN IF NOT EXISTS category VARCHAR(64);
|
||||
ALTER TABLE permissions ADD COLUMN IF NOT EXISTS resource VARCHAR(64);
|
||||
ALTER TABLE permissions ADD COLUMN IF NOT EXISTS action VARCHAR(32);
|
||||
ALTER TABLE permissions ADD COLUMN IF NOT EXISTS is_system BOOLEAN NOT NULL DEFAULT TRUE;
|
||||
`);
|
||||
|
||||
// Mark system roles
|
||||
for (const name of SYSTEM_ROLE_NAMES) {
|
||||
await query(`UPDATE roles SET is_system = TRUE WHERE name = $1`, [name]);
|
||||
}
|
||||
|
||||
// Upsert permissions from catalog
|
||||
for (const def of PERMISSION_CATALOG) {
|
||||
await query(
|
||||
`INSERT INTO permissions (key, description, category, resource, action, is_system)
|
||||
VALUES ($1, $2, $3, $4, $5, TRUE)
|
||||
ON CONFLICT (key) DO UPDATE SET
|
||||
description = EXCLUDED.description,
|
||||
category = EXCLUDED.category,
|
||||
resource = EXCLUDED.resource,
|
||||
action = EXCLUDED.action`,
|
||||
[def.key, def.description, def.category, def.resource, def.action]
|
||||
);
|
||||
}
|
||||
|
||||
// super_admin: all permissions
|
||||
await query(`
|
||||
INSERT INTO role_permissions (role_id, permission_id)
|
||||
SELECT r.id, p.id FROM roles r CROSS JOIN permissions p
|
||||
WHERE r.name = 'super_admin'
|
||||
ON CONFLICT DO NOTHING
|
||||
`);
|
||||
|
||||
await assignRolePermissions('admin', DEFAULT_ADMIN_PERMISSION_KEYS);
|
||||
await assignRolePermissions('moderator', DEFAULT_MODERATOR_PERMISSION_KEYS);
|
||||
}
|
||||
|
||||
async function assignRolePermissions(roleName: string, keys: string[]): Promise<void> {
|
||||
const roleRows = await query<{ id: number }[]>('SELECT id FROM roles WHERE name = $1', [roleName]);
|
||||
const roleId = roleRows[0]?.id;
|
||||
if (!roleId) return;
|
||||
|
||||
for (const key of keys) {
|
||||
await query(
|
||||
`INSERT INTO role_permissions (role_id, permission_id)
|
||||
SELECT $1, p.id FROM permissions p WHERE p.key = $2
|
||||
ON CONFLICT DO NOTHING`,
|
||||
[roleId, key]
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -184,6 +184,16 @@ export const REPORT_DEFINITIONS: ReportDefinition[] = [
|
||||
defaultSortField: 'created_at',
|
||||
defaultSortDir: 'desc',
|
||||
},
|
||||
{
|
||||
key: 'financial-commission-history',
|
||||
category: 'financial',
|
||||
title: 'Historique des commissions',
|
||||
description:
|
||||
'Commissions de parrainage (tous statuts et sources : prédiction, dépôt, retrait) avec montants et niveaux.',
|
||||
source: 'reports-api',
|
||||
defaultSortField: 'created_at',
|
||||
defaultSortDir: 'desc',
|
||||
},
|
||||
{
|
||||
key: 'financial-adjustments',
|
||||
category: 'financial',
|
||||
|
||||
@ -123,6 +123,8 @@ export async function runReport(reportKey: string, options: ReportQueryOptions):
|
||||
return listBonuses(reportKey, normalized);
|
||||
case 'financial-encouragement-grants':
|
||||
return listEncouragementGrants(reportKey, normalized);
|
||||
case 'financial-commission-history':
|
||||
return listCommissionHistory(reportKey, normalized);
|
||||
case 'financial-adjustments':
|
||||
return listAdjustments(reportKey, normalized);
|
||||
case 'financial-wallet-balances':
|
||||
@ -420,6 +422,148 @@ async function listEncouragementGrants(
|
||||
};
|
||||
}
|
||||
|
||||
async function listCommissionHistory(
|
||||
reportKey: string,
|
||||
options: ReportQueryOptions
|
||||
): Promise<ReportPageResult> {
|
||||
const columns = [
|
||||
{ field: 'id', headerName: 'ID', type: 'string' },
|
||||
{ field: 'beneficiary_user_id', headerName: 'Beneficiary user ID', type: 'string' },
|
||||
{ field: 'referred_user_id', headerName: 'Referred user ID', type: 'string' },
|
||||
{ field: 'level_number', headerName: 'Level', type: 'number' },
|
||||
{ field: 'commission_source', headerName: 'Source', type: 'string' },
|
||||
{ field: 'status', headerName: 'Status', type: 'string' },
|
||||
{ field: 'base_amount', headerName: 'Base amount (USDT)', type: 'money' },
|
||||
{ field: 'commission_percent', headerName: 'Commission %', type: 'number' },
|
||||
{ field: 'commission_amount', headerName: 'Commission (USDT)', type: 'money' },
|
||||
{ field: 'eligible_at', headerName: 'Eligible at', type: 'date' },
|
||||
{ field: 'paid_at', headerName: 'Paid at', type: 'date' },
|
||||
{ field: 'created_at', headerName: 'Date', type: 'date' },
|
||||
];
|
||||
const date = dateClause('p.created_at', options.from, options.to, 1);
|
||||
const values = [...date.values];
|
||||
let i = values.length + 1;
|
||||
const parts = [date.sql];
|
||||
if (options.search?.trim()) {
|
||||
parts.push(
|
||||
`(p.id::text ILIKE $${i} OR p.beneficiary_user_id::text ILIKE $${i} OR p.referred_user_id::text ILIKE $${i} OR p.status ILIKE $${i} OR p.commission_source ILIKE $${i})`
|
||||
);
|
||||
values.push(`%${options.search.trim()}%`);
|
||||
i += 1;
|
||||
}
|
||||
const statusPreset = options.preset?.status;
|
||||
if (typeof statusPreset === 'string' && statusPreset.trim()) {
|
||||
parts.push(`p.status = $${i++}`);
|
||||
values.push(statusPreset.trim());
|
||||
}
|
||||
const sourcePreset = options.preset?.commission_source ?? options.preset?.source;
|
||||
if (typeof sourcePreset === 'string' && sourcePreset.trim()) {
|
||||
parts.push(`p.commission_source = $${i++}`);
|
||||
values.push(sourcePreset.trim());
|
||||
}
|
||||
const idClause = idsFilter('p.id', options.ids, values, i);
|
||||
i = idClause.nextIdx;
|
||||
const whereSql = `${parts.join(' AND ')}${idClause.sql}`;
|
||||
const sortDir = options.sortDir === 'asc' ? 'asc' : 'desc';
|
||||
|
||||
const summaryRows = await query<
|
||||
{ total_count: string; unique_users: string; total_amount: string }[]
|
||||
>(
|
||||
`SELECT COUNT(*)::text AS total_count,
|
||||
COUNT(DISTINCT p.beneficiary_user_id)::text AS unique_users,
|
||||
COALESCE(SUM(p.commission_amount), 0)::text AS total_amount
|
||||
FROM referral_commission_payouts p
|
||||
WHERE ${whereSql}`,
|
||||
values
|
||||
);
|
||||
const summary: ReportSummary = {
|
||||
totalCount: num(summaryRows[0]?.total_count),
|
||||
uniqueUsers: num(summaryRows[0]?.unique_users),
|
||||
totalAmountRaw: num(summaryRows[0]?.total_amount),
|
||||
};
|
||||
|
||||
const selectSql = `SELECT p.id, p.beneficiary_user_id, p.referred_user_id, p.level_number,
|
||||
p.commission_source, p.status,
|
||||
p.deposit_amount::text AS base_amount,
|
||||
p.commission_percent::text AS commission_percent,
|
||||
p.commission_amount::text AS commission_amount,
|
||||
p.eligible_at, p.paid_at, p.created_at
|
||||
FROM referral_commission_payouts p`;
|
||||
|
||||
const serializeCommissionRows = (rows: Record<string, unknown>[]): Record<string, unknown>[] =>
|
||||
rows.map((r) => ({
|
||||
...r,
|
||||
created_at: r.created_at instanceof Date ? (r.created_at as Date).toISOString() : r.created_at,
|
||||
eligible_at: r.eligible_at instanceof Date ? (r.eligible_at as Date).toISOString() : r.eligible_at,
|
||||
paid_at: r.paid_at instanceof Date ? (r.paid_at as Date).toISOString() : r.paid_at,
|
||||
}));
|
||||
|
||||
if (useKeysetPagination(reportKey, options)) {
|
||||
const decoded = options.cursor ? decodeReportCursor(options.cursor) : null;
|
||||
let keysetSql = '';
|
||||
if (decoded) {
|
||||
values.push(decoded.createdAt, decoded.id);
|
||||
const op = sortDir === 'asc' ? '>' : '<';
|
||||
keysetSql = ` AND (p.created_at, p.id) ${op} ($${i}::timestamptz, $${i + 1}::uuid)`;
|
||||
i += 2;
|
||||
}
|
||||
const includeTotal = options.includeTotal !== false && !options.cursor;
|
||||
const total = includeTotal ? summary.totalCount ?? 0 : 0;
|
||||
values.push(options.limit + 1);
|
||||
const rows = await query<Record<string, unknown>[]>(
|
||||
`${selectSql}
|
||||
WHERE ${whereSql}${keysetSql}
|
||||
ORDER BY p.created_at ${sortDir === 'asc' ? 'ASC' : 'DESC'}, p.id ${sortDir === 'asc' ? 'ASC' : 'DESC'}
|
||||
LIMIT $${i}`,
|
||||
values
|
||||
);
|
||||
const hasMore = rows.length > options.limit;
|
||||
const items = serializeCommissionRows(hasMore ? rows.slice(0, options.limit) : rows);
|
||||
const last = items[items.length - 1];
|
||||
const nextCursor =
|
||||
hasMore && last
|
||||
? buildCursorFromRow(sortDir, {
|
||||
created_at: last.created_at,
|
||||
id: last.id,
|
||||
})
|
||||
: null;
|
||||
return { items, total, columns, nextCursor, hasMore, totalIsExact: includeTotal, summary };
|
||||
}
|
||||
|
||||
const countRows = await query<{ c: string }[]>(
|
||||
`SELECT COUNT(*)::text AS c FROM referral_commission_payouts p WHERE ${whereSql}`,
|
||||
values
|
||||
);
|
||||
const allowedSort = new Set([
|
||||
'created_at',
|
||||
'beneficiary_user_id',
|
||||
'referred_user_id',
|
||||
'level_number',
|
||||
'commission_amount',
|
||||
'status',
|
||||
'commission_source',
|
||||
]);
|
||||
const sortField =
|
||||
options.sortBy && allowedSort.has(options.sortBy) ? options.sortBy : 'created_at';
|
||||
const sortSql = `p.${sortField} ${sortDir === 'asc' ? 'ASC' : 'DESC'}`;
|
||||
const offset = options.offset ?? 0;
|
||||
values.push(options.limit, offset);
|
||||
const rows = await query<Record<string, unknown>[]>(
|
||||
`${selectSql}
|
||||
WHERE ${whereSql}
|
||||
ORDER BY ${sortSql}
|
||||
LIMIT $${i++} OFFSET $${i}`,
|
||||
values
|
||||
);
|
||||
return {
|
||||
items: serializeCommissionRows(rows),
|
||||
total: parseInt(countRows[0]?.c ?? '0', 10),
|
||||
columns,
|
||||
totalIsExact: true,
|
||||
summary,
|
||||
};
|
||||
}
|
||||
|
||||
async function listBonuses(reportKey: string, options: ReportQueryOptions): Promise<ReportPageResult> {
|
||||
const columns = [
|
||||
{ field: 'id', headerName: 'ID', type: 'string' },
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
|
||||
import { query } from '../db/connection';
|
||||
import type { RoleName } from '../models';
|
||||
import { SYSTEM_ROLE_NAMES, isSystemRole } from '../rbac/permissionCatalog';
|
||||
import { userHasPermission as resolvePermission } from '../rbac/permissionResolver';
|
||||
|
||||
const ALL_ROLE_NAMES: RoleName[] = ['user', 'moderator', 'admin', 'super_admin'];
|
||||
|
||||
@ -11,23 +13,151 @@ export function isValidRoleName(name: string): name is RoleName {
|
||||
return (ALL_ROLE_NAMES as string[]).includes(name);
|
||||
}
|
||||
|
||||
export async function getUserRoleNames(userId: string): Promise<RoleName[]> {
|
||||
export function isKnownRoleName(name: string): boolean {
|
||||
return isSystemRole(name) || /^[a-z][a-z0-9_]{1,49}$/.test(name);
|
||||
}
|
||||
|
||||
export type RoleRow = {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string | null;
|
||||
is_system: boolean;
|
||||
};
|
||||
|
||||
export type PermissionRow = {
|
||||
id: number;
|
||||
key: string;
|
||||
description: string | null;
|
||||
category: string | null;
|
||||
resource: string | null;
|
||||
action: string | null;
|
||||
};
|
||||
|
||||
export async function listAllRoles(): Promise<RoleRow[]> {
|
||||
return query<RoleRow[]>(
|
||||
`SELECT id, name, description, COALESCE(is_system, FALSE) AS is_system
|
||||
FROM roles ORDER BY is_system DESC, name ASC`
|
||||
);
|
||||
}
|
||||
|
||||
export async function listAllPermissions(): Promise<PermissionRow[]> {
|
||||
return query<PermissionRow[]>(
|
||||
`SELECT id, key, description, category, resource, action FROM permissions ORDER BY category, key`
|
||||
);
|
||||
}
|
||||
|
||||
export async function findRoleById(id: number): Promise<RoleRow | null> {
|
||||
const rows = await query<RoleRow[]>(
|
||||
`SELECT id, name, description, COALESCE(is_system, FALSE) AS is_system FROM roles WHERE id = $1`,
|
||||
[id]
|
||||
);
|
||||
return rows[0] ?? null;
|
||||
}
|
||||
|
||||
export async function findRoleByName(name: string): Promise<RoleRow | null> {
|
||||
const rows = await query<RoleRow[]>(
|
||||
`SELECT id, name, description, COALESCE(is_system, FALSE) AS is_system FROM roles WHERE name = $1`,
|
||||
[name]
|
||||
);
|
||||
return rows[0] ?? null;
|
||||
}
|
||||
|
||||
export async function createRole(input: {
|
||||
name: string;
|
||||
description: string | null;
|
||||
isSystem: boolean;
|
||||
}): Promise<RoleRow> {
|
||||
const rows = await query<RoleRow[]>(
|
||||
`INSERT INTO roles (name, description, is_system) VALUES ($1, $2, $3)
|
||||
RETURNING id, name, description, is_system`,
|
||||
[input.name, input.description, input.isSystem]
|
||||
);
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
export async function updateRole(
|
||||
id: number,
|
||||
input: { name?: string; description?: string | null }
|
||||
): Promise<void> {
|
||||
const sets: string[] = ['updated_at = NOW()'];
|
||||
const values: unknown[] = [];
|
||||
let i = 1;
|
||||
if (input.name !== undefined) {
|
||||
sets.push(`name = $${i++}`);
|
||||
values.push(input.name);
|
||||
}
|
||||
if (input.description !== undefined) {
|
||||
sets.push(`description = $${i++}`);
|
||||
values.push(input.description);
|
||||
}
|
||||
values.push(id);
|
||||
await query(`UPDATE roles SET ${sets.join(', ')} WHERE id = $${i}`, values);
|
||||
}
|
||||
|
||||
export async function deleteRole(id: number): Promise<void> {
|
||||
await query('DELETE FROM role_permissions WHERE role_id = $1', [id]);
|
||||
await query('DELETE FROM roles WHERE id = $1 AND is_system = FALSE', [id]);
|
||||
}
|
||||
|
||||
export async function getRolePermissionKeys(roleId: number): Promise<string[]> {
|
||||
const rows = await query<{ key: string }[]>(
|
||||
`SELECT p.key FROM role_permissions rp
|
||||
JOIN permissions p ON p.id = rp.permission_id
|
||||
WHERE rp.role_id = $1 ORDER BY p.key`,
|
||||
[roleId]
|
||||
);
|
||||
return rows.map((r) => r.key);
|
||||
}
|
||||
|
||||
export async function setRolePermissions(roleId: number, permissionKeys: string[]): Promise<void> {
|
||||
await query('DELETE FROM role_permissions WHERE role_id = $1', [roleId]);
|
||||
if (!permissionKeys.length) return;
|
||||
await query(
|
||||
`INSERT INTO role_permissions (role_id, permission_id)
|
||||
SELECT $1, p.id FROM permissions p WHERE p.key = ANY($2::text[])
|
||||
ON CONFLICT DO NOTHING`,
|
||||
[roleId, permissionKeys]
|
||||
);
|
||||
}
|
||||
|
||||
export async function countUsersWithRoleId(roleId: number): Promise<number> {
|
||||
const rows = await query<{ count: string }[]>(
|
||||
`SELECT COUNT(DISTINCT ur.user_id)::text AS count
|
||||
FROM user_roles ur
|
||||
JOIN users u ON u.id = ur.user_id
|
||||
WHERE ur.role_id = $1 AND u.deleted_at IS NULL`,
|
||||
[roleId]
|
||||
);
|
||||
return parseInt(rows[0]?.count ?? '0', 10);
|
||||
}
|
||||
|
||||
export async function listUserIdsWithRole(roleId: number): Promise<string[]> {
|
||||
const rows = await query<{ user_id: string }[]>(
|
||||
`SELECT DISTINCT ur.user_id FROM user_roles ur
|
||||
JOIN users u ON u.id = ur.user_id
|
||||
WHERE ur.role_id = $1 AND u.deleted_at IS NULL`,
|
||||
[roleId]
|
||||
);
|
||||
return rows.map((r) => r.user_id);
|
||||
}
|
||||
|
||||
export async function getUserRoleNames(userId: string): Promise<string[]> {
|
||||
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`,
|
||||
ORDER BY r.is_system DESC, r.id`,
|
||||
[userId]
|
||||
);
|
||||
if (rows.length > 0) {
|
||||
return rows.map((r) => r.name as RoleName);
|
||||
return rows.map((r) => r.name);
|
||||
}
|
||||
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'];
|
||||
return legacy[0] ? [legacy[0].name] : ['user'];
|
||||
}
|
||||
|
||||
export async function getUserPermissions(userId: string): Promise<string[]> {
|
||||
@ -55,15 +185,15 @@ export async function getUserPermissions(userId: string): Promise<string[]> {
|
||||
|
||||
export async function userHasPermission(userId: string, permissionKey: string): Promise<boolean> {
|
||||
const perms = await getUserPermissions(userId);
|
||||
return perms.includes(permissionKey);
|
||||
return resolvePermission(perms, permissionKey);
|
||||
}
|
||||
|
||||
export async function userHasRole(userId: string, roleName: RoleName): Promise<boolean> {
|
||||
export async function userHasRole(userId: string, roleName: string): Promise<boolean> {
|
||||
const roles = await getUserRoleNames(userId);
|
||||
return roles.includes(roleName);
|
||||
}
|
||||
|
||||
export async function countUsersWithRoleName(roleName: RoleName): Promise<number> {
|
||||
export async function countUsersWithRoleName(roleName: string): Promise<number> {
|
||||
const rows = await query<{ count: string }[]>(
|
||||
`SELECT COUNT(DISTINCT ur.user_id)::text AS count
|
||||
FROM user_roles ur
|
||||
@ -75,8 +205,8 @@ export async function countUsersWithRoleName(roleName: RoleName): Promise<number
|
||||
return parseInt(rows[0]?.count ?? '0', 10);
|
||||
}
|
||||
|
||||
export async function setUserRoles(userId: string, roleNames: RoleName[]): Promise<void> {
|
||||
const unique = [...new Set(roleNames)].filter(isValidRoleName);
|
||||
export async function setUserRoles(userId: string, roleNames: string[]): Promise<void> {
|
||||
const unique = [...new Set(roleNames.map((n) => n.trim().toLowerCase()))].filter(isKnownRoleName);
|
||||
if (!unique.length) throw new Error('At least one role is required');
|
||||
|
||||
const roleRows = await query<{ id: number; name: string }[]>(
|
||||
@ -103,7 +233,7 @@ export async function setUserRoles(userId: string, roleNames: RoleName[]): Promi
|
||||
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<void> {
|
||||
export async function addUserRole(userId: string, roleName: string): Promise<void> {
|
||||
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', [
|
||||
@ -119,9 +249,12 @@ export async function ensureUserHasDefaultRole(userId: string, roleId: number):
|
||||
]);
|
||||
}
|
||||
|
||||
export function resolvePrimaryRole(roles: RoleName[]): RoleName {
|
||||
export function resolvePrimaryRole(roles: string[]): string {
|
||||
if (roles.includes('super_admin')) return 'super_admin';
|
||||
if (roles.includes('admin')) return 'admin';
|
||||
if (roles.includes('moderator')) return 'moderator';
|
||||
return roles[0] ?? 'user';
|
||||
}
|
||||
|
||||
/** @deprecated use string[] from getUserRoleNames */
|
||||
export type { RoleName };
|
||||
|
||||
@ -8,6 +8,12 @@ import {
|
||||
import { User } from '../models';
|
||||
import type { UserGender } from '../models/userGender';
|
||||
import { hashForIndex, hashForPhone } from '../utils/crypto';
|
||||
import {
|
||||
classifyAdminUserSearch,
|
||||
escapeLikePattern,
|
||||
isUuidPrefix,
|
||||
tryParseUuid,
|
||||
} from '../utils/adminUserSearch';
|
||||
import {
|
||||
adminListOrderBySql,
|
||||
buildCursorFromRow,
|
||||
@ -274,14 +280,49 @@ function buildAdminListWhere(filters: AdminListFilters): { whereSql: string; val
|
||||
|
||||
if (filters.search?.trim()) {
|
||||
const term = filters.search.trim();
|
||||
const emailHash = hashForIndex(term);
|
||||
const idPattern = `${term}%`;
|
||||
whereParts.push(
|
||||
`(u.id::text = $${i} OR u.id::text LIKE $${i + 1} OR u.email_hash = $${i + 2}
|
||||
OR UPPER(u.referral_code) = UPPER($${i + 3}) OR u.referral_code ILIKE $${i + 4})`
|
||||
);
|
||||
values.push(term, idPattern, emailHash, term, `${term}%`);
|
||||
i += 5;
|
||||
const kind = classifyAdminUserSearch(term);
|
||||
const searchParts: string[] = [];
|
||||
|
||||
if (kind === 'uuid') {
|
||||
const uuid = tryParseUuid(term)!;
|
||||
searchParts.push(`u.id = $${i}::uuid`);
|
||||
values.push(uuid);
|
||||
i += 1;
|
||||
} else if (kind === 'email') {
|
||||
searchParts.push(`u.email_hash = $${i}`);
|
||||
values.push(hashForIndex(term));
|
||||
i += 1;
|
||||
} else {
|
||||
// Exact email hash still (in case the address has no @ typo edge cases — rare).
|
||||
searchParts.push(`u.email_hash = $${i}`);
|
||||
values.push(hashForIndex(term));
|
||||
i += 1;
|
||||
|
||||
// Referral code: exact (case-insensitive) or prefix.
|
||||
searchParts.push(`UPPER(u.referral_code) = UPPER($${i})`);
|
||||
values.push(term);
|
||||
i += 1;
|
||||
searchParts.push(`u.referral_code ILIKE $${i} ESCAPE '\\'`);
|
||||
values.push(`${escapeLikePattern(term)}%`);
|
||||
i += 1;
|
||||
|
||||
// Display name (helps loadtest_* and users with blank email column).
|
||||
const namePattern = `%${escapeLikePattern(term)}%`;
|
||||
searchParts.push(
|
||||
`(u.first_name ILIKE $${i} ESCAPE '\\' OR u.middle_name ILIKE $${i} ESCAPE '\\' OR u.last_name ILIKE $${i} ESCAPE '\\' OR CONCAT_WS(' ', u.first_name, u.middle_name, u.last_name) ILIKE $${i} ESCAPE '\\')`
|
||||
);
|
||||
values.push(namePattern);
|
||||
i += 1;
|
||||
|
||||
// UUID / id prefix (lowercase) when the term looks like a partial id.
|
||||
if (isUuidPrefix(term) || term.length >= 8) {
|
||||
searchParts.push(`LOWER(u.id::text) LIKE $${i} ESCAPE '\\'`);
|
||||
values.push(`${escapeLikePattern(term.toLowerCase())}%`);
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
|
||||
whereParts.push(`(${searchParts.join(' OR ')})`);
|
||||
}
|
||||
|
||||
if (filters.roleName) {
|
||||
|
||||
@ -123,6 +123,7 @@ import * as faqController from '../controllers/faqController';
|
||||
import { faqUpload } from '../middleware/faqUpload';
|
||||
import * as setupController from '../controllers/setupController';
|
||||
import * as fundApprovalController from '../controllers/fundApprovalController';
|
||||
import * as rbacController from '../controllers/rbacController';
|
||||
|
||||
const router = Router();
|
||||
|
||||
@ -274,6 +275,15 @@ router.get('/admin/users/:userId', requireRoles('admin'), requirePermissions('us
|
||||
router.patch('/admin/users/:userId/flags', requireRoles('admin'), requirePermissions('users.admin'), validateBody(adminUserFlagsBodySchema), adminController.updateUserFlags);
|
||||
router.patch('/admin/users/:userId/role', requireRoles('admin'), requirePermissions('user.manage_roles'), validateBody(adminUserRoleBodySchema), adminController.updateUserRole);
|
||||
router.patch('/admin/users/:userId/roles', requireRoles('admin'), requirePermissions('user.manage_roles'), validateBody(adminUserRolesBodySchema), adminController.updateUserRoles);
|
||||
|
||||
// RBAC — roles & permissions management
|
||||
router.get('/admin/rbac/permissions', requireRoles('admin'), requirePermissions('admin.rbac.view'), asyncHandler(rbacController.listPermissions));
|
||||
router.get('/admin/rbac/roles', requireRoles('admin'), requirePermissions('admin.rbac.view'), asyncHandler(rbacController.listRoles));
|
||||
router.get('/admin/rbac/roles/:roleId', requireRoles('admin'), requirePermissions('admin.rbac.view'), asyncHandler(rbacController.getRole));
|
||||
router.post('/admin/rbac/roles', requireRoles('admin'), requirePermissions('admin.rbac.manage'), asyncHandler(rbacController.createRole));
|
||||
router.patch('/admin/rbac/roles/:roleId', requireRoles('admin'), requirePermissions('admin.rbac.manage'), asyncHandler(rbacController.updateRole));
|
||||
router.delete('/admin/rbac/roles/:roleId', requireRoles('admin'), requirePermissions('admin.rbac.manage'), asyncHandler(rbacController.deleteRole));
|
||||
router.get('/admin/rbac/me', authMiddleware, asyncHandler(rbacController.getMyPermissions));
|
||||
router.delete(
|
||||
'/admin/users/:userId',
|
||||
requireRoles('admin'),
|
||||
|
||||
@ -530,7 +530,7 @@ export async function getUserDetails(userId: string): Promise<{
|
||||
email: string | null;
|
||||
role_id: number;
|
||||
role_name: string;
|
||||
roles: UserRoleName[];
|
||||
roles: string[];
|
||||
email_verified: boolean;
|
||||
totp_enabled: boolean;
|
||||
is_enabled: boolean;
|
||||
@ -581,14 +581,15 @@ export async function getUserDetails(userId: string): Promise<{
|
||||
};
|
||||
}
|
||||
|
||||
/** @deprecated Prefer string[] — kept for legacy single-role API */
|
||||
export type UserRoleName = 'user' | 'moderator' | 'admin' | 'super_admin';
|
||||
|
||||
export async function updateUserRole(
|
||||
targetUserId: string,
|
||||
role: UserRoleName,
|
||||
role: string,
|
||||
adminUserId: string,
|
||||
notifyCtx: { ipAddress?: string; userAgent?: string } = {}
|
||||
): Promise<{ userId: string; role: UserRoleName }> {
|
||||
): Promise<{ userId: string; role: string }> {
|
||||
const result = await fundApprovalService.updateUserRoles(targetUserId, [role], adminUserId, notifyCtx);
|
||||
const primary = roleRepository.resolvePrimaryRole(result.roles);
|
||||
return { userId: targetUserId, role: primary };
|
||||
@ -596,9 +597,9 @@ export async function updateUserRole(
|
||||
|
||||
export async function updateUserRoles(
|
||||
targetUserId: string,
|
||||
roles: UserRoleName[],
|
||||
roles: string[],
|
||||
adminUserId: string,
|
||||
notifyCtx: { ipAddress?: string; userAgent?: string } = {}
|
||||
): Promise<{ userId: string; roles: UserRoleName[] }> {
|
||||
): Promise<{ userId: string; roles: string[] }> {
|
||||
return fundApprovalService.updateUserRoles(targetUserId, roles, adminUserId, notifyCtx);
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ import { assessLoginRisk, recordLoginRisk } from './loginRiskService';
|
||||
import { enforceConcurrentSessionLimit } from './sessionService';
|
||||
import { SystemSettings } from '../models';
|
||||
import { parseUserGender, type UserGender } from '../models/userGender';
|
||||
import { JwtPayload, RoleName } from '../types';
|
||||
import { JwtPayload } from '../types';
|
||||
import * as roleRepository from '../repositories/roleRepository';
|
||||
import { hasAdminAccess } from '../utils/roleAccess';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
@ -88,7 +88,7 @@ export async function buildJwtPayload(user: {
|
||||
/** 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[]);
|
||||
decoded.roles?.length ? decoded.roles : decoded.role ? [decoded.role] : ['user'];
|
||||
const primaryRole = roleRepository.resolvePrimaryRole(roles);
|
||||
return {
|
||||
...decoded,
|
||||
@ -266,10 +266,10 @@ export async function login(
|
||||
user: {
|
||||
id: string;
|
||||
emailHash: string;
|
||||
role: RoleName;
|
||||
roles: RoleName[];
|
||||
role: string;
|
||||
roles: string[];
|
||||
permissions: string[];
|
||||
primaryRole: RoleName;
|
||||
primaryRole: string;
|
||||
};
|
||||
}> {
|
||||
const emailHash = hashForIndex(email);
|
||||
@ -876,7 +876,7 @@ export async function verifyToken(accessToken: string): Promise<JwtPayload> {
|
||||
* @returns Callback that validates payload.role against allowed list
|
||||
* @throws {Error} Forbidden when role is not in allowed
|
||||
*/
|
||||
export function requireRole(allowed: RoleName[]): (payload: JwtPayload) => void {
|
||||
export function requireRole(allowed: string[]): (payload: JwtPayload) => void {
|
||||
return (payload: JwtPayload) => {
|
||||
const roles = payload.roles ?? (payload.role ? [payload.role] : []);
|
||||
const ok =
|
||||
|
||||
@ -9,6 +9,8 @@ import type {
|
||||
FundOperationType,
|
||||
} from '../repositories/fundOperationRequestRepository';
|
||||
import * as roleRepository from '../repositories/roleRepository';
|
||||
import * as userRepository from '../repositories/userRepository';
|
||||
import { bumpUserTokenOnRoleChange } from './rbacService';
|
||||
import * as auditLogRepository from '../repositories/auditLogRepository';
|
||||
import * as securityNotificationService from './securityNotificationService';
|
||||
import * as adminCreditService from './adminCreditService';
|
||||
@ -254,16 +256,16 @@ export type UserRoleName = RoleName;
|
||||
|
||||
export async function updateUserRoles(
|
||||
targetUserId: string,
|
||||
roleNames: RoleName[],
|
||||
roleNames: string[],
|
||||
adminUserId: string,
|
||||
notifyCtx: { ipAddress?: string; userAgent?: string } = {}
|
||||
): Promise<{ userId: string; roles: RoleName[] }> {
|
||||
): Promise<{ userId: string; roles: string[] }> {
|
||||
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[];
|
||||
const unique = [...new Set(roleNames.map((r) => r.trim().toLowerCase()))].filter((r) =>
|
||||
roleRepository.isKnownRoleName(r)
|
||||
);
|
||||
if (!unique.length) throw new FundApprovalError('At least one role is required');
|
||||
|
||||
const currentRoles = await roleRepository.getUserRoleNames(targetUserId);
|
||||
@ -294,6 +296,7 @@ export async function updateUserRoles(
|
||||
}
|
||||
|
||||
await roleRepository.setUserRoles(targetUserId, unique);
|
||||
await bumpUserTokenOnRoleChange(targetUserId);
|
||||
|
||||
const permissionsAfter = await roleRepository.getUserPermissions(targetUserId);
|
||||
|
||||
|
||||
202
backend/src/services/rbacService.ts
Normal file
202
backend/src/services/rbacService.ts
Normal file
@ -0,0 +1,202 @@
|
||||
/**
|
||||
* RBAC service — custom roles CRUD and permission assignment.
|
||||
*/
|
||||
|
||||
import * as roleRepository from '../repositories/roleRepository';
|
||||
import * as auditLogRepository from '../repositories/auditLogRepository';
|
||||
import * as userRepository from '../repositories/userRepository';
|
||||
import { isSystemRole, PERMISSION_CATALOG } from '../rbac/permissionCatalog';
|
||||
|
||||
export type RoleDto = {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string | null;
|
||||
isSystem: boolean;
|
||||
permissionKeys: string[];
|
||||
userCount: number;
|
||||
};
|
||||
|
||||
export type PermissionDto = {
|
||||
key: string;
|
||||
description: string | null;
|
||||
category: string | null;
|
||||
resource: string | null;
|
||||
action: string | null;
|
||||
};
|
||||
|
||||
export async function listPermissions(): Promise<{ categories: Record<string, PermissionDto[]> }> {
|
||||
const rows = await roleRepository.listAllPermissions();
|
||||
const categories: Record<string, PermissionDto[]> = {};
|
||||
for (const row of rows) {
|
||||
const cat = row.category ?? 'other';
|
||||
if (!categories[cat]) categories[cat] = [];
|
||||
categories[cat].push({
|
||||
key: row.key,
|
||||
description: row.description,
|
||||
category: row.category,
|
||||
resource: row.resource,
|
||||
action: row.action,
|
||||
});
|
||||
}
|
||||
return { categories };
|
||||
}
|
||||
|
||||
export async function listRoles(): Promise<RoleDto[]> {
|
||||
const roles = await roleRepository.listAllRoles();
|
||||
const result: RoleDto[] = [];
|
||||
for (const role of roles) {
|
||||
const permissionKeys = await roleRepository.getRolePermissionKeys(role.id);
|
||||
const userCount = await roleRepository.countUsersWithRoleId(role.id);
|
||||
result.push({
|
||||
id: role.id,
|
||||
name: role.name,
|
||||
description: role.description,
|
||||
isSystem: role.is_system,
|
||||
permissionKeys,
|
||||
userCount,
|
||||
});
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export async function getRole(roleId: number): Promise<RoleDto | null> {
|
||||
const role = await roleRepository.findRoleById(roleId);
|
||||
if (!role) return null;
|
||||
const permissionKeys = await roleRepository.getRolePermissionKeys(roleId);
|
||||
const userCount = await roleRepository.countUsersWithRoleId(roleId);
|
||||
return {
|
||||
id: role.id,
|
||||
name: role.name,
|
||||
description: role.description,
|
||||
isSystem: role.is_system,
|
||||
permissionKeys,
|
||||
userCount,
|
||||
};
|
||||
}
|
||||
|
||||
function validateCustomRoleName(name: string): string {
|
||||
const trimmed = name.trim().toLowerCase().replace(/\s+/g, '_');
|
||||
if (trimmed.length < 2 || trimmed.length > 50) {
|
||||
throw new Error('Role name must be between 2 and 50 characters');
|
||||
}
|
||||
if (!/^[a-z][a-z0-9_]*$/.test(trimmed)) {
|
||||
throw new Error('Role name must start with a letter and contain only letters, numbers, and underscores');
|
||||
}
|
||||
if (isSystemRole(trimmed)) {
|
||||
throw new Error('This name is reserved for a system role');
|
||||
}
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
function validatePermissionKeys(keys: string[]): string[] {
|
||||
const catalogKeys = new Set(PERMISSION_CATALOG.map((p) => p.key));
|
||||
const unique = [...new Set(keys)];
|
||||
for (const k of unique) {
|
||||
if (!catalogKeys.has(k)) {
|
||||
throw new Error(`Unknown permission: ${k}`);
|
||||
}
|
||||
}
|
||||
return unique;
|
||||
}
|
||||
|
||||
export async function createRole(
|
||||
input: { name: string; description?: string; permissionKeys: string[] },
|
||||
actorUserId: string
|
||||
): Promise<RoleDto> {
|
||||
const name = validateCustomRoleName(input.name);
|
||||
const existing = await roleRepository.findRoleByName(name);
|
||||
if (existing) throw new Error('A role with this name already exists');
|
||||
|
||||
const permissionKeys = validatePermissionKeys(input.permissionKeys);
|
||||
const role = await roleRepository.createRole({
|
||||
name,
|
||||
description: input.description?.trim() || null,
|
||||
isSystem: false,
|
||||
});
|
||||
await roleRepository.setRolePermissions(role.id, permissionKeys);
|
||||
|
||||
await auditLogRepository.create({
|
||||
userId: actorUserId,
|
||||
action: 'rbac_role_created',
|
||||
resourceType: 'role',
|
||||
resourceId: String(role.id),
|
||||
metadata: { name, permissionKeys },
|
||||
});
|
||||
|
||||
return (await getRole(role.id))!;
|
||||
}
|
||||
|
||||
export async function updateRole(
|
||||
roleId: number,
|
||||
input: { name?: string; description?: string; permissionKeys?: string[] },
|
||||
actorUserId: string
|
||||
): Promise<RoleDto> {
|
||||
const role = await roleRepository.findRoleById(roleId);
|
||||
if (!role) throw new Error('Role not found');
|
||||
|
||||
let newName = role.name;
|
||||
if (input.name !== undefined) {
|
||||
if (role.is_system) {
|
||||
throw new Error('System role names cannot be changed');
|
||||
}
|
||||
newName = validateCustomRoleName(input.name);
|
||||
const existing = await roleRepository.findRoleByName(newName);
|
||||
if (existing && existing.id !== roleId) {
|
||||
throw new Error('A role with this name already exists');
|
||||
}
|
||||
}
|
||||
|
||||
const description =
|
||||
input.description !== undefined ? input.description.trim() || null : role.description;
|
||||
|
||||
await roleRepository.updateRole(roleId, { name: newName, description });
|
||||
|
||||
if (input.permissionKeys !== undefined) {
|
||||
const permissionKeys = validatePermissionKeys(input.permissionKeys);
|
||||
await roleRepository.setRolePermissions(roleId, permissionKeys);
|
||||
await bumpTokenVersionForRoleUsers(roleId);
|
||||
}
|
||||
|
||||
await auditLogRepository.create({
|
||||
userId: actorUserId,
|
||||
action: 'rbac_role_updated',
|
||||
resourceType: 'role',
|
||||
resourceId: String(roleId),
|
||||
metadata: { name: newName, permissionKeys: input.permissionKeys },
|
||||
});
|
||||
|
||||
return (await getRole(roleId))!;
|
||||
}
|
||||
|
||||
export async function deleteRole(roleId: number, actorUserId: string): Promise<void> {
|
||||
const role = await roleRepository.findRoleById(roleId);
|
||||
if (!role) throw new Error('Role not found');
|
||||
if (role.is_system) throw new Error('System roles cannot be deleted');
|
||||
|
||||
const userCount = await roleRepository.countUsersWithRoleId(roleId);
|
||||
if (userCount > 0) {
|
||||
throw new Error(`Cannot delete role: ${userCount} user(s) still assigned. Remove the role from all users first.`);
|
||||
}
|
||||
|
||||
await roleRepository.deleteRole(roleId);
|
||||
|
||||
await auditLogRepository.create({
|
||||
userId: actorUserId,
|
||||
action: 'rbac_role_deleted',
|
||||
resourceType: 'role',
|
||||
resourceId: String(roleId),
|
||||
metadata: { name: role.name },
|
||||
});
|
||||
}
|
||||
|
||||
/** Invalidate JWTs for all users with this role after permission changes. */
|
||||
async function bumpTokenVersionForRoleUsers(roleId: number): Promise<void> {
|
||||
const userIds = await roleRepository.listUserIdsWithRole(roleId);
|
||||
for (const userId of userIds) {
|
||||
await userRepository.incrementTokenVersion(userId);
|
||||
}
|
||||
}
|
||||
|
||||
export async function bumpUserTokenOnRoleChange(userId: string): Promise<void> {
|
||||
await userRepository.incrementTokenVersion(userId);
|
||||
}
|
||||
@ -12,10 +12,11 @@ export interface JwtPayload {
|
||||
userId: string;
|
||||
emailHash: string;
|
||||
/** @deprecated Use roles[] — kept for backward compatibility during transition */
|
||||
role?: RoleName;
|
||||
roles: RoleName[];
|
||||
role?: string;
|
||||
/** System roles (user, admin, …) and custom RBAC role names. */
|
||||
roles: string[];
|
||||
permissions: string[];
|
||||
primaryRole: RoleName;
|
||||
primaryRole: string;
|
||||
/** JWT credential version — must match users.token_version (invalidated on password change). */
|
||||
tv?: number;
|
||||
}
|
||||
|
||||
45
backend/src/utils/adminUserSearch.ts
Normal file
45
backend/src/utils/adminUserSearch.ts
Normal file
@ -0,0 +1,45 @@
|
||||
/**
|
||||
* Helpers for admin user list free-text search (ID, email hash, name, referral).
|
||||
*/
|
||||
|
||||
const UUID_RE =
|
||||
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||
const UUID_HEX32_RE = /^[0-9a-f]{32}$/i;
|
||||
const UUID_PREFIX_RE = /^[0-9a-f-]{8,36}$/i;
|
||||
|
||||
/** Normalize braces/case/hyphenless forms into canonical lowercase UUID, or null. */
|
||||
export function tryParseUuid(term: string): string | null {
|
||||
const cleaned = term.trim().replace(/^\{|\}$/g, '').toLowerCase();
|
||||
if (UUID_RE.test(cleaned)) return cleaned;
|
||||
if (UUID_HEX32_RE.test(cleaned)) {
|
||||
return `${cleaned.slice(0, 8)}-${cleaned.slice(8, 12)}-${cleaned.slice(12, 16)}-${cleaned.slice(16, 20)}-${cleaned.slice(20)}`;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export function looksLikeEmail(term: string): boolean {
|
||||
return term.includes('@') && !/\s/.test(term);
|
||||
}
|
||||
|
||||
/** Escape `%` / `_` / `\` for ILIKE / LIKE patterns. */
|
||||
export function escapeLikePattern(term: string): string {
|
||||
return term.replace(/\\/g, '\\\\').replace(/%/g, '\\%').replace(/_/g, '\\_');
|
||||
}
|
||||
|
||||
export type AdminSearchKind = 'uuid' | 'email' | 'general';
|
||||
|
||||
export function classifyAdminUserSearch(term: string): AdminSearchKind {
|
||||
const t = term.trim();
|
||||
if (!t) return 'general';
|
||||
if (tryParseUuid(t)) return 'uuid';
|
||||
if (looksLikeEmail(t)) return 'email';
|
||||
return 'general';
|
||||
}
|
||||
|
||||
/** True when the term is a plausible UUID prefix (min 8 hex digits ignoring hyphens). */
|
||||
export function isUuidPrefix(term: string): boolean {
|
||||
const t = term.trim().toLowerCase();
|
||||
if (!UUID_PREFIX_RE.test(t)) return false;
|
||||
const hex = t.replace(/-/g, '');
|
||||
return hex.length >= 8 && hex.length < 32 && /^[0-9a-f]+$/.test(hex);
|
||||
}
|
||||
@ -14,6 +14,7 @@ export const CURSOR_PAGINATED_REPORT_KEYS = new Set([
|
||||
'financial-withdrawals',
|
||||
'financial-bonuses',
|
||||
'financial-encouragement-grants',
|
||||
'financial-commission-history',
|
||||
'financial-adjustments',
|
||||
'games-predictions',
|
||||
'games-predictions-real',
|
||||
|
||||
@ -1,19 +1,37 @@
|
||||
import type { RoleName } from '../models';
|
||||
import type { JwtPayload } from '../types';
|
||||
|
||||
type RoleCarrier = Pick<JwtPayload, 'roles' | 'role'> | { roles?: RoleName[]; role?: RoleName | string };
|
||||
type RoleCarrier = Pick<JwtPayload, 'roles' | 'role' | 'permissions'> | {
|
||||
roles?: string[];
|
||||
role?: RoleName | string;
|
||||
permissions?: string[];
|
||||
};
|
||||
|
||||
const COARSE_ADMIN_PERMISSIONS = new Set([
|
||||
'users.admin',
|
||||
'games.admin',
|
||||
'reports.admin',
|
||||
'settings.admin',
|
||||
'referral.admin',
|
||||
'treasury.view',
|
||||
'security.admin',
|
||||
'ledger.credit',
|
||||
'user.manage_roles',
|
||||
'fund_operation.request',
|
||||
'fund_operation.approve',
|
||||
]);
|
||||
|
||||
/**
|
||||
* Resolves the effective role list from JWT claims (supports legacy single-role tokens).
|
||||
*/
|
||||
export function userRoleList(user: RoleCarrier): RoleName[] {
|
||||
export function userRoleList(user: RoleCarrier): string[] {
|
||||
if (user.roles?.length) return user.roles;
|
||||
if (user.role) return [user.role as RoleName];
|
||||
if (user.role) return [user.role as string];
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* True when the user has platform administrator access (admin or super_admin).
|
||||
* True when the user has platform administrator access (admin or super_admin role).
|
||||
*/
|
||||
export function hasAdminAccess(user: RoleCarrier): boolean {
|
||||
const roles = userRoleList(user);
|
||||
@ -21,9 +39,28 @@ export function hasAdminAccess(user: RoleCarrier): boolean {
|
||||
}
|
||||
|
||||
/**
|
||||
* True when the user has staff desk access (moderator, admin, or super_admin).
|
||||
* True when the user can access the admin panel (system admin roles or any admin permission).
|
||||
*/
|
||||
export function hasAdminPanelAccess(user: RoleCarrier): boolean {
|
||||
if (hasAdminAccess(user)) return true;
|
||||
const perms = user.permissions ?? [];
|
||||
return perms.some(
|
||||
(p) => p.startsWith('admin.') || COARSE_ADMIN_PERMISSIONS.has(p)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* True when the user has staff desk access (moderator, admin, super_admin, or support permissions).
|
||||
*/
|
||||
export function hasStaffAccess(user: RoleCarrier): boolean {
|
||||
const roles = userRoleList(user);
|
||||
return roles.includes('moderator') || hasAdminAccess(user);
|
||||
if (roles.includes('moderator') || hasAdminAccess(user)) return true;
|
||||
const perms = user.permissions ?? [];
|
||||
return perms.some(
|
||||
(p) =>
|
||||
p.startsWith('admin.support.') ||
|
||||
p.startsWith('admin.faq.') ||
|
||||
p === 'security.admin' ||
|
||||
p.startsWith('admin.security.')
|
||||
);
|
||||
}
|
||||
|
||||
@ -7,6 +7,8 @@ import '../../../l10n/app_strings.dart';
|
||||
import '../../../shared/widgets/pred_text_field.dart';
|
||||
import 'widgets/referral_member_card.dart';
|
||||
|
||||
const _pageSize = 15;
|
||||
|
||||
/// Full list of the user's direct (level-1) referrals.
|
||||
class ReferralDirectsScreen extends StatefulWidget {
|
||||
const ReferralDirectsScreen({super.key});
|
||||
@ -20,6 +22,7 @@ class _ReferralDirectsScreenState extends State<ReferralDirectsScreen> {
|
||||
bool _loading = true;
|
||||
String? _error;
|
||||
List<ReferralNetworkMember> _members = [];
|
||||
int _visibleCount = _pageSize;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@ -37,6 +40,7 @@ class _ReferralDirectsScreenState extends State<ReferralDirectsScreen> {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_members = dashboard.directMembers;
|
||||
_visibleCount = _pageSize;
|
||||
_loading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
@ -51,6 +55,9 @@ class _ReferralDirectsScreenState extends State<ReferralDirectsScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final s = context.strings;
|
||||
final visible = _members.take(_visibleCount).toList();
|
||||
final remaining = _members.length - visible.length;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(s.directReferrals)),
|
||||
body: _loading
|
||||
@ -82,10 +89,21 @@ class _ReferralDirectsScreenState extends State<ReferralDirectsScreen> {
|
||||
parent: BouncingScrollPhysics(),
|
||||
),
|
||||
padding: const EdgeInsets.fromLTRB(20, 16, 20, 28),
|
||||
itemCount: _members.length,
|
||||
itemCount: visible.length + (remaining > 0 ? 1 : 0),
|
||||
separatorBuilder: (_, __) => const SizedBox(height: 10),
|
||||
itemBuilder: (context, index) {
|
||||
return ReferralMemberCard(member: _members[index]);
|
||||
if (index >= visible.length) {
|
||||
return TextButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
_visibleCount = (_visibleCount + _pageSize)
|
||||
.clamp(0, _members.length);
|
||||
});
|
||||
},
|
||||
child: Text(s.loadMoreRemaining(remaining)),
|
||||
);
|
||||
}
|
||||
return ReferralMemberCard(member: visible[index]);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
||||
@ -24,6 +24,8 @@ class _ReferralScreenState extends State<ReferralScreen> {
|
||||
List<ReferralCommissionModel> _commissions = [];
|
||||
bool _loading = true;
|
||||
String? _error;
|
||||
static const _commissionsPageSize = 10;
|
||||
int _visibleCommissions = _commissionsPageSize;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@ -43,6 +45,7 @@ class _ReferralScreenState extends State<ReferralScreen> {
|
||||
setState(() {
|
||||
_dashboard = dashboard;
|
||||
_commissions = commissions.items;
|
||||
_visibleCommissions = _commissionsPageSize;
|
||||
_loading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
@ -265,7 +268,7 @@ class _ReferralScreenState extends State<ReferralScreen> {
|
||||
Text(s.recentCommissions,
|
||||
style: Theme.of(context).textTheme.titleMedium),
|
||||
const SizedBox(height: 8),
|
||||
..._commissions.take(10).map(
|
||||
..._commissions.take(_visibleCommissions).map(
|
||||
(c) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
child: PredCard(
|
||||
@ -291,6 +294,21 @@ class _ReferralScreenState extends State<ReferralScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
if (_commissions.length > _visibleCommissions)
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
_visibleCommissions =
|
||||
(_visibleCommissions + _commissionsPageSize)
|
||||
.clamp(0, _commissions.length);
|
||||
});
|
||||
},
|
||||
child: Text(
|
||||
s.loadMoreRemaining(
|
||||
_commissions.length - _visibleCommissions,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
|
||||
@ -5,7 +5,7 @@ import '../../../../l10n/app_strings.dart';
|
||||
import '../../utils/referral_display.dart';
|
||||
|
||||
/// Expandable tree of commission-eligible referral levels.
|
||||
class ReferralNetworkTree extends StatelessWidget {
|
||||
class ReferralNetworkTree extends StatefulWidget {
|
||||
const ReferralNetworkTree({
|
||||
super.key,
|
||||
required this.members,
|
||||
@ -17,17 +17,35 @@ class ReferralNetworkTree extends StatelessWidget {
|
||||
final String rootUserId;
|
||||
final ReferralReferrerModel? referrer;
|
||||
|
||||
@override
|
||||
State<ReferralNetworkTree> createState() => _ReferralNetworkTreeState();
|
||||
}
|
||||
|
||||
class _ReferralNetworkTreeState extends State<ReferralNetworkTree> {
|
||||
static const _rootBatch = 12;
|
||||
int _visibleRoots = _rootBatch;
|
||||
|
||||
@override
|
||||
void didUpdateWidget(covariant ReferralNetworkTree oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
if (oldWidget.members != widget.members || oldWidget.rootUserId != widget.rootUserId) {
|
||||
_visibleRoots = _rootBatch;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final s = context.strings;
|
||||
final childMap = buildReferralChildMap(members);
|
||||
final roots = childMap[rootUserId] ?? const <ReferralNetworkMember>[];
|
||||
final childMap = buildReferralChildMap(widget.members);
|
||||
final roots = childMap[widget.rootUserId] ?? const <ReferralNetworkMember>[];
|
||||
final visibleRoots = roots.take(_visibleRoots).toList();
|
||||
final remaining = roots.length - visibleRoots.length;
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
if (referrer != null) ...[
|
||||
_ReferrerBanner(referrer: referrer!),
|
||||
if (widget.referrer != null) ...[
|
||||
_ReferrerBanner(referrer: widget.referrer!),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
if (roots.isEmpty)
|
||||
@ -41,8 +59,8 @@ class ReferralNetworkTree extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
...roots.map(
|
||||
else ...[
|
||||
...visibleRoots.map(
|
||||
(m) => _TreeNode(
|
||||
member: m,
|
||||
childMap: childMap,
|
||||
@ -50,6 +68,19 @@ class ReferralNetworkTree extends StatelessWidget {
|
||||
initiallyExpanded: true,
|
||||
),
|
||||
),
|
||||
if (remaining > 0)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 4),
|
||||
child: TextButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
_visibleRoots = (_visibleRoots + _rootBatch).clamp(0, roots.length);
|
||||
});
|
||||
},
|
||||
child: Text(s.loadMoreRemaining(remaining)),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@ -461,6 +461,9 @@ class AppStrings {
|
||||
'Solde insuffisant sur le portefeuille $wallet pour cette mise.',
|
||||
);
|
||||
String get loadMore => t('Load more', 'Voir plus');
|
||||
String loadMoreRemaining(int remaining) =>
|
||||
t('Load more ($remaining left)', 'Voir plus ($remaining restants)');
|
||||
String get showLess => t('Show less', 'Voir moins');
|
||||
String get historyEndReached => t(
|
||||
'You’ve reached the end of your prediction history',
|
||||
'Vous avez atteint la fin de l’historique des prédictions',
|
||||
|
||||
@ -37,6 +37,7 @@ import { SupportAdminPage } from '../../features/support/SupportAdminPage';
|
||||
import { FaqPublicPage } from '../../features/faq/FaqPublicPage';
|
||||
import { FaqPage } from '../../features/faq/FaqPage';
|
||||
import { FaqAdminPage } from '../../features/faq/FaqAdminPage';
|
||||
import { RoleManagementPage } from '../../features/rbac/RoleManagementPage';
|
||||
import { GamePlayRoute } from '../../features/games/GamePlayRoute';
|
||||
|
||||
/** Browser router instance with login, dashboard, options, and admin route trees. */
|
||||
@ -114,6 +115,7 @@ export const router = createBrowserRouter([
|
||||
{ path: 'admin/solo-encouragement', element: <SoloEncouragementAdminPage /> },
|
||||
{ path: 'admin/countries', element: <CountriesAdminPage /> },
|
||||
{ path: 'admin/network', element: <NetworkStatusPage /> },
|
||||
{ path: 'admin/rbac', element: <RoleManagementPage /> },
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
@ -39,6 +39,7 @@ import { PageHeader, RefreshIconButton } from '../../shared/components/PageHeade
|
||||
import type { Advertisement, AdvertisementInput, Game, GameImplementationOption, GameInput } from '../home/types';
|
||||
import { hasWebImplementation } from '../games/registry';
|
||||
import { CandlePredictConfigPanel } from './CandlePredictConfigPanel';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
type TabKey = 'games' | 'ads' | 'candle';
|
||||
|
||||
@ -244,6 +245,7 @@ export function CatalogAdminPage() {
|
||||
|
||||
{tab === 'games' && (
|
||||
<Stack spacing={2}>
|
||||
<PermissionGate permission="admin.games.edit">
|
||||
<Button
|
||||
variant="contained"
|
||||
startIcon={<AddRoundedIcon />}
|
||||
@ -252,6 +254,7 @@ export function CatalogAdminPage() {
|
||||
>
|
||||
{t('admin.catalog.addGame')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{gamesQ.isLoading ? (
|
||||
<Alert severity="info">{t('admin.catalog.loadingGames')}</Alert>
|
||||
) : (
|
||||
@ -283,9 +286,12 @@ export function CatalogAdminPage() {
|
||||
</Typography>
|
||||
</Box>
|
||||
<Stack direction="row" spacing={0.5} sx={{ alignItems: 'center' }}>
|
||||
<PermissionGate permission="admin.games.edit">
|
||||
<IconButton size="small" onClick={() => openEditGame(game)} aria-label={t('admin.catalog.editGame')}>
|
||||
<EditRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</PermissionGate>
|
||||
<PermissionGate permission="admin.games.delete">
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
@ -295,6 +301,7 @@ export function CatalogAdminPage() {
|
||||
>
|
||||
{t('admin.catalog.deactivate')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</Stack>
|
||||
<Stack direction="row" spacing={0.75} useFlexGap sx={{ flexWrap: 'wrap' }}>
|
||||
@ -326,6 +333,7 @@ export function CatalogAdminPage() {
|
||||
|
||||
{tab === 'ads' && (
|
||||
<Stack spacing={2}>
|
||||
<PermissionGate permission="admin.games.edit">
|
||||
<Button
|
||||
variant="contained"
|
||||
startIcon={<AddRoundedIcon />}
|
||||
@ -334,6 +342,7 @@ export function CatalogAdminPage() {
|
||||
>
|
||||
{t('admin.catalog.addAd')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{adsQ.isLoading ? (
|
||||
<Alert severity="info">{t('admin.catalog.loadingAds')}</Alert>
|
||||
) : (
|
||||
@ -365,9 +374,12 @@ export function CatalogAdminPage() {
|
||||
</Typography>
|
||||
</Box>
|
||||
<Stack direction="row" spacing={0.5}>
|
||||
<PermissionGate permission="admin.games.edit">
|
||||
<IconButton size="small" onClick={() => openEditAd(ad)}>
|
||||
<EditRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</PermissionGate>
|
||||
<PermissionGate permission="admin.games.delete">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
@ -375,6 +387,7 @@ export function CatalogAdminPage() {
|
||||
>
|
||||
<DeleteOutlineRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</Stack>
|
||||
<Stack direction="row" spacing={0.75} useFlexGap sx={{ flexWrap: 'wrap' }}>
|
||||
|
||||
@ -24,7 +24,9 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
type CountryRow = {
|
||||
code: string;
|
||||
@ -34,6 +36,8 @@ type CountryRow = {
|
||||
|
||||
export function CountriesAdminPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canEditCountries = can('admin.countries.edit');
|
||||
const qc = useQueryClient();
|
||||
const [search, setSearch] = useState('');
|
||||
const [showBlockedOnly, setShowBlockedOnly] = useState(false);
|
||||
@ -87,6 +91,7 @@ export function CountriesAdminPage() {
|
||||
<Typography variant="h4" sx={{ fontWeight: 900, flex: 1, fontSize: { xs: '1.65rem', sm: '2.125rem' } }}>
|
||||
{t('admin.countries.title')}
|
||||
</Typography>
|
||||
<PermissionGate permission="admin.countries.edit">
|
||||
<Button
|
||||
variant="outlined"
|
||||
startIcon={<SyncRoundedIcon />}
|
||||
@ -96,6 +101,7 @@ export function CountriesAdminPage() {
|
||||
>
|
||||
{t('admin.countries.sync')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
|
||||
<Typography sx={{ opacity: 0.75, mb: 2 }}>
|
||||
@ -175,7 +181,7 @@ export function CountriesAdminPage() {
|
||||
<TableCell>
|
||||
<Switch
|
||||
checked={c.registrationAllowed}
|
||||
disabled={toggleMut.isPending}
|
||||
disabled={toggleMut.isPending || !canEditCountries}
|
||||
onChange={(e) =>
|
||||
toggleMut.mutate({ code: c.code, registrationAllowed: e.target.checked })
|
||||
}
|
||||
|
||||
@ -42,6 +42,7 @@ import {
|
||||
import { FaqRichEditor } from './components/FaqRichEditor';
|
||||
import { faqCategoryLabel } from './faqCategoryI18n';
|
||||
import type { FaqCategory, FaqEntry } from './types';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
type TabKey = 'entries' | 'categories';
|
||||
|
||||
@ -264,9 +265,11 @@ export function FaqAdminPage() {
|
||||
<MenuItem value="inactive">{t('admin.faqAdmin.inactiveEntries')}</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
<PermissionGate permission="admin.faq.manage">
|
||||
<Button startIcon={<AddRoundedIcon />} variant="contained" onClick={openCreateEntry}>
|
||||
{t('admin.faqAdmin.newEntry')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
|
||||
{(entriesQ.error || saveEntryM.error) && (
|
||||
@ -306,6 +309,7 @@ export function FaqAdminPage() {
|
||||
{entry.updatedAt ? ` · ${new Date(entry.updatedAt).toLocaleString()}` : ''}
|
||||
</Typography>
|
||||
</Box>
|
||||
<PermissionGate permission="admin.faq.manage">
|
||||
<IconButton size="small" onClick={() => openEditEntry(entry)}>
|
||||
<EditRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
@ -318,6 +322,7 @@ export function FaqAdminPage() {
|
||||
>
|
||||
<DeleteOutlineRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</Paper>
|
||||
))}
|
||||
@ -331,9 +336,11 @@ export function FaqAdminPage() {
|
||||
{tab === 'categories' && (
|
||||
<>
|
||||
<Stack direction="row" sx={{ mb: 2, justifyContent: 'flex-end' }}>
|
||||
<PermissionGate permission="admin.faq.manage">
|
||||
<Button startIcon={<AddRoundedIcon />} variant="contained" onClick={openCreateCat}>
|
||||
{t('admin.faqAdmin.newCategory')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
<Stack spacing={1}>
|
||||
{categories.map((cat) => (
|
||||
@ -346,6 +353,7 @@ export function FaqAdminPage() {
|
||||
{cat.isActive === false ? t('admin.faqAdmin.categoryInactive') : ''}
|
||||
</Typography>
|
||||
</Box>
|
||||
<PermissionGate permission="admin.faq.manage">
|
||||
<IconButton size="small" onClick={() => openEditCat(cat)}>
|
||||
<EditRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
@ -360,6 +368,7 @@ export function FaqAdminPage() {
|
||||
>
|
||||
<DeleteOutlineRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</Paper>
|
||||
))}
|
||||
|
||||
@ -18,8 +18,11 @@ import SecurityRoundedIcon from '@mui/icons-material/SecurityRounded';
|
||||
import ShieldRoundedIcon from '@mui/icons-material/ShieldRounded';
|
||||
import HeadsetMicRoundedIcon from '@mui/icons-material/HeadsetMicRounded';
|
||||
import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded';
|
||||
import AdminPanelSettingsRoundedIcon from '@mui/icons-material/AdminPanelSettingsRounded';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { OPTIONS_CARD_PERMISSIONS } from '../../shared/auth/permissions';
|
||||
|
||||
type OptionCardKey =
|
||||
| 'users'
|
||||
@ -35,7 +38,8 @@ type OptionCardKey =
|
||||
| 'network'
|
||||
| 'faq'
|
||||
| 'support'
|
||||
| 'countries';
|
||||
| 'countries'
|
||||
| 'rbac';
|
||||
|
||||
type OptionCardConfig = {
|
||||
key: OptionCardKey;
|
||||
@ -175,12 +179,27 @@ const OPTION_CARDS: OptionCardConfig[] = [
|
||||
bg: 'rgba(33,150,243,0.16)',
|
||||
border: 'rgba(33,150,243,0.22)',
|
||||
},
|
||||
{
|
||||
key: 'rbac',
|
||||
path: '/admin/rbac',
|
||||
icon: AdminPanelSettingsRoundedIcon,
|
||||
badgeKey: 'accessControl',
|
||||
badgeColor: 'secondary',
|
||||
bg: 'rgba(124,92,255,0.16)',
|
||||
border: 'rgba(124,92,255,0.22)',
|
||||
},
|
||||
];
|
||||
|
||||
/** Landing page for administrative tools and configuration shortcuts. */
|
||||
export function OptionsPage() {
|
||||
const { t } = useTranslation();
|
||||
const nav = useNavigate();
|
||||
const { can } = useAuth();
|
||||
|
||||
const visibleCards = OPTION_CARDS.filter((card) => {
|
||||
const perm = OPTIONS_CARD_PERMISSIONS[card.key];
|
||||
return !perm || can(perm);
|
||||
});
|
||||
|
||||
return (
|
||||
<Box sx={{ minWidth: 0 }}>
|
||||
@ -199,7 +218,7 @@ export function OptionsPage() {
|
||||
gridTemplateColumns: { xs: '1fr', md: 'repeat(12, 1fr)' },
|
||||
}}
|
||||
>
|
||||
{OPTION_CARDS.map((card) => {
|
||||
{visibleCards.map((card) => {
|
||||
const Icon = card.icon;
|
||||
return (
|
||||
<Card key={card.key} sx={{ gridColumn: { xs: '1 / -1', md: 'span 6' }, borderRadius: 3 }}>
|
||||
|
||||
340
prediqo_web/src/features/rbac/RoleManagementPage.tsx
Normal file
340
prediqo_web/src/features/rbac/RoleManagementPage.tsx
Normal file
@ -0,0 +1,340 @@
|
||||
/**
|
||||
* Admin RBAC — create and manage custom roles with granular permissions.
|
||||
*/
|
||||
import {
|
||||
Alert,
|
||||
Box,
|
||||
Button,
|
||||
Checkbox,
|
||||
Chip,
|
||||
Dialog,
|
||||
DialogActions,
|
||||
DialogContent,
|
||||
DialogTitle,
|
||||
FormControlLabel,
|
||||
IconButton,
|
||||
Paper,
|
||||
Stack,
|
||||
TextField,
|
||||
Typography,
|
||||
} from '@mui/material';
|
||||
import AddRoundedIcon from '@mui/icons-material/AddRounded';
|
||||
import DeleteOutlineRoundedIcon from '@mui/icons-material/DeleteOutlineRounded';
|
||||
import EditRoundedIcon from '@mui/icons-material/EditRounded';
|
||||
import LockRoundedIcon from '@mui/icons-material/LockRounded';
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { PageHeader, RefreshIconButton } from '../../shared/components/PageHeader';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
|
||||
type PermissionDto = {
|
||||
key: string;
|
||||
description: string | null;
|
||||
category: string | null;
|
||||
};
|
||||
|
||||
type RoleDto = {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string | null;
|
||||
isSystem: boolean;
|
||||
permissionKeys: string[];
|
||||
userCount: number;
|
||||
};
|
||||
|
||||
type PermissionsResponse = { categories: Record<string, PermissionDto[]> };
|
||||
|
||||
export function RoleManagementPage() {
|
||||
const { t } = useTranslation();
|
||||
const qc = useQueryClient();
|
||||
const { can } = useAuth();
|
||||
const canManage = can('admin.rbac.manage');
|
||||
|
||||
const [dialogOpen, setDialogOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<RoleDto | null>(null);
|
||||
const [name, setName] = useState('');
|
||||
const [description, setDescription] = useState('');
|
||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const rolesQ = useQuery({
|
||||
queryKey: ['rbac-roles'],
|
||||
queryFn: async () => {
|
||||
const res = await api.get<{ roles: RoleDto[] }>('/api/v1/admin/rbac/roles');
|
||||
return res.data.roles;
|
||||
},
|
||||
});
|
||||
|
||||
const permsQ = useQuery({
|
||||
queryKey: ['rbac-permissions'],
|
||||
queryFn: async () => {
|
||||
const res = await api.get<PermissionsResponse>('/api/v1/admin/rbac/permissions');
|
||||
return res.data.categories;
|
||||
},
|
||||
});
|
||||
|
||||
const categories = useMemo(() => permsQ.data ?? {}, [permsQ.data]);
|
||||
|
||||
const saveMut = useMutation({
|
||||
mutationFn: async () => {
|
||||
const body = {
|
||||
name: name.trim(),
|
||||
description: description.trim() || undefined,
|
||||
permissionKeys: [...selected],
|
||||
};
|
||||
if (editing) {
|
||||
await api.patch(`/api/v1/admin/rbac/roles/${editing.id}`, body);
|
||||
} else {
|
||||
await api.post('/api/v1/admin/rbac/roles', body);
|
||||
}
|
||||
},
|
||||
onSuccess: async () => {
|
||||
await qc.invalidateQueries({ queryKey: ['rbac-roles'] });
|
||||
closeDialog();
|
||||
},
|
||||
onError: (e: unknown) => {
|
||||
setError((e as { response?: { data?: { error?: string } } })?.response?.data?.error ?? t('admin.rbac.saveFailed'));
|
||||
},
|
||||
});
|
||||
|
||||
const deleteMut = useMutation({
|
||||
mutationFn: async (roleId: number) => {
|
||||
await api.delete(`/api/v1/admin/rbac/roles/${roleId}`);
|
||||
},
|
||||
onSuccess: () => qc.invalidateQueries({ queryKey: ['rbac-roles'] }),
|
||||
});
|
||||
|
||||
function openCreate() {
|
||||
setEditing(null);
|
||||
setName('');
|
||||
setDescription('');
|
||||
setSelected(new Set());
|
||||
setError(null);
|
||||
setDialogOpen(true);
|
||||
}
|
||||
|
||||
function openEdit(role: RoleDto) {
|
||||
setEditing(role);
|
||||
setName(role.name);
|
||||
setDescription(role.description ?? '');
|
||||
setSelected(new Set(role.permissionKeys));
|
||||
setError(null);
|
||||
setDialogOpen(true);
|
||||
}
|
||||
|
||||
function closeDialog() {
|
||||
setDialogOpen(false);
|
||||
setEditing(null);
|
||||
setError(null);
|
||||
}
|
||||
|
||||
function togglePerm(key: string) {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
if (next.has(key)) next.delete(key);
|
||||
else next.add(key);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
function toggleCategory(keys: string[]) {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
const allOn = keys.every((k) => next.has(k));
|
||||
for (const k of keys) {
|
||||
if (allOn) next.delete(k);
|
||||
else next.add(k);
|
||||
}
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<Box sx={{ minWidth: 0 }}>
|
||||
<PageHeader
|
||||
title={t('admin.rbac.title')}
|
||||
subtitle={t('admin.rbac.subtitle')}
|
||||
actions={
|
||||
<>
|
||||
<RefreshIconButton onClick={() => rolesQ.refetch()} disabled={rolesQ.isFetching} />
|
||||
<PermissionGate permission="admin.rbac.manage">
|
||||
<Button variant="contained" startIcon={<AddRoundedIcon />} onClick={openCreate}>
|
||||
{t('admin.rbac.createRole')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</>
|
||||
}
|
||||
/>
|
||||
|
||||
{rolesQ.isError && (
|
||||
<Alert severity="error" sx={{ mb: 2 }}>
|
||||
{t('admin.rbac.loadFailed')}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<Stack spacing={2}>
|
||||
{(rolesQ.data ?? []).map((role) => (
|
||||
<Paper key={role.id} sx={{ p: 2.5, borderRadius: 3 }}>
|
||||
<Stack direction="row" spacing={2} sx={{ alignItems: 'flex-start' }}>
|
||||
<Box sx={{ flex: 1, minWidth: 0 }}>
|
||||
<Stack
|
||||
direction="row"
|
||||
spacing={1}
|
||||
sx={{ alignItems: 'center', flexWrap: 'wrap' }}
|
||||
useFlexGap
|
||||
>
|
||||
<Typography variant="h6" sx={{ fontWeight: 900 }}>
|
||||
{role.name}
|
||||
</Typography>
|
||||
{role.isSystem && (
|
||||
<Chip
|
||||
size="small"
|
||||
icon={<LockRoundedIcon />}
|
||||
label={t('admin.rbac.systemRole')}
|
||||
color="default"
|
||||
variant="outlined"
|
||||
/>
|
||||
)}
|
||||
<Chip
|
||||
size="small"
|
||||
label={t('admin.rbac.userCount', { count: role.userCount })}
|
||||
variant="outlined"
|
||||
/>
|
||||
<Chip
|
||||
size="small"
|
||||
label={t('admin.rbac.permissionCount', { count: role.permissionKeys.length })}
|
||||
variant="outlined"
|
||||
/>
|
||||
</Stack>
|
||||
{role.description && (
|
||||
<Typography sx={{ opacity: 0.75, mt: 0.5 }}>{role.description}</Typography>
|
||||
)}
|
||||
<Box sx={{ mt: 1.5, display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
|
||||
{role.permissionKeys.slice(0, 12).map((k) => (
|
||||
<Chip key={k} size="small" label={k} sx={{ fontSize: 10 }} />
|
||||
))}
|
||||
{role.permissionKeys.length > 12 && (
|
||||
<Chip size="small" label={`+${role.permissionKeys.length - 12}`} />
|
||||
)}
|
||||
</Box>
|
||||
</Box>
|
||||
{canManage && (
|
||||
<Stack direction="row" spacing={0.5}>
|
||||
<IconButton onClick={() => openEdit(role)} aria-label={t('admin.rbac.editRole')}>
|
||||
<EditRoundedIcon />
|
||||
</IconButton>
|
||||
{!role.isSystem && (
|
||||
<IconButton
|
||||
color="error"
|
||||
disabled={role.userCount > 0 || deleteMut.isPending}
|
||||
onClick={() => {
|
||||
if (window.confirm(t('admin.rbac.confirmDelete', { name: role.name }))) {
|
||||
deleteMut.mutate(role.id);
|
||||
}
|
||||
}}
|
||||
aria-label={t('admin.rbac.deleteRole')}
|
||||
>
|
||||
<DeleteOutlineRoundedIcon />
|
||||
</IconButton>
|
||||
)}
|
||||
</Stack>
|
||||
)}
|
||||
</Stack>
|
||||
</Paper>
|
||||
))}
|
||||
</Stack>
|
||||
|
||||
<Dialog open={dialogOpen} onClose={closeDialog} maxWidth="md" fullWidth>
|
||||
<DialogTitle>
|
||||
{editing ? t('admin.rbac.editRoleTitle', { name: editing.name }) : t('admin.rbac.createRole')}
|
||||
</DialogTitle>
|
||||
<DialogContent>
|
||||
<Stack spacing={2} sx={{ mt: 1 }}>
|
||||
{error && <Alert severity="error">{error}</Alert>}
|
||||
<TextField
|
||||
label={t('admin.rbac.roleName')}
|
||||
fullWidth
|
||||
value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
disabled={!!editing?.isSystem}
|
||||
helperText={t('admin.rbac.roleNameHint')}
|
||||
/>
|
||||
<TextField
|
||||
label={t('admin.rbac.roleDescription')}
|
||||
fullWidth
|
||||
multiline
|
||||
minRows={2}
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
/>
|
||||
<Typography variant="subtitle2" sx={{ fontWeight: 800 }}>
|
||||
{t('admin.rbac.permissions')}
|
||||
</Typography>
|
||||
{Object.entries(categories).map(([cat, perms]) => {
|
||||
const keys = perms.map((p) => p.key);
|
||||
const allSelected = keys.length > 0 && keys.every((k) => selected.has(k));
|
||||
const someSelected = keys.some((k) => selected.has(k));
|
||||
return (
|
||||
<Paper key={cat} variant="outlined" sx={{ p: 1.5, borderRadius: 2 }}>
|
||||
<FormControlLabel
|
||||
control={
|
||||
<Checkbox
|
||||
checked={allSelected}
|
||||
indeterminate={someSelected && !allSelected}
|
||||
onChange={() => toggleCategory(keys)}
|
||||
/>
|
||||
}
|
||||
label={
|
||||
<Typography sx={{ fontWeight: 800, textTransform: 'capitalize' }}>
|
||||
{t(`admin.rbac.categories.${cat}`, { defaultValue: cat.replace(/_/g, ' ') })}
|
||||
</Typography>
|
||||
}
|
||||
/>
|
||||
<Box sx={{ pl: 3, display: 'grid', gap: 0.5 }}>
|
||||
{perms.map((p) => (
|
||||
<FormControlLabel
|
||||
key={p.key}
|
||||
control={
|
||||
<Checkbox
|
||||
size="small"
|
||||
checked={selected.has(p.key)}
|
||||
onChange={() => togglePerm(p.key)}
|
||||
/>
|
||||
}
|
||||
label={
|
||||
<Box>
|
||||
<Typography variant="body2" sx={{ fontFamily: 'monospace', fontSize: 12 }}>
|
||||
{p.key}
|
||||
</Typography>
|
||||
{p.description && (
|
||||
<Typography variant="caption" sx={{ opacity: 0.7 }}>
|
||||
{p.description}
|
||||
</Typography>
|
||||
)}
|
||||
</Box>
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
</Paper>
|
||||
);
|
||||
})}
|
||||
</Stack>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button onClick={closeDialog}>{t('common.cancel')}</Button>
|
||||
<Button
|
||||
variant="contained"
|
||||
disabled={!name.trim() || saveMut.isPending}
|
||||
onClick={() => saveMut.mutate()}
|
||||
>
|
||||
{saveMut.isPending ? t('common.saving') : t('common.save')}
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
@ -30,6 +30,8 @@ import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { rawToHuman } from '../wallet/utils/walletFormat';
|
||||
|
||||
const USDT_DECIMALS = 6;
|
||||
@ -120,6 +122,8 @@ type ReviewQueueItem = {
|
||||
|
||||
export function ReferralAdminPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canManageReferral = can('admin.referral.manage');
|
||||
const qc = useQueryClient();
|
||||
const [levelForm, setLevelForm] = useState({
|
||||
levelNumber: '',
|
||||
@ -307,7 +311,7 @@ export function ReferralAdminPage() {
|
||||
<Typography variant="h6" sx={{ fontWeight: 800, mb: 2 }}>
|
||||
{t('admin.referralAdmin.programSettings')}
|
||||
</Typography>
|
||||
<Stack spacing={2}>
|
||||
<Stack spacing={2} component="fieldset" disabled={!canManageReferral} sx={{ border: 0, m: 0, p: 0, minWidth: 0 }}>
|
||||
<FormControlLabel
|
||||
control={
|
||||
<Switch
|
||||
@ -759,6 +763,7 @@ export function ReferralAdminPage() {
|
||||
</>
|
||||
)}
|
||||
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={() => saveSettingsMut.mutate(s)}
|
||||
@ -766,6 +771,10 @@ export function ReferralAdminPage() {
|
||||
>
|
||||
{t('admin.referralAdmin.saveSettings')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{!canManageReferral && (
|
||||
<Alert severity="info">{t('admin.referralAdmin.readOnlyHint')}</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
</CardContent>
|
||||
</Card>
|
||||
@ -804,6 +813,7 @@ export function ReferralAdminPage() {
|
||||
<Chip size="small" label={l.isActive ? t('common.yes') : t('common.no')} color={l.isActive ? 'success' : 'default'} />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Stack direction="row" spacing={1}>
|
||||
<Button
|
||||
size="small"
|
||||
@ -826,13 +836,14 @@ export function ReferralAdminPage() {
|
||||
{t('admin.referralAdmin.delete')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</ScrollableTable>
|
||||
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={1}>
|
||||
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={1} component="fieldset" disabled={!canManageReferral} sx={{ border: 0, m: 0, p: 0, minWidth: 0 }}>
|
||||
<TextField
|
||||
label={t('admin.referralAdmin.levelNumber')}
|
||||
type="number"
|
||||
@ -860,6 +871,7 @@ export function ReferralAdminPage() {
|
||||
onChange={(e) => setLevelForm((f) => ({ ...f, monthlyMaxCount: e.target.value }))}
|
||||
sx={{ flex: 1 }}
|
||||
/>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Button
|
||||
variant="outlined"
|
||||
onClick={() => {
|
||||
@ -876,6 +888,7 @@ export function ReferralAdminPage() {
|
||||
>
|
||||
{t('admin.referralAdmin.addUpdateLevel')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</CardContent>
|
||||
</Card>
|
||||
@ -897,7 +910,13 @@ export function ReferralAdminPage() {
|
||||
</Typography>
|
||||
))}
|
||||
</Stack>
|
||||
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={1} sx={{ alignItems: { sm: 'flex-start' } }}>
|
||||
<Stack
|
||||
direction={{ xs: 'column', sm: 'row' }}
|
||||
spacing={1}
|
||||
component="fieldset"
|
||||
disabled={!canManageReferral}
|
||||
sx={{ alignItems: { sm: 'flex-start' }, border: 0, m: 0, p: 0, minWidth: 0 }}
|
||||
>
|
||||
<FormControl sx={{ flex: 1, minWidth: 220 }}>
|
||||
<InputLabel id="fund-wallet-type-label">
|
||||
{t('admin.referralAdmin.walletType')}
|
||||
@ -921,6 +940,7 @@ export function ReferralAdminPage() {
|
||||
onChange={(e) => setFundForm((f) => ({ ...f, amountDisplay: e.target.value }))}
|
||||
sx={{ flex: 1 }}
|
||||
/>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={() => fundMut.mutate()}
|
||||
@ -929,6 +949,7 @@ export function ReferralAdminPage() {
|
||||
>
|
||||
{t('admin.referralAdmin.fundPool')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</CardContent>
|
||||
</Card>
|
||||
@ -983,6 +1004,7 @@ export function ReferralAdminPage() {
|
||||
<Typography variant="caption">{item.referredUserId.slice(0, 8)}…</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Stack spacing={1} sx={{ minWidth: 160 }}>
|
||||
<Button
|
||||
size="small"
|
||||
@ -1015,6 +1037,7 @@ export function ReferralAdminPage() {
|
||||
{t('admin.referralAdmin.reject')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
@ -1029,9 +1052,23 @@ export function ReferralAdminPage() {
|
||||
{stats && (
|
||||
<Card sx={{ borderRadius: 3 }}>
|
||||
<CardContent>
|
||||
<Typography variant="h6" sx={{ fontWeight: 800, mb: 2 }}>
|
||||
{t('admin.referralAdmin.statsTitle')}
|
||||
</Typography>
|
||||
<Stack
|
||||
direction={{ xs: 'column', sm: 'row' }}
|
||||
spacing={1}
|
||||
sx={{ alignItems: { sm: 'center' }, justifyContent: 'space-between', mb: 2 }}
|
||||
>
|
||||
<Typography variant="h6" sx={{ fontWeight: 800 }}>
|
||||
{t('admin.referralAdmin.statsTitle')}
|
||||
</Typography>
|
||||
<Button
|
||||
size="small"
|
||||
component={RouterLink}
|
||||
to="/admin/reports/financial-commission-history"
|
||||
variant="text"
|
||||
>
|
||||
{t('admin.referralAdmin.openCommissionReport')}
|
||||
</Button>
|
||||
</Stack>
|
||||
<Stack direction="row" spacing={1} sx={{ mb: 2, flexWrap: 'wrap' }} useFlexGap>
|
||||
<Chip label={t('admin.referralAdmin.referredUsers', { count: stats.referralSummary.totalReferred })} />
|
||||
<Chip
|
||||
|
||||
@ -26,6 +26,7 @@ import { useState } from 'react';
|
||||
import { Trans, useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
type FraudDashboard = {
|
||||
summary: {
|
||||
@ -284,6 +285,7 @@ export function ReferralFraudDashboardPage() {
|
||||
</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Stack direction="row" spacing={1}>
|
||||
<Button size="small" color="success" onClick={() => approveMut.mutate(item.id)}>
|
||||
{t('admin.referralAdmin.approve')}
|
||||
@ -301,6 +303,7 @@ export function ReferralFraudDashboardPage() {
|
||||
{t('admin.referralAdmin.reject')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
@ -394,6 +397,7 @@ export function ReferralFraudDashboardPage() {
|
||||
<Typography variant="caption">{p.beneficiaryUserId.slice(0, 8)}…</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={1}>
|
||||
<TextField
|
||||
size="small"
|
||||
@ -419,6 +423,7 @@ export function ReferralFraudDashboardPage() {
|
||||
{t('admin.referralFraud.clawback.action')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
@ -452,6 +457,7 @@ export function ReferralFraudDashboardPage() {
|
||||
value={exportTo}
|
||||
onChange={(e) => setExportTo(e.target.value)}
|
||||
/>
|
||||
<PermissionGate permission="admin.referral.manage">
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
@ -463,6 +469,7 @@ export function ReferralFraudDashboardPage() {
|
||||
? t('common.exporting')
|
||||
: t('admin.referralFraud.recentClawbacks.exportCsv')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
{exportError && (
|
||||
<Alert severity="error" sx={{ mb: 2 }}>
|
||||
|
||||
@ -35,6 +35,7 @@ import { buildReferralRegisterLink } from '../../shared/utils/referralLink';
|
||||
import { copyTextToClipboard } from '../../shared/utils/clipboard';
|
||||
|
||||
const USDT_DECIMALS = 6;
|
||||
const COMMISSIONS_PAGE_SIZE = 25;
|
||||
|
||||
function StatCard({ label, value, sub }: { label: string; value: string | number; sub?: string }) {
|
||||
return (
|
||||
@ -63,7 +64,9 @@ export function ReferralPage() {
|
||||
const [toast, setToast] = useState<string | null>(null);
|
||||
|
||||
const dashQ = useReferralDashboard();
|
||||
const commissionsQ = useReferralCommissions(30, 0);
|
||||
const [commissionsPage, setCommissionsPage] = useState(0);
|
||||
const commissionsQ = useReferralCommissions(COMMISSIONS_PAGE_SIZE, commissionsPage * COMMISSIONS_PAGE_SIZE);
|
||||
const commissionsTotal = commissionsQ.data?.total ?? 0;
|
||||
|
||||
const data = dashQ.data;
|
||||
const referralCode = data?.referralCode?.trim() ?? '';
|
||||
@ -340,14 +343,21 @@ export function ReferralPage() {
|
||||
</Card>
|
||||
|
||||
<Card sx={{ borderRadius: 3 }}>
|
||||
<CardContent>
|
||||
<CardContent sx={{ pb: 1 }}>
|
||||
<Typography variant="h6" sx={{ fontWeight: 800, mb: 2 }}>
|
||||
{t('referralPage.network.commissionHistory')}
|
||||
</Typography>
|
||||
{commissionsQ.isLoading ? (
|
||||
<Skeleton height={160} />
|
||||
) : (
|
||||
<ReferralCommissionsPanel items={commissionsQ.data?.items ?? []} />
|
||||
<ReferralCommissionsPanel
|
||||
items={commissionsQ.data?.items ?? []}
|
||||
page={commissionsPage}
|
||||
pageSize={COMMISSIONS_PAGE_SIZE}
|
||||
total={commissionsTotal}
|
||||
onPageChange={setCommissionsPage}
|
||||
loading={commissionsQ.isFetching}
|
||||
/>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import {
|
||||
Chip,
|
||||
Pagination,
|
||||
Stack,
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
@ -24,12 +26,27 @@ function statusColor(status: string): 'success' | 'warning' | 'error' | 'default
|
||||
|
||||
type ReferralCommissionsPanelProps = {
|
||||
items: ReferralCommissionItem[];
|
||||
page: number;
|
||||
pageSize: number;
|
||||
total: number;
|
||||
onPageChange: (page: number) => void;
|
||||
loading?: boolean;
|
||||
};
|
||||
|
||||
export function ReferralCommissionsPanel({ items }: ReferralCommissionsPanelProps) {
|
||||
export function ReferralCommissionsPanel({
|
||||
items,
|
||||
page,
|
||||
pageSize,
|
||||
total,
|
||||
onPageChange,
|
||||
loading = false,
|
||||
}: ReferralCommissionsPanelProps) {
|
||||
const { t } = useTranslation();
|
||||
const pageCount = Math.max(1, Math.ceil(total / pageSize));
|
||||
const from = total === 0 ? 0 : page * pageSize + 1;
|
||||
const to = Math.min(total, (page + 1) * pageSize);
|
||||
|
||||
if (items.length === 0) {
|
||||
if (items.length === 0 && total === 0) {
|
||||
return (
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t('referralPage.commissions.empty')}
|
||||
@ -38,57 +55,82 @@ export function ReferralCommissionsPanel({ items }: ReferralCommissionsPanelProp
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell>{t('referralPage.commissions.member')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.level')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.source')}</TableCell>
|
||||
<TableCell>{t('common.status')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.commissions.commission')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.date')}</TableCell>
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{items.map((c) => (
|
||||
<TableRow key={c.id}>
|
||||
<TableCell>{c.referredDisplayName}</TableCell>
|
||||
<TableCell>L{c.levelNumber}</TableCell>
|
||||
<TableCell>
|
||||
<Chip
|
||||
size="small"
|
||||
variant="outlined"
|
||||
label={
|
||||
c.commissionSource === 'prediction'
|
||||
? t('referralPage.commissions.prediction')
|
||||
: c.commissionSource === 'deposit'
|
||||
? t('referralPage.commissions.deposit')
|
||||
: t('referralPage.commissions.withdrawal')
|
||||
}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Chip size="small" label={c.status} color={statusColor(c.status)} variant="outlined" />
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
{rawToHuman(c.commissionAmountRaw, USDT_DECIMALS)} USDT
|
||||
<Typography variant="caption" color="text.secondary" sx={{ display: 'block' }}>
|
||||
{t('referralPage.commissions.percentOf', {
|
||||
percent: c.commissionPercent,
|
||||
amount: rawToHuman(c.baseAmountRaw, USDT_DECIMALS),
|
||||
})}
|
||||
</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="caption">
|
||||
{dayjs(c.paidAt ?? c.createdAt).format('DD MMM YYYY')}
|
||||
</Typography>
|
||||
</TableCell>
|
||||
<Stack spacing={1.5} sx={{ opacity: loading ? 0.7 : 1, transition: 'opacity 0.2s' }}>
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell>{t('referralPage.commissions.member')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.level')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.source')}</TableCell>
|
||||
<TableCell>{t('common.status')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.commissions.commission')}</TableCell>
|
||||
<TableCell>{t('referralPage.commissions.date')}</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</ScrollableTable>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{items.map((c) => (
|
||||
<TableRow key={c.id}>
|
||||
<TableCell>{c.referredDisplayName}</TableCell>
|
||||
<TableCell>L{c.levelNumber}</TableCell>
|
||||
<TableCell>
|
||||
<Chip
|
||||
size="small"
|
||||
variant="outlined"
|
||||
label={
|
||||
c.commissionSource === 'prediction'
|
||||
? t('referralPage.commissions.prediction')
|
||||
: c.commissionSource === 'deposit'
|
||||
? t('referralPage.commissions.deposit')
|
||||
: t('referralPage.commissions.withdrawal')
|
||||
}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Chip size="small" label={c.status} color={statusColor(c.status)} variant="outlined" />
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
{rawToHuman(c.commissionAmountRaw, USDT_DECIMALS)} USDT
|
||||
<Typography variant="caption" color="text.secondary" sx={{ display: 'block' }}>
|
||||
{t('referralPage.commissions.percentOf', {
|
||||
percent: c.commissionPercent,
|
||||
amount: rawToHuman(c.baseAmountRaw, USDT_DECIMALS),
|
||||
})}
|
||||
</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="caption">
|
||||
{dayjs(c.paidAt ?? c.createdAt).format('DD MMM YYYY')}
|
||||
</Typography>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</ScrollableTable>
|
||||
|
||||
{total > 0 && (
|
||||
<Stack
|
||||
direction={{ xs: 'column', sm: 'row' }}
|
||||
spacing={1}
|
||||
sx={{ alignItems: 'center', justifyContent: 'space-between' }}
|
||||
>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t('common.pagination', { from, to, total })}
|
||||
</Typography>
|
||||
{total > pageSize && (
|
||||
<Pagination
|
||||
count={pageCount}
|
||||
page={page + 1}
|
||||
onChange={(_, value) => onPageChange(value - 1)}
|
||||
color="primary"
|
||||
shape="rounded"
|
||||
size="medium"
|
||||
disabled={loading}
|
||||
/>
|
||||
)}
|
||||
</Stack>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import {
|
||||
Chip,
|
||||
Pagination,
|
||||
Stack,
|
||||
Table,
|
||||
TableBody,
|
||||
@ -9,12 +10,14 @@ import {
|
||||
Typography,
|
||||
} from '@mui/material';
|
||||
import dayjs from 'dayjs';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { ScrollableTable } from '../../../shared/components/ScrollableTable';
|
||||
import { rawToHuman } from '../../wallet/utils/walletFormat';
|
||||
import type { ReferralNetworkMember } from '../types';
|
||||
|
||||
const USDT_DECIMALS = 6;
|
||||
const PAGE_SIZE = 25;
|
||||
|
||||
function formatRaw(raw: string) {
|
||||
return `${rawToHuman(raw, USDT_DECIMALS)} USDT`;
|
||||
@ -26,6 +29,33 @@ type ReferralTableViewProps = {
|
||||
|
||||
export function ReferralTableView({ members }: ReferralTableViewProps) {
|
||||
const { t } = useTranslation();
|
||||
const [page, setPage] = useState(0);
|
||||
|
||||
const sorted = useMemo(
|
||||
() =>
|
||||
[...members].sort((a, b) => {
|
||||
if (a.levelNumber !== b.levelNumber) return a.levelNumber - b.levelNumber;
|
||||
return b.registeredAt.localeCompare(a.registeredAt);
|
||||
}),
|
||||
[members]
|
||||
);
|
||||
|
||||
const total = sorted.length;
|
||||
const pageCount = Math.max(1, Math.ceil(total / PAGE_SIZE));
|
||||
|
||||
useEffect(() => {
|
||||
if (page > 0 && page >= pageCount) {
|
||||
setPage(Math.max(0, pageCount - 1));
|
||||
}
|
||||
}, [page, pageCount]);
|
||||
|
||||
const pageItems = useMemo(() => {
|
||||
const start = page * PAGE_SIZE;
|
||||
return sorted.slice(start, start + PAGE_SIZE);
|
||||
}, [sorted, page]);
|
||||
|
||||
const from = total === 0 ? 0 : page * PAGE_SIZE + 1;
|
||||
const to = Math.min(total, (page + 1) * PAGE_SIZE);
|
||||
|
||||
function statusChip(status: ReferralNetworkMember['status']) {
|
||||
if (status === 'active') {
|
||||
@ -39,7 +69,7 @@ export function ReferralTableView({ members }: ReferralTableViewProps) {
|
||||
return <Chip size="small" label={t('referralPage.table.status.registered')} variant="outlined" />;
|
||||
}
|
||||
|
||||
if (members.length === 0) {
|
||||
if (total === 0) {
|
||||
return (
|
||||
<Typography variant="body2" color="text.secondary" sx={{ py: 3, textAlign: 'center' }}>
|
||||
{t('referralPage.table.empty')}
|
||||
@ -48,70 +78,92 @@ export function ReferralTableView({ members }: ReferralTableViewProps) {
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell>{t('referralPage.table.member')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.country')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.level')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.registered')}</TableCell>
|
||||
<TableCell>{t('common.status')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.directRefs')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.predictions')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.commissions')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.pending')}</TableCell>
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{members.map((m) => (
|
||||
<TableRow key={m.userId} hover>
|
||||
<TableCell>
|
||||
<Stack spacing={0.25}>
|
||||
<Typography variant="body2" sx={{ fontWeight: 700 }}>
|
||||
{m.displayName}
|
||||
</Typography>
|
||||
{m.email && (
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
{m.email}
|
||||
</Typography>
|
||||
)}
|
||||
{m.referralCode && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ fontFamily: 'monospace' }}>
|
||||
{m.referralCode}
|
||||
</Typography>
|
||||
)}
|
||||
</Stack>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="body2">{m.countryName ?? '—'}</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Chip size="small" label={`L${m.levelNumber}`} variant="outlined" />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="caption">{dayjs(m.registeredAt).format('DD MMM YYYY')}</Typography>
|
||||
</TableCell>
|
||||
<TableCell>{statusChip(m.status)}</TableCell>
|
||||
<TableCell align="right">{m.directReferralsCount}</TableCell>
|
||||
<TableCell align="right">{m.realPredictionsCount}</TableCell>
|
||||
<TableCell align="right">
|
||||
<Typography variant="body2" sx={{ fontWeight: 600 }}>
|
||||
{formatRaw(m.commissionsPaidRaw)}
|
||||
</Typography>
|
||||
{BigInt(m.commissionsGeneratedRaw) > BigInt(m.commissionsPaidRaw) && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ display: 'block' }}>
|
||||
{t('referralPage.table.total', { amount: formatRaw(m.commissionsGeneratedRaw) })}
|
||||
</Typography>
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
{BigInt(m.commissionsPendingRaw) > 0n ? formatRaw(m.commissionsPendingRaw) : '—'}
|
||||
</TableCell>
|
||||
<Stack spacing={1.5}>
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell>{t('referralPage.table.member')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.country')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.level')}</TableCell>
|
||||
<TableCell>{t('referralPage.table.registered')}</TableCell>
|
||||
<TableCell>{t('common.status')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.directRefs')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.predictions')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.commissions')}</TableCell>
|
||||
<TableCell align="right">{t('referralPage.table.pending')}</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</ScrollableTable>
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{pageItems.map((m) => (
|
||||
<TableRow key={m.userId} hover>
|
||||
<TableCell>
|
||||
<Stack spacing={0.25}>
|
||||
<Typography variant="body2" sx={{ fontWeight: 700 }}>
|
||||
{m.displayName}
|
||||
</Typography>
|
||||
{m.email && (
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
{m.email}
|
||||
</Typography>
|
||||
)}
|
||||
{m.referralCode && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ fontFamily: 'monospace' }}>
|
||||
{m.referralCode}
|
||||
</Typography>
|
||||
)}
|
||||
</Stack>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="body2">{m.countryName ?? '—'}</Typography>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Chip size="small" label={`L${m.levelNumber}`} variant="outlined" />
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="caption">{dayjs(m.registeredAt).format('DD MMM YYYY')}</Typography>
|
||||
</TableCell>
|
||||
<TableCell>{statusChip(m.status)}</TableCell>
|
||||
<TableCell align="right">{m.directReferralsCount}</TableCell>
|
||||
<TableCell align="right">{m.realPredictionsCount}</TableCell>
|
||||
<TableCell align="right">
|
||||
<Typography variant="body2" sx={{ fontWeight: 600 }}>
|
||||
{formatRaw(m.commissionsPaidRaw)}
|
||||
</Typography>
|
||||
{BigInt(m.commissionsGeneratedRaw) > BigInt(m.commissionsPaidRaw) && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ display: 'block' }}>
|
||||
{t('referralPage.table.total', { amount: formatRaw(m.commissionsGeneratedRaw) })}
|
||||
</Typography>
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
{BigInt(m.commissionsPendingRaw) > 0n ? formatRaw(m.commissionsPendingRaw) : '—'}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</ScrollableTable>
|
||||
|
||||
<Stack
|
||||
direction={{ xs: 'column', sm: 'row' }}
|
||||
spacing={1}
|
||||
sx={{ alignItems: 'center', justifyContent: 'space-between' }}
|
||||
>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t('common.pagination', { from, to, total })}
|
||||
</Typography>
|
||||
{total > PAGE_SIZE && (
|
||||
<Pagination
|
||||
count={pageCount}
|
||||
page={page + 1}
|
||||
onChange={(_, value) => setPage(value - 1)}
|
||||
color="primary"
|
||||
shape="rounded"
|
||||
size="medium"
|
||||
/>
|
||||
)}
|
||||
</Stack>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { useMemo, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
Chip,
|
||||
Collapse,
|
||||
IconButton,
|
||||
@ -16,6 +17,7 @@ import { rawToHuman } from '../../wallet/utils/walletFormat';
|
||||
import type { ReferralNetworkMember } from '../types';
|
||||
|
||||
const USDT_DECIMALS = 6;
|
||||
const ROOT_BATCH_SIZE = 15;
|
||||
|
||||
type TreeNodeProps = {
|
||||
member: ReferralNetworkMember;
|
||||
@ -129,6 +131,7 @@ type ReferralTreeViewProps = {
|
||||
|
||||
export function ReferralTreeView({ members, rootUserId }: ReferralTreeViewProps) {
|
||||
const { t } = useTranslation();
|
||||
const [visibleRoots, setVisibleRoots] = useState(ROOT_BATCH_SIZE);
|
||||
|
||||
const childMap = useMemo(() => {
|
||||
const map = new Map<string, ReferralNetworkMember[]>();
|
||||
@ -144,6 +147,8 @@ export function ReferralTreeView({ members, rootUserId }: ReferralTreeViewProps)
|
||||
}, [members]);
|
||||
|
||||
const directChildren = childMap.get(rootUserId) ?? [];
|
||||
const visibleChildren = directChildren.slice(0, visibleRoots);
|
||||
const hasMore = directChildren.length > visibleRoots;
|
||||
|
||||
if (directChildren.length === 0) {
|
||||
return (
|
||||
@ -155,7 +160,7 @@ export function ReferralTreeView({ members, rootUserId }: ReferralTreeViewProps)
|
||||
|
||||
return (
|
||||
<Box sx={{ py: 1 }}>
|
||||
{directChildren.map((member) => (
|
||||
{visibleChildren.map((member) => (
|
||||
<TreeNode
|
||||
key={member.userId}
|
||||
member={member}
|
||||
@ -164,6 +169,28 @@ export function ReferralTreeView({ members, rootUserId }: ReferralTreeViewProps)
|
||||
defaultExpanded
|
||||
/>
|
||||
))}
|
||||
{hasMore && (
|
||||
<Box sx={{ display: 'flex', justifyContent: 'center', mt: 1, mb: 1 }}>
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
onClick={() => setVisibleRoots((n) => n + ROOT_BATCH_SIZE)}
|
||||
>
|
||||
{t('referralPage.network.showMore', {
|
||||
remaining: directChildren.length - visibleRoots,
|
||||
})}
|
||||
</Button>
|
||||
</Box>
|
||||
)}
|
||||
{directChildren.length > ROOT_BATCH_SIZE && !hasMore && (
|
||||
<Typography variant="caption" color="text.secondary" sx={{ display: 'block', textAlign: 'center', mt: 1 }}>
|
||||
{t('common.pagination', {
|
||||
from: 1,
|
||||
to: directChildren.length,
|
||||
total: directChildren.length,
|
||||
})}
|
||||
</Typography>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
@ -69,6 +69,8 @@ import { formatReportDate } from '../../shared/utils/dateFormat';
|
||||
import { apiErrorMessage } from '../../shared/utils/apiError';
|
||||
import { reportUsesPeriodParams } from './reportPeriodScope';
|
||||
import { reportDescription, reportTitle } from './reportCatalogI18n';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
function toDateInputValue(value: string): string {
|
||||
if (!value) return '';
|
||||
@ -222,6 +224,9 @@ function downloadBlob(blob: Blob, filename: string) {
|
||||
export function ReportDetailPage() {
|
||||
|
||||
const { t, i18n } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canExportReports = can('admin.reports.export');
|
||||
const canManageUsers = can('admin.users.manage');
|
||||
const theme = useTheme();
|
||||
|
||||
const isCompact = useMediaQuery(theme.breakpoints.down('md'));
|
||||
@ -829,23 +834,25 @@ export function ReportDetailPage() {
|
||||
|
||||
</Button>
|
||||
|
||||
<Button size="small" variant="outlined" startIcon={<DownloadRoundedIcon />} disabled={exporting} onClick={() => void exportServerAsync('xlsx')}>
|
||||
<PermissionGate permission="admin.reports.export">
|
||||
<Button size="small" variant="outlined" startIcon={<DownloadRoundedIcon />} disabled={exporting} onClick={() => void exportServerAsync('xlsx')}>
|
||||
|
||||
{t('admin.reports.detail.exportExcelFilters')}
|
||||
{t('admin.reports.detail.exportExcelFilters')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
|
||||
<Button size="small" variant="outlined" disabled={exporting} onClick={() => void exportServerAsync('csv')}>
|
||||
<Button size="small" variant="outlined" disabled={exporting} onClick={() => void exportServerAsync('csv')}>
|
||||
|
||||
{t('admin.reports.detail.exportCsvFilters')}
|
||||
{t('admin.reports.detail.exportCsvFilters')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
|
||||
<Button size="small" variant="outlined" disabled={exporting} onClick={() => void exportServerAsync('pdf')}>
|
||||
<Button size="small" variant="outlined" disabled={exporting} onClick={() => void exportServerAsync('pdf')}>
|
||||
|
||||
{t('admin.reports.detail.exportPdfServer')}
|
||||
{t('admin.reports.detail.exportPdfServer')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
|
||||
</Stack>
|
||||
|
||||
@ -853,7 +860,7 @@ export function ReportDetailPage() {
|
||||
|
||||
|
||||
|
||||
{selectionCount(selection) > 0 && (
|
||||
{selectionCount(selection) > 0 && (canExportReports || (canManageUsers && bulkActions.length > 0)) && (
|
||||
|
||||
<Box sx={{ mb: 2, p: 2, borderRadius: 2, border: '1px solid rgba(124,92,255,0.35)', bgcolor: 'rgba(124,92,255,0.06)' }}>
|
||||
|
||||
@ -865,24 +872,27 @@ export function ReportDetailPage() {
|
||||
|
||||
<Stack direction="row" spacing={1} sx={{ flexWrap: 'wrap', gap: 1 }}>
|
||||
|
||||
<Button size="small" variant="contained" onClick={() => void exportSelection('xlsx')}>
|
||||
<PermissionGate permission="admin.reports.export">
|
||||
<Button size="small" variant="contained" onClick={() => void exportSelection('xlsx')}>
|
||||
|
||||
{t('admin.reports.detail.exportSelectionExcel')}
|
||||
{t('admin.reports.detail.exportSelectionExcel')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
|
||||
<Button size="small" variant="outlined" onClick={() => void exportSelection('csv')}>
|
||||
<Button size="small" variant="outlined" onClick={() => void exportSelection('csv')}>
|
||||
|
||||
{t('admin.reports.detail.csv')}
|
||||
{t('admin.reports.detail.csv')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
|
||||
<Button size="small" variant="outlined" onClick={() => void exportSelection('pdf')}>
|
||||
<Button size="small" variant="outlined" onClick={() => void exportSelection('pdf')}>
|
||||
|
||||
{t('admin.reports.detail.pdf')}
|
||||
{t('admin.reports.detail.pdf')}
|
||||
|
||||
</Button>
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
|
||||
<PermissionGate permission="admin.users.manage">
|
||||
{bulkActions.map((action) => (
|
||||
|
||||
<Button
|
||||
@ -904,6 +914,7 @@ export function ReportDetailPage() {
|
||||
</Button>
|
||||
|
||||
))}
|
||||
</PermissionGate>
|
||||
|
||||
<Button size="small" onClick={() => setSelection(emptySelection)}>
|
||||
|
||||
@ -1081,7 +1092,7 @@ export function ReportDetailPage() {
|
||||
|
||||
onSortModelChange={(m) => setSortModel(m as { field: string; sort: 'asc' | 'desc' }[])}
|
||||
|
||||
checkboxSelection
|
||||
checkboxSelection={canExportReports || canManageUsers}
|
||||
|
||||
rowSelectionModel={selection}
|
||||
|
||||
|
||||
@ -7,6 +7,8 @@ export const PERIOD_SCOPED_REPORTS = new Set([
|
||||
'financial-deposit-users',
|
||||
'financial-withdrawals',
|
||||
'financial-bonuses',
|
||||
'financial-encouragement-grants',
|
||||
'financial-commission-history',
|
||||
'financial-adjustments',
|
||||
'games-participants',
|
||||
'games-test-users',
|
||||
|
||||
@ -45,6 +45,7 @@ import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
import { humanToRaw } from '../wallet/utils/walletFormat';
|
||||
import { useSecuritySocket } from './hooks/useSecuritySocket';
|
||||
import type { SecurityWsServerMessage } from './ws/protocol';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
const USDT_WALLET_CODE = 'USDT_TRC20';
|
||||
const USDT_DECIMALS = 6;
|
||||
@ -626,6 +627,7 @@ export function SecurityAdminPage() {
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Stack direction="row" spacing={1} useFlexGap sx={{ flexWrap: 'wrap', mb: 2 }}>
|
||||
<Button
|
||||
variant="contained"
|
||||
@ -660,6 +662,7 @@ export function SecurityAdminPage() {
|
||||
{t('admin.security.actions.dismissFalse')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
|
||||
{integrityAlert && (
|
||||
<Alert severity={integrityAlert.severity} sx={{ mb: 2 }}>
|
||||
@ -814,9 +817,11 @@ export function SecurityAdminPage() {
|
||||
<Chip size="small" label={n.severity} color={severityColor(n.severity)} />
|
||||
<Typography sx={{ fontWeight: 700, flex: 1 }}>{n.title}</Typography>
|
||||
{!n.readAt && (
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Button size="small" onClick={() => markReadMut.mutate(n.id)}>
|
||||
{t('admin.security.notifications.markRead')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
)}
|
||||
</Stack>
|
||||
{n.body && (
|
||||
@ -854,9 +859,11 @@ export function SecurityAdminPage() {
|
||||
<Typography variant="h6" sx={{ fontWeight: 800 }}>
|
||||
{t('admin.security.credits.title')}
|
||||
</Typography>
|
||||
<PermissionGate permission="admin.ledger_credit.manage">
|
||||
<Button variant="contained" onClick={() => setCreditOpen(true)} sx={{ alignSelf: { xs: 'stretch', sm: 'auto' } }}>
|
||||
{t('admin.security.credits.grant')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
@ -917,6 +924,7 @@ export function SecurityAdminPage() {
|
||||
<Typography variant="body2" sx={{ opacity: 0.7, mb: 2 }}>
|
||||
{t('admin.security.dbAudit.subtitle')}
|
||||
</Typography>
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Stack direction="row" spacing={1} sx={{ mb: 2, flexWrap: 'wrap' }}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
@ -928,6 +936,7 @@ export function SecurityAdminPage() {
|
||||
{t('admin.security.dbAudit.exportCsv')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
{tamperEventsQ.isError && <Alert severity="error">{t('admin.security.dbAudit.loadError')}</Alert>}
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
@ -1010,6 +1019,7 @@ export function SecurityAdminPage() {
|
||||
color={auditLogFilter === 'admin_changes' ? 'primary' : 'default'}
|
||||
onClick={() => setAuditLogFilter('admin_changes')}
|
||||
/>
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Button
|
||||
variant="outlined"
|
||||
size="small"
|
||||
@ -1019,6 +1029,7 @@ export function SecurityAdminPage() {
|
||||
>
|
||||
{t('admin.security.auditLog.exportCsv')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
<Stack direction={{ xs: 'column', sm: 'row' }} spacing={1.5} sx={{ mb: 2 }} useFlexGap>
|
||||
<TextField
|
||||
@ -1129,7 +1140,7 @@ export function SecurityAdminPage() {
|
||||
</Box>
|
||||
<RefreshIconButton
|
||||
onClick={() => void lockedAccountsQ.refetch()}
|
||||
loading={lockedAccountsQ.isFetching}
|
||||
disabled={lockedAccountsQ.isFetching}
|
||||
/>
|
||||
</Stack>
|
||||
{lockedAccountsQ.isError && (
|
||||
@ -1196,6 +1207,7 @@ export function SecurityAdminPage() {
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
@ -1206,6 +1218,7 @@ export function SecurityAdminPage() {
|
||||
? t('admin.security.lockedAccounts.unlocking')
|
||||
: t('admin.security.lockedAccounts.unlock')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))}
|
||||
@ -1241,6 +1254,7 @@ export function SecurityAdminPage() {
|
||||
onChange={(e) => setEmailsText(e.target.value)}
|
||||
placeholder={t('admin.security.alertEmails.placeholder')}
|
||||
/>
|
||||
<PermissionGate permission="admin.security.manage">
|
||||
<Button
|
||||
sx={{ mt: 2 }}
|
||||
variant="contained"
|
||||
@ -1255,6 +1269,7 @@ export function SecurityAdminPage() {
|
||||
>
|
||||
{t('admin.security.alertEmails.save')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{settingsMut.isSuccess && (
|
||||
<Alert severity="success" sx={{ mt: 2 }}>
|
||||
{t('admin.security.alertEmails.saved')}
|
||||
|
||||
@ -25,10 +25,14 @@ import { useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { apiErrorMessage } from '../../shared/utils/apiError';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
|
||||
/** Editable password policy and token expiration settings form. */
|
||||
export function SettingsPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canEditSettings = can('admin.settings.edit');
|
||||
type Settings = {
|
||||
password_min_length: number;
|
||||
password_require_uppercase: boolean;
|
||||
@ -531,6 +535,7 @@ export function SettingsPage() {
|
||||
</AccordionDetails>
|
||||
</Accordion>
|
||||
|
||||
<PermissionGate permission="admin.settings.edit">
|
||||
<Stack direction="row" spacing={1} sx={{ justifyContent: 'flex-end', pt: 0.5 }}>
|
||||
<Button
|
||||
onClick={() => setForm(null)}
|
||||
@ -548,6 +553,12 @@ export function SettingsPage() {
|
||||
{saving ? t('admin.settings.saving') : t('admin.settings.save')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
{!canEditSettings && (
|
||||
<Alert severity="info" sx={{ mt: 1 }}>
|
||||
{t('admin.settings.readOnlyHint')}
|
||||
</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
)}
|
||||
</CardContent>
|
||||
|
||||
@ -18,6 +18,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
|
||||
export type ShareCardSettings = {
|
||||
enabled: boolean;
|
||||
@ -36,6 +38,8 @@ export type ShareCardSettings = {
|
||||
|
||||
export function ShareCardsAdminPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canEditShareCards = can('admin.share_cards.edit');
|
||||
const qc = useQueryClient();
|
||||
const [form, setForm] = useState<ShareCardSettings | null>(null);
|
||||
|
||||
@ -100,7 +104,7 @@ export function ShareCardsAdminPage() {
|
||||
{saveMut.isSuccess && <Alert severity="success" sx={{ mb: 2 }}>{t('admin.shareCards.saved')}</Alert>}
|
||||
|
||||
<Card sx={{ borderRadius: 3, mb: 2 }}>
|
||||
<CardContent>
|
||||
<CardContent component="fieldset" disabled={!canEditShareCards} sx={{ border: 0, m: 0, p: 0, minWidth: 0 }}>
|
||||
<FormControlLabel
|
||||
control={
|
||||
<Switch
|
||||
@ -247,6 +251,7 @@ export function ShareCardsAdminPage() {
|
||||
/>
|
||||
</Stack>
|
||||
|
||||
<PermissionGate permission="admin.share_cards.edit">
|
||||
<Button
|
||||
variant="contained"
|
||||
disabled={saveMut.isPending}
|
||||
@ -268,6 +273,12 @@ export function ShareCardsAdminPage() {
|
||||
>
|
||||
{t('admin.shareCards.save')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{!canEditShareCards && (
|
||||
<Alert severity="info" sx={{ mt: 2 }}>
|
||||
{t('admin.shareCards.readOnlyHint')}
|
||||
</Alert>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</Box>
|
||||
|
||||
@ -24,6 +24,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import {
|
||||
adminFetchMessages,
|
||||
adminGetConversation,
|
||||
@ -355,6 +356,7 @@ export function SupportAdminPage() {
|
||||
<Typography sx={{ p: 3, opacity: 0.6 }}>{t('admin.supportAdmin.selectConversation')}</Typography>
|
||||
) : (
|
||||
<>
|
||||
<PermissionGate permission="admin.support.manage">
|
||||
<Stack direction="row" spacing={1} sx={{ p: 2, borderBottom: '1px solid', borderColor: 'divider' }}>
|
||||
<FormControl size="small" sx={{ minWidth: 130 }}>
|
||||
<InputLabel>{t('admin.supportAdmin.status')}</InputLabel>
|
||||
@ -384,9 +386,20 @@ export function SupportAdminPage() {
|
||||
{t('admin.supportAdmin.markResolved')}
|
||||
</Button>
|
||||
</Stack>
|
||||
</PermissionGate>
|
||||
|
||||
<AdminMessageList messages={messages} staffTyping={userTyping} t={t} />
|
||||
|
||||
<PermissionGate
|
||||
permission="admin.support.manage"
|
||||
fallback={
|
||||
<Box sx={{ p: 2, borderTop: '1px solid', borderColor: 'divider' }}>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t('admin.supportAdmin.readOnlyHint')}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
>
|
||||
<Box sx={{ p: 1.5, borderTop: '1px solid', borderColor: 'divider' }}>
|
||||
<input
|
||||
ref={fileRef}
|
||||
@ -439,6 +452,7 @@ export function SupportAdminPage() {
|
||||
}}
|
||||
/>
|
||||
</Box>
|
||||
</PermissionGate>
|
||||
</>
|
||||
)}
|
||||
</Paper>
|
||||
|
||||
@ -24,6 +24,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
import { humanToRaw, rawToHuman } from '../wallet/utils/walletFormat';
|
||||
|
||||
@ -53,6 +55,8 @@ const USDT_DECIMALS = 6;
|
||||
|
||||
export function TestWalletAdminPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canManageTestWallet = can('admin.test_wallet.manage');
|
||||
const qc = useQueryClient();
|
||||
const [form, setForm] = useState<TestWalletConfig | null>(null);
|
||||
const [creditDisplay, setCreditDisplay] = useState('1000');
|
||||
@ -132,7 +136,7 @@ export function TestWalletAdminPage() {
|
||||
|
||||
<Card sx={{ borderRadius: 3, mb: 3 }}>
|
||||
<CardContent>
|
||||
<Stack spacing={2}>
|
||||
<Stack spacing={2} component="fieldset" disabled={!canManageTestWallet} sx={{ border: 0, m: 0, p: 0, minWidth: 0 }}>
|
||||
<FormControlLabel
|
||||
control={
|
||||
<Switch
|
||||
@ -224,6 +228,7 @@ export function TestWalletAdminPage() {
|
||||
</Alert>
|
||||
)}
|
||||
{saveMut.isSuccess && <Alert severity="success">{t('admin.testWallet.saved')}</Alert>}
|
||||
<PermissionGate permission="admin.test_wallet.manage">
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={() => saveMut.mutate()}
|
||||
@ -232,6 +237,10 @@ export function TestWalletAdminPage() {
|
||||
>
|
||||
{saveMut.isPending ? t('admin.testWallet.saving') : t('admin.testWallet.save')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
{!canManageTestWallet && (
|
||||
<Alert severity="info">{t('admin.testWallet.readOnlyHint')}</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
@ -27,6 +27,7 @@ import { useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { api } from '../../shared/services/api';
|
||||
import { PageHeader, RefreshIconButton } from '../../shared/components/PageHeader';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import { ScrollableTable } from '../../shared/components/ScrollableTable';
|
||||
|
||||
type WalletType = {
|
||||
@ -246,6 +247,7 @@ export function TreasuryAdminPage() {
|
||||
}))
|
||||
}
|
||||
/>
|
||||
<PermissionGate permission="admin.treasury.manage">
|
||||
<Button
|
||||
variant="outlined"
|
||||
disabled={setColdMut.isPending || !form.address.trim()}
|
||||
@ -259,6 +261,7 @@ export function TreasuryAdminPage() {
|
||||
>
|
||||
{t('admin.treasury.saveCold')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
</CardContent>
|
||||
</Card>
|
||||
@ -298,6 +301,7 @@ export function TreasuryAdminPage() {
|
||||
value={fundingForm.notes}
|
||||
onChange={(e) => setFundingForm((f) => ({ ...f, notes: e.target.value }))}
|
||||
/>
|
||||
<PermissionGate permission="admin.treasury.manage">
|
||||
<Button
|
||||
variant="contained"
|
||||
disabled={requestFundingMut.isPending || !fundingForm.amount}
|
||||
@ -311,6 +315,7 @@ export function TreasuryAdminPage() {
|
||||
>
|
||||
{t('admin.treasury.requestFunding')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
{overview?.pendingColdToHotFunding?.length ? (
|
||||
<ScrollableTable>
|
||||
@ -357,6 +362,7 @@ export function TreasuryAdminPage() {
|
||||
<Typography variant="h6" sx={{ fontWeight: 900, flex: 1 }}>
|
||||
{t('admin.treasury.sweepsTitle')}
|
||||
</Typography>
|
||||
<PermissionGate permission="admin.treasury.manage">
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
@ -366,6 +372,7 @@ export function TreasuryAdminPage() {
|
||||
>
|
||||
{t('admin.treasury.submitSweeps')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
</Stack>
|
||||
<ScrollableTable>
|
||||
<Table size="small">
|
||||
@ -398,6 +405,7 @@ export function TreasuryAdminPage() {
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<PermissionGate permission="admin.treasury.manage">
|
||||
<Dialog open={!!confirmFunding} onClose={() => setConfirmFunding(null)} maxWidth="sm" fullWidth>
|
||||
<DialogTitle>{t('admin.treasury.confirmDialogTitle')}</DialogTitle>
|
||||
<DialogContent>
|
||||
@ -428,6 +436,7 @@ export function TreasuryAdminPage() {
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</PermissionGate>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
@ -60,6 +60,8 @@ import {
|
||||
} from '@mui/x-data-grid';
|
||||
import { humanToRaw, rawToHuman } from '../wallet/utils/walletFormat';
|
||||
import { CountryAutocomplete } from '../../shared/components/CountryAutocomplete';
|
||||
import { useAuth } from '../../shared/auth/AuthContext';
|
||||
import { PermissionGate } from '../../shared/auth/PermissionGate';
|
||||
import {
|
||||
type AdminUser,
|
||||
type AdminUserFilters,
|
||||
@ -80,6 +82,19 @@ import {
|
||||
COLUMN_VISIBILITY_STORAGE_KEY,
|
||||
} from './adminUserTypes';
|
||||
|
||||
type RbacRoleOption = {
|
||||
name: string;
|
||||
isSystem: boolean;
|
||||
description: string | null;
|
||||
};
|
||||
|
||||
function roleLabel(name: string, t: ReturnType<typeof useTranslation>['t']): string {
|
||||
const key = `admin.users.roles.${name}` as 'admin.users.roles.user';
|
||||
const translated = t(key, { defaultValue: '' });
|
||||
if (translated) return translated;
|
||||
return name.replace(/_/g, ' ');
|
||||
}
|
||||
|
||||
const USDT_DECIMALS = 6;
|
||||
const ROWS_PER_PAGE = 25;
|
||||
|
||||
@ -88,12 +103,14 @@ function UsersGridToolbar({
|
||||
exportLimitLabel,
|
||||
disabled,
|
||||
selectedCount,
|
||||
showExport,
|
||||
t,
|
||||
}: {
|
||||
onOpenDownload: (e: React.MouseEvent<HTMLElement>) => void;
|
||||
exportLimitLabel: string;
|
||||
disabled: boolean;
|
||||
selectedCount: number;
|
||||
showExport: boolean;
|
||||
t: ReturnType<typeof useTranslation>['t'];
|
||||
}) {
|
||||
return (
|
||||
@ -102,16 +119,18 @@ function UsersGridToolbar({
|
||||
<GridToolbarColumnsButton />
|
||||
<GridToolbarDensitySelector />
|
||||
<Chip size="small" label={t('admin.users.columnsHint')} variant="outlined" />
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
startIcon={<DownloadRoundedIcon />}
|
||||
onClick={onOpenDownload}
|
||||
disabled={disabled}
|
||||
>
|
||||
{selectedCount > 0 ? t('admin.users.exportSelected', { count: selectedCount }) : t('admin.users.download')}
|
||||
</Button>
|
||||
<Chip size="small" label={exportLimitLabel} variant="outlined" />
|
||||
{showExport && (
|
||||
<Button
|
||||
size="small"
|
||||
variant="outlined"
|
||||
startIcon={<DownloadRoundedIcon />}
|
||||
onClick={onOpenDownload}
|
||||
disabled={disabled}
|
||||
>
|
||||
{selectedCount > 0 ? t('admin.users.exportSelected', { count: selectedCount }) : t('admin.users.download')}
|
||||
</Button>
|
||||
)}
|
||||
{showExport && <Chip size="small" label={exportLimitLabel} variant="outlined" />}
|
||||
{selectedCount > 0 && (
|
||||
<Chip size="small" color="primary" label={t('admin.users.selected', { count: selectedCount })} />
|
||||
)}
|
||||
@ -172,8 +191,34 @@ function FlagSwitch({
|
||||
);
|
||||
}
|
||||
|
||||
function EditableFlag({
|
||||
checked,
|
||||
label,
|
||||
editable,
|
||||
onChange,
|
||||
}: {
|
||||
checked: boolean;
|
||||
label: string;
|
||||
editable: boolean;
|
||||
onChange: (next: boolean) => void;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
if (!editable) {
|
||||
return <Chip size="small" label={checked ? t('common.yes') : t('common.no')} variant="outlined" />;
|
||||
}
|
||||
return <FlagSwitch checked={checked} label={label} onChange={onChange} />;
|
||||
}
|
||||
|
||||
export function UserManagementPage() {
|
||||
const { t } = useTranslation();
|
||||
const { can } = useAuth();
|
||||
const canManageRoles = can('admin.rbac.manage') || can('user.manage_roles');
|
||||
const canEdit = can('admin.users.edit');
|
||||
const canDelete = can('admin.users.delete');
|
||||
const canExport = can('admin.users.export');
|
||||
const canManage = can('admin.users.manage');
|
||||
const canGrantCredit = can('admin.ledger_credit.manage');
|
||||
const canSelectRows = canExport || canManage || canGrantCredit;
|
||||
const theme = useTheme();
|
||||
const isMobile = useMediaQuery(theme.breakpoints.down('md'));
|
||||
const qc = useQueryClient();
|
||||
@ -238,7 +283,20 @@ export function UserManagementPage() {
|
||||
const [deleteDialog, setDeleteDialog] = useState<null | { userId: string; email: string | null }>(null);
|
||||
const [deleteReason, setDeleteReason] = useState('');
|
||||
|
||||
const ALL_ROLES = ['user', 'moderator', 'admin', 'super_admin'] as const;
|
||||
const rolesQ = useQuery({
|
||||
queryKey: ['rbac-roles-options'],
|
||||
queryFn: async () => {
|
||||
const res = await api.get<{ roles: RbacRoleOption[] }>('/api/v1/admin/rbac/roles');
|
||||
return res.data.roles;
|
||||
},
|
||||
staleTime: 60_000,
|
||||
});
|
||||
|
||||
const assignableRoles = useMemo(() => {
|
||||
const fromApi = rolesQ.data?.map((r) => r.name) ?? [];
|
||||
if (fromApi.length) return fromApi;
|
||||
return ['user', 'moderator', 'admin', 'super_admin'];
|
||||
}, [rolesQ.data]);
|
||||
|
||||
const [columnVisibilityModel, setColumnVisibilityModel] = useState<Record<string, boolean>>(() => {
|
||||
try {
|
||||
@ -573,7 +631,7 @@ export function UserManagementPage() {
|
||||
renderCell: (p: { row: AdminUser }) =>
|
||||
p.row.email_verified ? (
|
||||
<Chip size="small" label={t('common.yes')} color="success" variant="outlined" />
|
||||
) : (
|
||||
) : canEdit ? (
|
||||
<Tooltip title={t('admin.users.tooltips.verifyEmail')} arrow placement="top">
|
||||
<Chip
|
||||
size="small"
|
||||
@ -588,6 +646,8 @@ export function UserManagementPage() {
|
||||
sx={{ cursor: 'pointer' }}
|
||||
/>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<Chip size="small" label={t('common.no')} color="warning" variant="outlined" />
|
||||
),
|
||||
},
|
||||
{
|
||||
@ -595,21 +655,24 @@ export function UserManagementPage() {
|
||||
headerName: t('admin.users.columns.role'),
|
||||
width: 120,
|
||||
sortable: true,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<Tooltip title={t('admin.users.tooltips.changeRole')} arrow placement="top">
|
||||
<Chip
|
||||
size="small"
|
||||
label={p.row.role_name}
|
||||
variant="outlined"
|
||||
color={p.row.role_name === 'admin' ? 'primary' : 'default'}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openRoleDialog(p.row);
|
||||
}}
|
||||
sx={{ cursor: 'pointer' }}
|
||||
/>
|
||||
</Tooltip>
|
||||
),
|
||||
renderCell: (p: { row: AdminUser }) =>
|
||||
canManageRoles ? (
|
||||
<Tooltip title={t('admin.users.tooltips.changeRole')} arrow placement="top">
|
||||
<Chip
|
||||
size="small"
|
||||
label={roleLabel(p.row.role_name, t)}
|
||||
variant="outlined"
|
||||
color={p.row.role_name === 'admin' || p.row.role_name === 'super_admin' ? 'primary' : 'default'}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openRoleDialog(p.row);
|
||||
}}
|
||||
sx={{ cursor: 'pointer' }}
|
||||
/>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<Chip size="small" label={roleLabel(p.row.role_name, t)} variant="outlined" />
|
||||
),
|
||||
},
|
||||
{
|
||||
field: 'country_of_residence',
|
||||
@ -754,9 +817,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.is_enabled}
|
||||
label={t('admin.users.fields.isEnabled')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'isEnabled', v)}
|
||||
/>
|
||||
),
|
||||
@ -769,9 +833,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.withdrawals_suspended}
|
||||
label={t('admin.users.fields.withdrawalsSuspended')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'withdrawalsSuspended', v)}
|
||||
/>
|
||||
),
|
||||
@ -784,9 +849,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.under_surveillance}
|
||||
label={t('admin.users.fields.underSurveillance')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'underSurveillance', v)}
|
||||
/>
|
||||
),
|
||||
@ -808,9 +874,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.is_account_non_expired}
|
||||
label={t('admin.users.fields.isAccountNonExpired')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'isAccountNonExpired', v)}
|
||||
/>
|
||||
),
|
||||
@ -823,9 +890,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.is_account_non_locked}
|
||||
label={t('admin.users.fields.isAccountNonLocked')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'isAccountNonLocked', v)}
|
||||
/>
|
||||
),
|
||||
@ -838,9 +906,10 @@ export function UserManagementPage() {
|
||||
align: 'center' as const,
|
||||
headerAlign: 'center' as const,
|
||||
renderCell: (p: { row: AdminUser }) => (
|
||||
<FlagSwitch
|
||||
<EditableFlag
|
||||
checked={!!p.row.is_credentials_non_expired}
|
||||
label={t('admin.users.fields.isCredentialsNonExpired')}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(p.row, 'isCredentialsNonExpired', v)}
|
||||
/>
|
||||
),
|
||||
@ -864,26 +933,28 @@ export function UserManagementPage() {
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip title={t('admin.users.tooltips.deleteUser')} arrow placement="top">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setDeleteDialog({ userId: p.row.id, email: p.row.email });
|
||||
setDeleteReason('');
|
||||
}}
|
||||
disabled={deleteUserMut.isPending}
|
||||
aria-label={t('admin.users.tooltips.deleteUser')}
|
||||
>
|
||||
<DeleteRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
{canDelete && (
|
||||
<Tooltip title={t('admin.users.tooltips.deleteUser')} arrow placement="top">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setDeleteDialog({ userId: p.row.id, email: p.row.email });
|
||||
setDeleteReason('');
|
||||
}}
|
||||
disabled={deleteUserMut.isPending}
|
||||
aria-label={t('admin.users.tooltips.deleteUser')}
|
||||
>
|
||||
<DeleteRoundedIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
)}
|
||||
</Stack>
|
||||
),
|
||||
},
|
||||
],
|
||||
[copy, onToggle, countryLabel, verifyEmailMut, deleteUserMut.isPending, openRoleDialog, t]
|
||||
[copy, onToggle, countryLabel, verifyEmailMut, deleteUserMut.isPending, openRoleDialog, canManageRoles, canEdit, canDelete, t]
|
||||
);
|
||||
|
||||
const exportColumnDefs = useMemo(
|
||||
@ -1145,7 +1216,7 @@ export function UserManagementPage() {
|
||||
/>
|
||||
</Grid>
|
||||
|
||||
{selectedIds.length > 0 && (
|
||||
{selectedIds.length > 0 && (canManage || canGrantCredit || canExport) && (
|
||||
<Grid size={{ xs: 12 }}>
|
||||
<Paper
|
||||
sx={{
|
||||
@ -1157,30 +1228,36 @@ export function UserManagementPage() {
|
||||
>
|
||||
<Stack direction="row" spacing={1} sx={{ alignItems: 'center', flexWrap: 'wrap' }}>
|
||||
<Typography sx={{ fontWeight: 700, mr: 1 }}>{t('admin.users.selected', { count: selectedIds.length })}</Typography>
|
||||
<Button size="small" variant="outlined" onClick={() => setBatchDialog('enable')}>
|
||||
{t('admin.users.batch.enable')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="warning" onClick={() => setBatchDialog('disable')}>
|
||||
{t('admin.users.batch.disable')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="warning" onClick={() => setBatchDialog('suspend')}>
|
||||
{t('admin.users.batch.suspend')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="success" onClick={() => setBatchDialog('reactivate')}>
|
||||
{t('admin.users.batch.reactivate')}
|
||||
</Button>
|
||||
<Button size="small" variant="contained" onClick={() => setBatchDialog('bonus')}>
|
||||
{t('admin.users.batch.grantBonus')}
|
||||
</Button>
|
||||
<Button
|
||||
size="small"
|
||||
variant="text"
|
||||
startIcon={<DownloadRoundedIcon />}
|
||||
onClick={() => void exportXlsx(true)}
|
||||
disabled={exporting}
|
||||
>
|
||||
{t('admin.users.batch.exportSelected')}
|
||||
</Button>
|
||||
<PermissionGate permission="admin.users.manage">
|
||||
<Button size="small" variant="outlined" onClick={() => setBatchDialog('enable')}>
|
||||
{t('admin.users.batch.enable')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="warning" onClick={() => setBatchDialog('disable')}>
|
||||
{t('admin.users.batch.disable')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="warning" onClick={() => setBatchDialog('suspend')}>
|
||||
{t('admin.users.batch.suspend')}
|
||||
</Button>
|
||||
<Button size="small" variant="outlined" color="success" onClick={() => setBatchDialog('reactivate')}>
|
||||
{t('admin.users.batch.reactivate')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
<PermissionGate permission="admin.ledger_credit.manage">
|
||||
<Button size="small" variant="contained" onClick={() => setBatchDialog('bonus')}>
|
||||
{t('admin.users.batch.grantBonus')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
<PermissionGate permission="admin.users.export">
|
||||
<Button
|
||||
size="small"
|
||||
variant="text"
|
||||
startIcon={<DownloadRoundedIcon />}
|
||||
onClick={() => void exportXlsx(true)}
|
||||
disabled={exporting}
|
||||
>
|
||||
{t('admin.users.batch.exportSelected')}
|
||||
</Button>
|
||||
</PermissionGate>
|
||||
<Button size="small" color="inherit" onClick={() => setRowSelection({ type: 'include', ids: new Set() })}>
|
||||
{t('admin.users.batch.clearSelection')}
|
||||
</Button>
|
||||
@ -1196,6 +1273,7 @@ export function UserManagementPage() {
|
||||
fullWidth
|
||||
label={t('admin.users.searchLabel')}
|
||||
placeholder={t('admin.users.searchPlaceholder')}
|
||||
helperText={t('admin.users.searchHelper')}
|
||||
value={filters.search}
|
||||
onChange={(e) => setFilters((f) => ({ ...f, search: e.target.value }))}
|
||||
/>
|
||||
@ -1232,9 +1310,11 @@ export function UserManagementPage() {
|
||||
}}
|
||||
>
|
||||
<MenuItem value="all">{t('common.all')}</MenuItem>
|
||||
<MenuItem value="user">{t('admin.users.roles.user')}</MenuItem>
|
||||
<MenuItem value="moderator">{t('admin.users.roles.moderator')}</MenuItem>
|
||||
<MenuItem value="admin">{t('admin.users.roles.admin')}</MenuItem>
|
||||
{assignableRoles.map((role) => (
|
||||
<MenuItem key={role} value={role}>
|
||||
{roleLabel(role, t)}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
</FormControl>
|
||||
</Grid>
|
||||
@ -1473,11 +1553,11 @@ export function UserManagementPage() {
|
||||
<Chip size="small" label={u.account_status} color={statusColor(u.account_status)} />
|
||||
<Chip
|
||||
size="small"
|
||||
label={u.role_name}
|
||||
label={roleLabel(u.role_name, t)}
|
||||
variant="outlined"
|
||||
color={u.role_name === 'admin' ? 'primary' : 'default'}
|
||||
onClick={() => openRoleDialog(u)}
|
||||
sx={{ cursor: 'pointer' }}
|
||||
color={u.role_name === 'admin' || u.role_name === 'super_admin' ? 'primary' : 'default'}
|
||||
onClick={canManageRoles ? () => openRoleDialog(u) : undefined}
|
||||
sx={canManageRoles ? { cursor: 'pointer' } : undefined}
|
||||
/>
|
||||
</Stack>
|
||||
<Typography variant="body2" sx={{ opacity: 0.72, mt: 0.5 }}>
|
||||
@ -1498,10 +1578,11 @@ export function UserManagementPage() {
|
||||
</Button>
|
||||
<Collapse in={!!expanded[u.id]} unmountOnExit>
|
||||
<Stack spacing={0.75} sx={{ mt: 1 }}>
|
||||
<FlagRow label={t('admin.users.fields.isEnabled')} value={u.is_enabled} onChange={(v) => onToggle(u, 'isEnabled', v)} />
|
||||
<FlagRow label={t('admin.users.fields.isEnabled')} value={u.is_enabled} editable={canEdit} onChange={(v) => onToggle(u, 'isEnabled', v)} />
|
||||
<FlagRow
|
||||
label={t('admin.users.fields.withdrawalsSuspended')}
|
||||
value={u.withdrawals_suspended}
|
||||
editable={canEdit}
|
||||
onChange={(v) => onToggle(u, 'withdrawalsSuspended', v)}
|
||||
/>
|
||||
</Stack>
|
||||
@ -1522,7 +1603,7 @@ export function UserManagementPage() {
|
||||
getRowId={(r) => r.id}
|
||||
loading={q.isLoading}
|
||||
rowCount={total}
|
||||
checkboxSelection
|
||||
checkboxSelection={canSelectRows}
|
||||
rowSelectionModel={rowSelection}
|
||||
onRowSelectionModelChange={setRowSelection}
|
||||
keepNonExistentRowsSelected
|
||||
@ -1543,6 +1624,7 @@ export function UserManagementPage() {
|
||||
exportLimitLabel={exportLimitLabel}
|
||||
disabled={q.isLoading || (total === 0 && selectedIds.length === 0) || exporting}
|
||||
selectedCount={selectedIds.length}
|
||||
showExport={canExport}
|
||||
t={t}
|
||||
/>
|
||||
),
|
||||
@ -1561,7 +1643,8 @@ export function UserManagementPage() {
|
||||
)}
|
||||
</Grid>
|
||||
|
||||
<Menu anchorEl={downloadAnchorEl} open={!!downloadAnchorEl} onClose={() => setDownloadAnchorEl(null)}>
|
||||
{canExport && (
|
||||
<Menu anchorEl={downloadAnchorEl} open={!!downloadAnchorEl} onClose={() => setDownloadAnchorEl(null)}>
|
||||
<MenuItem
|
||||
onClick={() => {
|
||||
setDownloadAnchorEl(null);
|
||||
@ -1598,6 +1681,7 @@ export function UserManagementPage() {
|
||||
</MenuItem>
|
||||
)}
|
||||
</Menu>
|
||||
)}
|
||||
|
||||
<Dialog open={exportDialogOpen} onClose={() => !exporting && setExportDialogOpen(false)} maxWidth="xs" fullWidth>
|
||||
<DialogTitle>{t('admin.users.export.dialogTitle')}</DialogTitle>
|
||||
@ -1697,6 +1781,7 @@ export function UserManagementPage() {
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
|
||||
<PermissionGate anyOf={['admin.rbac.manage', 'user.manage_roles']}>
|
||||
<Dialog open={!!roleDialog} onClose={() => setRoleDialog(null)} maxWidth="xs" fullWidth>
|
||||
<DialogTitle>{t('admin.users.roleDialog.title')}</DialogTitle>
|
||||
<DialogContent>
|
||||
@ -1704,24 +1789,39 @@ export function UserManagementPage() {
|
||||
{roleDialog?.email ?? roleDialog?.userId}
|
||||
</Typography>
|
||||
<FormGroup>
|
||||
{ALL_ROLES.map((role) => (
|
||||
<FormControlLabel
|
||||
key={role}
|
||||
control={
|
||||
<Checkbox
|
||||
checked={roleDraft.includes(role)}
|
||||
onChange={(e) => {
|
||||
setRoleDraft((prev) => {
|
||||
if (e.target.checked) return [...new Set([...prev, role])];
|
||||
const next = prev.filter((r) => r !== role);
|
||||
return next.length ? next : ['user'];
|
||||
});
|
||||
}}
|
||||
/>
|
||||
}
|
||||
label={t(`admin.users.roles.${role}` as 'admin.users.roles.user')}
|
||||
/>
|
||||
))}
|
||||
{assignableRoles.map((role) => {
|
||||
const meta = rolesQ.data?.find((r) => r.name === role);
|
||||
return (
|
||||
<FormControlLabel
|
||||
key={role}
|
||||
control={
|
||||
<Checkbox
|
||||
checked={roleDraft.includes(role)}
|
||||
onChange={(e) => {
|
||||
setRoleDraft((prev) => {
|
||||
if (e.target.checked) return [...new Set([...prev, role])];
|
||||
const next = prev.filter((r) => r !== role);
|
||||
return next.length ? next : ['user'];
|
||||
});
|
||||
}}
|
||||
/>
|
||||
}
|
||||
label={
|
||||
<Box>
|
||||
<Typography variant="body2">{roleLabel(role, t)}</Typography>
|
||||
{meta?.description && (
|
||||
<Typography variant="caption" sx={{ opacity: 0.7 }}>
|
||||
{meta.description}
|
||||
</Typography>
|
||||
)}
|
||||
{meta?.isSystem && (
|
||||
<Chip size="small" label={t('admin.rbac.systemRole')} sx={{ ml: 1, height: 18 }} />
|
||||
)}
|
||||
</Box>
|
||||
}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</FormGroup>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
@ -1744,7 +1844,9 @@ export function UserManagementPage() {
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</PermissionGate>
|
||||
|
||||
<PermissionGate permission="admin.users.delete">
|
||||
<Dialog open={!!deleteDialog} onClose={() => setDeleteDialog(null)} maxWidth="sm" fullWidth>
|
||||
<DialogTitle>{t('admin.users.deleteDialog.title')}</DialogTitle>
|
||||
<DialogContent>
|
||||
@ -1781,7 +1883,9 @@ export function UserManagementPage() {
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</PermissionGate>
|
||||
|
||||
<PermissionGate permission="admin.users.edit">
|
||||
<Dialog open={!!confirm} onClose={() => setConfirm(null)} maxWidth="xs" fullWidth>
|
||||
<DialogTitle>{t('admin.users.confirmDialog.title')}</DialogTitle>
|
||||
<DialogContent>
|
||||
@ -1801,6 +1905,7 @@ export function UserManagementPage() {
|
||||
<Button variant="contained" onClick={applyToggle}>{t('common.confirm')}</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</PermissionGate>
|
||||
|
||||
<Snackbar
|
||||
open={!!toast}
|
||||
@ -1816,16 +1921,23 @@ export function UserManagementPage() {
|
||||
function FlagRow({
|
||||
label,
|
||||
value,
|
||||
editable = true,
|
||||
onChange,
|
||||
}: {
|
||||
label: string;
|
||||
value: boolean;
|
||||
editable?: boolean;
|
||||
onChange: (v: boolean) => void;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<Stack direction="row" sx={{ alignItems: 'center', justifyContent: 'space-between' }}>
|
||||
<Typography variant="body2" sx={{ opacity: 0.85, fontWeight: 600 }}>{label}</Typography>
|
||||
<Switch checked={value} onChange={(_, v) => onChange(v)} />
|
||||
{editable ? (
|
||||
<Switch checked={value} onChange={(_, v) => onChange(v)} />
|
||||
) : (
|
||||
<Chip size="small" label={value ? t('common.yes') : t('common.no')} variant="outlined" />
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
*/
|
||||
import React, { createContext, useContext, useMemo, useState } from 'react';
|
||||
import { readAuth, writeAuth } from './tokenStorage';
|
||||
import { hasAdminAccess, hasStaffAccess } from './roleAccess';
|
||||
import { hasAdminAccess, hasStaffAccess, hasAdminPanelAccess } from './roleAccess';
|
||||
import { hasPermission as checkPermission } from './permissions';
|
||||
import { logoutSession } from '../services/api';
|
||||
|
||||
export type AuthState = {
|
||||
@ -24,6 +25,8 @@ type AuthContextValue = {
|
||||
canApproveFundOps: boolean;
|
||||
hasRole: (name: string) => boolean;
|
||||
hasPermission: (key: string) => boolean;
|
||||
hasAdminPanel: boolean;
|
||||
can: (key: string) => boolean;
|
||||
setAuth: (next: AuthState) => void;
|
||||
logout: () => void;
|
||||
};
|
||||
@ -49,20 +52,24 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
const permissions = auth.permissions ?? [];
|
||||
const isAuthenticated = !!auth.accessToken;
|
||||
const hasRole = (name: string) => roles.includes(name);
|
||||
const hasPermission = (key: string) => permissions.includes(key);
|
||||
const can = (key: string) => checkPermission(permissions, key);
|
||||
const hasPermission = (key: string) => can(key);
|
||||
const isSuperAdmin = hasRole('super_admin');
|
||||
const isAdmin = hasAdminAccess(roles, auth.role);
|
||||
const isStaff = hasStaffAccess(roles, auth.role);
|
||||
const canApproveFundOps = hasPermission('fund_operation.approve');
|
||||
const hasAdminPanel = hasAdminPanelAccess(roles, auth.role, permissions);
|
||||
const isStaff = hasStaffAccess(roles, auth.role, permissions);
|
||||
const canApproveFundOps = can('fund_operation.approve') || can('admin.fund_operations.approve');
|
||||
return {
|
||||
auth,
|
||||
isAuthenticated,
|
||||
isAdmin,
|
||||
hasAdminPanel,
|
||||
isStaff,
|
||||
isSuperAdmin,
|
||||
canApproveFundOps,
|
||||
hasRole,
|
||||
hasPermission,
|
||||
can,
|
||||
setAuth,
|
||||
logout,
|
||||
};
|
||||
|
||||
25
prediqo_web/src/shared/auth/PermissionGate.tsx
Normal file
25
prediqo_web/src/shared/auth/PermissionGate.tsx
Normal file
@ -0,0 +1,25 @@
|
||||
/**
|
||||
* Conditionally renders children when the user holds the required permission(s).
|
||||
*/
|
||||
import type { ReactNode } from 'react';
|
||||
import { useAuth } from './AuthContext';
|
||||
|
||||
type Props = {
|
||||
permission?: string;
|
||||
anyOf?: string[];
|
||||
allOf?: string[];
|
||||
fallback?: ReactNode;
|
||||
children: ReactNode;
|
||||
};
|
||||
|
||||
export function PermissionGate({ permission, anyOf, allOf, fallback = null, children }: Props) {
|
||||
const { can } = useAuth();
|
||||
|
||||
let allowed = true;
|
||||
if (permission) allowed = can(permission);
|
||||
else if (anyOf?.length) allowed = anyOf.some((p) => can(p));
|
||||
else if (allOf?.length) allowed = allOf.every((p) => can(p));
|
||||
|
||||
if (!allowed) return <>{fallback}</>;
|
||||
return <>{children}</>;
|
||||
}
|
||||
@ -1,24 +1,21 @@
|
||||
/**
|
||||
* Route guard that restricts access to authenticated users and optional admin-only sections.
|
||||
* Redirects unauthenticated visitors to login and non-admins away from admin routes.
|
||||
* Route guard with optional permission-based access for admin panel routes.
|
||||
*/
|
||||
import { Navigate, Outlet, useLocation } from 'react-router-dom';
|
||||
import { useAuth } from './AuthContext';
|
||||
import { ADMIN_PAGE_PERMISSIONS } from './permissions';
|
||||
|
||||
/**
|
||||
* Protects nested routes by requiring a valid session and, optionally, an admin role.
|
||||
*
|
||||
* @param props.adminOnly - When true, only users with admin or super_admin role may access child routes.
|
||||
* @returns A redirect to login or dashboard, or an outlet for authorized child routes.
|
||||
*/
|
||||
export function RequireAuth({
|
||||
adminOnly = false,
|
||||
staffOnly = false,
|
||||
permission,
|
||||
}: {
|
||||
adminOnly?: boolean;
|
||||
staffOnly?: boolean;
|
||||
/** Minimum permission for this route (overrides adminOnly when set). */
|
||||
permission?: string;
|
||||
}) {
|
||||
const { isAuthenticated, isAdmin, isStaff } = useAuth();
|
||||
const { isAuthenticated, isAdmin, hasAdminPanel, isStaff, can } = useAuth();
|
||||
const location = useLocation();
|
||||
|
||||
if (!isAuthenticated) {
|
||||
@ -27,8 +24,17 @@ export function RequireAuth({
|
||||
if (staffOnly && !isStaff) {
|
||||
return <Navigate to="/home" replace />;
|
||||
}
|
||||
if (adminOnly && !isAdmin) {
|
||||
return <Navigate to="/home" replace />;
|
||||
|
||||
const requiredPerm = permission ?? ADMIN_PAGE_PERMISSIONS[location.pathname];
|
||||
|
||||
if (adminOnly || requiredPerm) {
|
||||
if (!hasAdminPanel && !isAdmin) {
|
||||
return <Navigate to="/home" replace />;
|
||||
}
|
||||
if (requiredPerm && !can(requiredPerm)) {
|
||||
return <Navigate to="/home" replace />;
|
||||
}
|
||||
}
|
||||
|
||||
return <Outlet />;
|
||||
}
|
||||
|
||||
90
prediqo_web/src/shared/auth/permissions.ts
Normal file
90
prediqo_web/src/shared/auth/permissions.ts
Normal file
@ -0,0 +1,90 @@
|
||||
/**
|
||||
* Client-side permission resolution (mirrors backend permissionResolver).
|
||||
*/
|
||||
|
||||
const LEGACY_IMPLIES: Record<string, string[]> = {
|
||||
'users.admin': [
|
||||
'admin.users.view',
|
||||
'admin.users.create',
|
||||
'admin.users.edit',
|
||||
'admin.users.delete',
|
||||
'admin.users.export',
|
||||
'admin.users.manage',
|
||||
],
|
||||
'games.admin': ['admin.games.view', 'admin.games.edit', 'admin.games.delete'],
|
||||
'reports.admin': ['admin.reports.view', 'admin.reports.export'],
|
||||
'settings.admin': ['admin.settings.view', 'admin.settings.edit'],
|
||||
'referral.admin': ['admin.referral.view', 'admin.referral.manage', 'admin.referral_fraud.view'],
|
||||
'treasury.view': ['admin.treasury.view', 'admin.treasury.manage'],
|
||||
'security.admin': ['admin.security.view', 'admin.security.manage'],
|
||||
'ledger.credit': ['admin.ledger_credit.manage'],
|
||||
'user.manage_roles': ['admin.rbac.view', 'admin.rbac.manage'],
|
||||
'fund_operation.request': ['admin.fund_operations.request'],
|
||||
'fund_operation.approve': ['admin.fund_operations.approve'],
|
||||
};
|
||||
|
||||
function expand(userPerms: string[]): Set<string> {
|
||||
const out = new Set(userPerms);
|
||||
for (const p of userPerms) {
|
||||
LEGACY_IMPLIES[p]?.forEach((k) => out.add(k));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
export function hasPermission(userPerms: string[], required: string): boolean {
|
||||
if (userPerms.includes(required)) return true;
|
||||
const expanded = expand(userPerms);
|
||||
if (expanded.has(required)) return true;
|
||||
const implied = LEGACY_IMPLIES[required];
|
||||
if (implied?.some((g) => userPerms.includes(g) || expanded.has(g))) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
export function hasAnyPermission(userPerms: string[], required: string[]): boolean {
|
||||
return required.some((p) => hasPermission(userPerms, p));
|
||||
}
|
||||
|
||||
export function hasAllPermissions(userPerms: string[], required: string[]): boolean {
|
||||
return required.every((p) => hasPermission(userPerms, p));
|
||||
}
|
||||
|
||||
/** Route/page → minimum permission to view */
|
||||
export const ADMIN_PAGE_PERMISSIONS: Record<string, string> = {
|
||||
'/dashboard': 'admin.dashboard.view',
|
||||
'/options': 'admin.dashboard.view',
|
||||
'/admin/users': 'admin.users.view',
|
||||
'/admin/reports': 'admin.reports.view',
|
||||
'/admin/settings': 'admin.settings.view',
|
||||
'/admin/catalog': 'admin.games.view',
|
||||
'/admin/treasury': 'admin.treasury.view',
|
||||
'/admin/approvals': 'admin.fund_operations.approve',
|
||||
'/admin/security': 'admin.security.view',
|
||||
'/admin/referral': 'admin.referral.view',
|
||||
'/admin/referral/fraud': 'admin.referral_fraud.view',
|
||||
'/admin/test-wallet': 'admin.test_wallet.view',
|
||||
'/admin/share-cards': 'admin.share_cards.view',
|
||||
'/admin/solo-encouragement': 'admin.solo_encouragement.view',
|
||||
'/admin/countries': 'admin.countries.view',
|
||||
'/admin/network': 'admin.network.view',
|
||||
'/admin/rbac': 'admin.rbac.view',
|
||||
'/admin/support': 'admin.support.view',
|
||||
'/admin/faq': 'admin.faq.view',
|
||||
};
|
||||
|
||||
export const OPTIONS_CARD_PERMISSIONS: Record<string, string> = {
|
||||
users: 'admin.users.view',
|
||||
settings: 'admin.settings.view',
|
||||
catalog: 'admin.games.view',
|
||||
treasury: 'admin.treasury.view',
|
||||
referral: 'admin.referral.view',
|
||||
referralFraud: 'admin.referral_fraud.view',
|
||||
testWallet: 'admin.test_wallet.view',
|
||||
shareCards: 'admin.share_cards.view',
|
||||
soloEncouragement: 'admin.solo_encouragement.view',
|
||||
security: 'admin.security.view',
|
||||
network: 'admin.network.view',
|
||||
faq: 'admin.faq.view',
|
||||
support: 'admin.support.view',
|
||||
countries: 'admin.countries.view',
|
||||
rbac: 'admin.rbac.view',
|
||||
};
|
||||
@ -1,7 +1,8 @@
|
||||
/**
|
||||
* Shared role helpers for route guards and UI visibility.
|
||||
* Super administrators inherit every administrator capability.
|
||||
*/
|
||||
import { hasAnyPermission } from './permissions';
|
||||
|
||||
export function userRoleList(roles: string[] | undefined, role?: string | null): string[] {
|
||||
if (roles?.length) return roles;
|
||||
if (role) return [role];
|
||||
@ -13,7 +14,44 @@ export function hasAdminAccess(roles: string[] | undefined, role?: string | null
|
||||
return list.includes('admin') || list.includes('super_admin');
|
||||
}
|
||||
|
||||
export function hasStaffAccess(roles: string[] | undefined, role?: string | null): boolean {
|
||||
const list = userRoleList(roles, role);
|
||||
return list.includes('moderator') || hasAdminAccess(roles, role);
|
||||
const COARSE_ADMIN = new Set([
|
||||
'users.admin',
|
||||
'games.admin',
|
||||
'reports.admin',
|
||||
'settings.admin',
|
||||
'referral.admin',
|
||||
'treasury.view',
|
||||
'security.admin',
|
||||
'user.manage_roles',
|
||||
'fund_operation.request',
|
||||
'fund_operation.approve',
|
||||
'ledger.credit',
|
||||
]);
|
||||
|
||||
export function hasAdminPanelAccess(
|
||||
roles: string[] | undefined,
|
||||
role: string | null | undefined,
|
||||
permissions: string[] | undefined
|
||||
): boolean {
|
||||
if (hasAdminAccess(roles, role)) return true;
|
||||
const perms = permissions ?? [];
|
||||
return perms.some((p) => p.startsWith('admin.') || COARSE_ADMIN.has(p));
|
||||
}
|
||||
|
||||
export function hasStaffAccess(
|
||||
roles: string[] | undefined,
|
||||
role: string | null | undefined,
|
||||
permissions?: string[]
|
||||
): boolean {
|
||||
const list = userRoleList(roles, role);
|
||||
if (list.includes('moderator') || hasAdminAccess(roles, role)) return true;
|
||||
const perms = permissions ?? [];
|
||||
return hasAnyPermission(perms, [
|
||||
'admin.support.view',
|
||||
'admin.support.manage',
|
||||
'admin.faq.view',
|
||||
'admin.faq.manage',
|
||||
'security.admin',
|
||||
'admin.security.view',
|
||||
]);
|
||||
}
|
||||
|
||||
@ -816,6 +816,7 @@ export const en = {
|
||||
tableView: 'Table view',
|
||||
treeView: 'Tree view',
|
||||
commissionHistory: 'Commission history',
|
||||
showMore: 'Show more ({{remaining}} left)',
|
||||
},
|
||||
modes: {
|
||||
both: 'Deposits + withdrawal gains',
|
||||
@ -925,6 +926,7 @@ export const en = {
|
||||
alertsLedger: 'Alerts / Ledger',
|
||||
staff: 'Staff',
|
||||
registration: 'Registration',
|
||||
accessControl: 'Access control',
|
||||
},
|
||||
options: {
|
||||
title: 'Options',
|
||||
@ -986,6 +988,48 @@ export const en = {
|
||||
title: 'Countries',
|
||||
description: 'Sync country catalog and block registration by country of residence.',
|
||||
},
|
||||
rbac: {
|
||||
title: 'Roles & permissions',
|
||||
description: 'Create custom admin roles, assign granular permissions, and manage access profiles.',
|
||||
},
|
||||
},
|
||||
},
|
||||
rbac: {
|
||||
title: 'Roles & permissions',
|
||||
subtitle: 'Manage system and custom roles with fine-grained admin permissions.',
|
||||
createRole: 'Create role',
|
||||
editRole: 'Edit role',
|
||||
deleteRole: 'Delete role',
|
||||
editRoleTitle: 'Edit role — {{name}}',
|
||||
systemRole: 'System role',
|
||||
roleName: 'Role name',
|
||||
roleNameHint: 'Lowercase letters, numbers, and underscores (e.g. reports_viewer)',
|
||||
roleDescription: 'Description',
|
||||
permissions: 'Permissions',
|
||||
userCount: '{{count}} user(s)',
|
||||
permissionCount: '{{count}} permission(s)',
|
||||
loadFailed: 'Failed to load roles.',
|
||||
saveFailed: 'Failed to save role.',
|
||||
confirmDelete: 'Delete role "{{name}}"? This cannot be undone.',
|
||||
categories: {
|
||||
users: 'Users',
|
||||
games: 'Games & catalog',
|
||||
reports: 'Reports',
|
||||
settings: 'Settings',
|
||||
referral: 'Referral',
|
||||
treasury: 'Treasury',
|
||||
security: 'Security',
|
||||
rbac: 'Roles & permissions',
|
||||
fund_operations: 'Fund operations',
|
||||
ledger: 'Ledger',
|
||||
dashboard: 'Dashboard',
|
||||
support: 'Support',
|
||||
faq: 'FAQ',
|
||||
countries: 'Countries',
|
||||
network: 'Network',
|
||||
test_wallet: 'Test wallet',
|
||||
share_cards: 'Share cards',
|
||||
solo_encouragement: 'Solo encouragement',
|
||||
},
|
||||
},
|
||||
approvals: {
|
||||
@ -1046,8 +1090,10 @@ export const en = {
|
||||
filters: 'Filters',
|
||||
clear: 'Clear',
|
||||
filtersActive: 'Filters active: {{count}}',
|
||||
searchLabel: 'Search by ID, email, or referral code',
|
||||
searchPlaceholder: 'e.g. user@example.com or REF123',
|
||||
searchLabel: 'Search by exact email, user ID, name, or referral code',
|
||||
searchPlaceholder: 'Exact email, full/partial UUID, name, or REF code',
|
||||
searchHelper:
|
||||
'Email must be exact (encrypted at rest). User ID accepts full or partial UUID. Name matches first/last name.',
|
||||
accountStatus: {
|
||||
active: 'Active',
|
||||
disabled: 'Disabled',
|
||||
@ -1585,6 +1631,7 @@ export const en = {
|
||||
loadError: 'Failed to load settings.',
|
||||
noSettings: 'No settings loaded.',
|
||||
saveFailed: 'Failed to save settings',
|
||||
readOnlyHint: 'You can view settings but do not have permission to modify them.',
|
||||
retry: 'Retry',
|
||||
save: 'Save settings',
|
||||
saving: 'Saving…',
|
||||
@ -1771,6 +1818,7 @@ export const en = {
|
||||
saved: 'Settings saved.',
|
||||
save: 'Save settings',
|
||||
saving: 'Saving…',
|
||||
readOnlyHint: 'Read-only access — you cannot change test wallet settings.',
|
||||
history: 'Credit history',
|
||||
date: 'Date',
|
||||
user: 'User',
|
||||
@ -1806,6 +1854,7 @@ export const en = {
|
||||
save: 'Save settings',
|
||||
saveFailed: 'Save failed',
|
||||
saved: 'Settings saved.',
|
||||
readOnlyHint: 'Read-only access — you cannot change share card settings.',
|
||||
},
|
||||
soloEncouragement: {
|
||||
title: 'Solo encouragement bonus',
|
||||
@ -1867,6 +1916,7 @@ export const en = {
|
||||
loadError: 'Failed to load referral configuration.',
|
||||
fundPending: 'Bonus pool funding submitted — pending super-admin approval',
|
||||
programSettings: 'Program settings',
|
||||
readOnlyHint: 'Read-only access — you cannot change referral settings.',
|
||||
programEnabled: 'Program enabled',
|
||||
programDisabledHint:
|
||||
'Referral program is disabled. Enable it to configure commission modes, levels, and the bonus pool.',
|
||||
@ -1964,6 +2014,7 @@ export const en = {
|
||||
reject: 'Reject',
|
||||
rejectReason: 'Rejection reason',
|
||||
statsTitle: 'Statistics',
|
||||
openCommissionReport: 'Open commission history report',
|
||||
referredUsers: 'Referred users: {{count}}',
|
||||
commissionsPaid: 'Commissions paid (platform): {{amount}}',
|
||||
payoutEvents: 'Payout events: {{count}}',
|
||||
@ -2075,6 +2126,7 @@ export const en = {
|
||||
},
|
||||
supportAdmin: {
|
||||
title: 'Support center',
|
||||
readOnlyHint: 'You can read conversations but cannot reply or change their status.',
|
||||
read: ' · Read',
|
||||
visitorTyping: 'Visitor is typing…',
|
||||
newMessageTitle: 'New support message',
|
||||
|
||||
@ -830,6 +830,7 @@ export const fr = {
|
||||
tableView: 'Vue tableau',
|
||||
treeView: 'Vue arbre',
|
||||
commissionHistory: 'Historique des commissions',
|
||||
showMore: 'Voir plus ({{remaining}} restants)',
|
||||
},
|
||||
modes: {
|
||||
both: 'Dépôts + gains de retrait',
|
||||
@ -939,6 +940,7 @@ export const fr = {
|
||||
alertsLedger: 'Alertes / Grand livre',
|
||||
staff: 'Équipe',
|
||||
registration: 'Inscription',
|
||||
accessControl: 'Contrôle d’accès',
|
||||
},
|
||||
options: {
|
||||
title: 'Options',
|
||||
@ -1002,6 +1004,48 @@ export const fr = {
|
||||
title: 'Pays',
|
||||
description: 'Synchroniser le catalogue pays et bloquer l’inscription par pays de résidence.',
|
||||
},
|
||||
rbac: {
|
||||
title: 'Rôles & permissions',
|
||||
description: 'Créer des rôles admin personnalisés, attribuer des permissions granulaires et gérer les profils d’accès.',
|
||||
},
|
||||
},
|
||||
},
|
||||
rbac: {
|
||||
title: 'Rôles & permissions',
|
||||
subtitle: 'Gérer les rôles système et personnalisés avec des permissions admin fines.',
|
||||
createRole: 'Créer un rôle',
|
||||
editRole: 'Modifier le rôle',
|
||||
deleteRole: 'Supprimer le rôle',
|
||||
editRoleTitle: 'Modifier le rôle — {{name}}',
|
||||
systemRole: 'Rôle système',
|
||||
roleName: 'Nom du rôle',
|
||||
roleNameHint: 'Lettres minuscules, chiffres et underscores (ex. lecteur_rapports)',
|
||||
roleDescription: 'Description',
|
||||
permissions: 'Permissions',
|
||||
userCount: '{{count}} utilisateur(s)',
|
||||
permissionCount: '{{count}} permission(s)',
|
||||
loadFailed: 'Impossible de charger les rôles.',
|
||||
saveFailed: 'Impossible d’enregistrer le rôle.',
|
||||
confirmDelete: 'Supprimer le rôle « {{name}} » ? Cette action est irréversible.',
|
||||
categories: {
|
||||
users: 'Utilisateurs',
|
||||
games: 'Jeux & catalogue',
|
||||
reports: 'Rapports',
|
||||
settings: 'Paramètres',
|
||||
referral: 'Parrainage',
|
||||
treasury: 'Trésorerie',
|
||||
security: 'Sécurité',
|
||||
rbac: 'Rôles & permissions',
|
||||
fund_operations: 'Opérations de fonds',
|
||||
ledger: 'Grand livre',
|
||||
dashboard: 'Tableau de bord',
|
||||
support: 'Assistance',
|
||||
faq: 'FAQ',
|
||||
countries: 'Pays',
|
||||
network: 'Réseau',
|
||||
test_wallet: 'Portefeuille test',
|
||||
share_cards: 'Cartes de partage',
|
||||
solo_encouragement: 'Encouragement solo',
|
||||
},
|
||||
},
|
||||
approvals: {
|
||||
@ -1062,8 +1106,10 @@ export const fr = {
|
||||
filters: 'Filtres',
|
||||
clear: 'Effacer',
|
||||
filtersActive: 'Filtres actifs : {{count}}',
|
||||
searchLabel: 'Rechercher par ID, e-mail ou code parrain',
|
||||
searchPlaceholder: 'ex. user@example.com ou REF123',
|
||||
searchLabel: 'Rechercher par e-mail exact, ID, nom ou code parrain',
|
||||
searchPlaceholder: 'E-mail exact, UUID (complet/partiel), nom ou code REF',
|
||||
searchHelper:
|
||||
'L’e-mail doit être exact (stocké chiffré). L’ID accepte un UUID complet ou partiel. Le nom cherche prénom/nom.',
|
||||
accountStatus: {
|
||||
active: 'Actif',
|
||||
disabled: 'Désactivé',
|
||||
@ -1602,6 +1648,7 @@ export const fr = {
|
||||
loadError: 'Impossible de charger les paramètres.',
|
||||
noSettings: 'Aucun paramètre chargé.',
|
||||
saveFailed: 'Échec de l’enregistrement des paramètres',
|
||||
readOnlyHint: 'Vous pouvez consulter les paramètres mais vous n’avez pas la permission de les modifier.',
|
||||
retry: 'Réessayer',
|
||||
save: 'Enregistrer les paramètres',
|
||||
saving: 'Enregistrement…',
|
||||
@ -1788,6 +1835,7 @@ export const fr = {
|
||||
saved: 'Paramètres enregistrés.',
|
||||
save: 'Enregistrer les paramètres',
|
||||
saving: 'Enregistrement…',
|
||||
readOnlyHint: 'Accès lecture seule — vous ne pouvez pas modifier les paramètres du wallet de test.',
|
||||
history: 'Historique des crédits',
|
||||
date: 'Date',
|
||||
user: 'Utilisateur',
|
||||
@ -1823,6 +1871,7 @@ export const fr = {
|
||||
save: 'Enregistrer les paramètres',
|
||||
saveFailed: 'Échec de l’enregistrement',
|
||||
saved: 'Paramètres enregistrés.',
|
||||
readOnlyHint: 'Accès lecture seule — vous ne pouvez pas modifier les paramètres Share Cards.',
|
||||
},
|
||||
soloEncouragement: {
|
||||
title: 'Bonus d’encouragement solo',
|
||||
@ -1884,6 +1933,7 @@ export const fr = {
|
||||
loadError: 'Impossible de charger la configuration parrainage.',
|
||||
fundPending: 'Alimentation du pool bonus soumise — en attente d’approbation super-admin',
|
||||
programSettings: 'Paramètres du programme',
|
||||
readOnlyHint: 'Accès lecture seule — vous ne pouvez pas modifier les paramètres de parrainage.',
|
||||
programEnabled: 'Programme activé',
|
||||
programDisabledHint:
|
||||
'Le programme de parrainage est désactivé. Activez-le pour configurer les modes de commission, les niveaux et le pool bonus.',
|
||||
@ -1983,6 +2033,7 @@ export const fr = {
|
||||
reject: 'Rejeter',
|
||||
rejectReason: 'Motif de rejet',
|
||||
statsTitle: 'Statistiques',
|
||||
openCommissionReport: 'Ouvrir le rapport d’historique des commissions',
|
||||
referredUsers: 'Utilisateurs parrainés : {{count}}',
|
||||
commissionsPaid: 'Commissions payées (plateforme) : {{amount}}',
|
||||
payoutEvents: 'Événements de paiement : {{count}}',
|
||||
@ -2095,6 +2146,7 @@ export const fr = {
|
||||
},
|
||||
supportAdmin: {
|
||||
title: 'Centre d’assistance',
|
||||
readOnlyHint: 'Vous pouvez lire les conversations mais pas répondre ni modifier leur statut.',
|
||||
read: ' · Lu',
|
||||
visitorTyping: 'Le visiteur écrit…',
|
||||
newMessageTitle: 'Nouveau message support',
|
||||
|
||||
@ -80,6 +80,16 @@ export const reportCatalogEn = {
|
||||
title: 'Bonus history',
|
||||
description: 'Bonus credits and referral commissions.',
|
||||
},
|
||||
'financial-encouragement-grants': {
|
||||
title: 'Solo encouragement bonuses',
|
||||
description:
|
||||
'Solo encouragement grants (eligible, granted, rejected, skipped) with stake/loss base and bonus credit.',
|
||||
},
|
||||
'financial-commission-history': {
|
||||
title: 'Commission history',
|
||||
description:
|
||||
'Referral commissions across all statuses and sources (prediction, deposit, withdrawal).',
|
||||
},
|
||||
'financial-adjustments': {
|
||||
title: 'Admin adjustments',
|
||||
description: 'Approved administrative balance adjustments.',
|
||||
@ -231,6 +241,16 @@ export const reportCatalogFr = {
|
||||
title: 'Historique des bonus',
|
||||
description: 'Crédits bonus et commissions de parrainage.',
|
||||
},
|
||||
'financial-encouragement-grants': {
|
||||
title: 'Bonus d’encouragement solo',
|
||||
description:
|
||||
'Grants d’encouragement solo (éligibles, accordés, refusés, ignorés) avec mises/pertes et crédit bonus.',
|
||||
},
|
||||
'financial-commission-history': {
|
||||
title: 'Historique des commissions',
|
||||
description:
|
||||
'Commissions de parrainage (tous statuts et sources : prédiction, dépôt, retrait).',
|
||||
},
|
||||
'financial-adjustments': {
|
||||
title: 'Ajustements admin',
|
||||
description: 'Ajustements administratifs approuvés.',
|
||||
|
||||
@ -43,6 +43,7 @@ import {
|
||||
import { useTheme } from '@mui/material/styles';
|
||||
import { Link as RouterLink, Outlet, useLocation } from 'react-router-dom';
|
||||
import { useAuth } from '../auth/AuthContext';
|
||||
import { ADMIN_PAGE_PERMISSIONS } from '../auth/permissions';
|
||||
import { useAppPresenceHeartbeat } from '../hooks/useAppPresenceHeartbeat';
|
||||
import { useEffect, useMemo, useState, useCallback } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
@ -59,7 +60,7 @@ import { apiErrorMessage, isAdmin2faRequiredError } from '../utils/apiError';
|
||||
*/
|
||||
export function AppShell() {
|
||||
const { t } = useTranslation();
|
||||
const { logout, isAdmin, isStaff, auth, canApproveFundOps } = useAuth();
|
||||
const { logout, isAdmin, hasAdminPanel, isStaff, auth, canApproveFundOps, can } = useAuth();
|
||||
const theme = useTheme();
|
||||
const isMdUp = useMediaQuery(theme.breakpoints.up('md'));
|
||||
const [mobileOpen, setMobileOpen] = useState(false);
|
||||
@ -83,7 +84,7 @@ export function AppShell() {
|
||||
);
|
||||
|
||||
const { connected: securityWsConnected } = useSecuritySocket({
|
||||
enabled: isAdmin,
|
||||
enabled: hasAdminPanel || isAdmin,
|
||||
onEvent: onSecurityBadgeEvent,
|
||||
});
|
||||
|
||||
@ -95,7 +96,7 @@ export function AppShell() {
|
||||
});
|
||||
return res.data.unreadCount;
|
||||
},
|
||||
enabled: isAdmin,
|
||||
enabled: hasAdminPanel || isAdmin,
|
||||
refetchInterval: securityWsConnected ? 120_000 : 30_000,
|
||||
});
|
||||
|
||||
@ -105,7 +106,7 @@ export function AppShell() {
|
||||
await api.get('/api/v1/admin/overview');
|
||||
return true;
|
||||
},
|
||||
enabled: isAdmin,
|
||||
enabled: hasAdminPanel || isAdmin,
|
||||
retry: false,
|
||||
staleTime: 60_000,
|
||||
});
|
||||
@ -135,6 +136,30 @@ export function AppShell() {
|
||||
setMobileOpen(false);
|
||||
}, [location.pathname]);
|
||||
|
||||
const adminNavItems = useMemo(
|
||||
() =>
|
||||
[
|
||||
{ label: t('nav.overview'), to: '/dashboard', icon: <DashboardRoundedIcon /> },
|
||||
{ label: t('nav.reports'), to: '/admin/reports', icon: <AssessmentRoundedIcon /> },
|
||||
{ label: t('nav.options'), to: '/options', icon: <TuneRoundedIcon /> },
|
||||
{ label: t('nav.users'), to: '/admin/users', icon: <PeopleOutlineRoundedIcon /> },
|
||||
{
|
||||
label: t('nav.security'),
|
||||
to: '/admin/security',
|
||||
icon: (
|
||||
<Badge color="error" badgeContent={unreadNotifications} invisible={unreadNotifications === 0}>
|
||||
<SecurityRoundedIcon />
|
||||
</Badge>
|
||||
),
|
||||
},
|
||||
{ label: t('nav.settings'), to: '/admin/settings', icon: <SettingsOutlinedIcon /> },
|
||||
].filter((item) => {
|
||||
const perm = ADMIN_PAGE_PERMISSIONS[item.to];
|
||||
return !perm || can(perm);
|
||||
}),
|
||||
[t, can, unreadNotifications]
|
||||
);
|
||||
|
||||
const navItems = useMemo(
|
||||
() =>
|
||||
[
|
||||
@ -159,26 +184,9 @@ export function AppShell() {
|
||||
...(canApproveFundOps
|
||||
? [{ label: t('nav.approvals'), to: '/admin/approvals', icon: <GavelRoundedIcon /> }]
|
||||
: []),
|
||||
...(isAdmin
|
||||
? [
|
||||
{ label: t('nav.overview'), to: '/dashboard', icon: <DashboardRoundedIcon /> },
|
||||
{ label: t('nav.reports'), to: '/admin/reports', icon: <AssessmentRoundedIcon /> },
|
||||
{ label: t('nav.options'), to: '/options', icon: <TuneRoundedIcon /> },
|
||||
{ label: t('nav.users'), to: '/admin/users', icon: <PeopleOutlineRoundedIcon /> },
|
||||
{
|
||||
label: t('nav.security'),
|
||||
to: '/admin/security',
|
||||
icon: (
|
||||
<Badge color="error" badgeContent={unreadNotifications} invisible={unreadNotifications === 0}>
|
||||
<SecurityRoundedIcon />
|
||||
</Badge>
|
||||
),
|
||||
},
|
||||
{ label: t('nav.settings'), to: '/admin/settings', icon: <SettingsOutlinedIcon /> },
|
||||
]
|
||||
: []),
|
||||
...(hasAdminPanel || isAdmin ? adminNavItems : []),
|
||||
] as const,
|
||||
[t, isAdmin, isStaff, canApproveFundOps, unreadNotifications, unreadSupport]
|
||||
[t, isAdmin, hasAdminPanel, isStaff, canApproveFundOps, unreadSupport, adminNavItems]
|
||||
);
|
||||
|
||||
const drawer = (
|
||||
|
||||
Loading…
Reference in New Issue
Block a user