unleash-server 4.12.1 → 4.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,6 +3,7 @@ import Controller from '../controller';
|
|
|
3
3
|
import { IUnleashConfig } from '../../types/option';
|
|
4
4
|
import { IUnleashServices } from '../../types/services';
|
|
5
5
|
import { IAuthRequest } from '../unleash-types';
|
|
6
|
+
import { IUser } from '../../server-impl';
|
|
6
7
|
interface ICreateUserBody {
|
|
7
8
|
username: string;
|
|
8
9
|
email: string;
|
|
@@ -11,6 +12,7 @@ interface ICreateUserBody {
|
|
|
11
12
|
sendEmail: boolean;
|
|
12
13
|
}
|
|
13
14
|
export default class UserAdminController extends Controller {
|
|
15
|
+
private anonymise;
|
|
14
16
|
private userService;
|
|
15
17
|
private accessService;
|
|
16
18
|
private readonly logger;
|
|
@@ -23,6 +25,7 @@ export default class UserAdminController extends Controller {
|
|
|
23
25
|
resetPassword(req: IAuthRequest, res: Response): Promise<void>;
|
|
24
26
|
getUsers(req: Request, res: Response): Promise<void>;
|
|
25
27
|
getActiveSessions(req: Request, res: Response): Promise<void>;
|
|
28
|
+
anonymiseUsers(users: IUser[]): IUser[];
|
|
26
29
|
search(req: Request, res: Response): Promise<void>;
|
|
27
30
|
getUser(req: Request, res: Response): Promise<void>;
|
|
28
31
|
createUser(req: IAuthRequest<any, any, ICreateUserBody, any>, res: Response): Promise<void>;
|
|
@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const controller_1 = __importDefault(require("../controller"));
|
|
7
7
|
const permissions_1 = require("../../types/permissions");
|
|
8
8
|
const simple_auth_settings_1 = require("../../types/settings/simple-auth-settings");
|
|
9
|
+
const anonymise_1 = require("../../util/anonymise");
|
|
9
10
|
class UserAdminController extends controller_1.default {
|
|
10
11
|
constructor(config, { userService, accessService, emailService, resetTokenService, sessionService, settingService, }) {
|
|
11
12
|
super(config);
|
|
13
|
+
this.anonymise = false;
|
|
12
14
|
this.userService = userService;
|
|
13
15
|
this.accessService = accessService;
|
|
14
16
|
this.emailService = emailService;
|
|
@@ -17,6 +19,7 @@ class UserAdminController extends controller_1.default {
|
|
|
17
19
|
this.settingService = settingService;
|
|
18
20
|
this.logger = config.getLogger('routes/user-controller.ts');
|
|
19
21
|
this.unleashUrl = config.server.unleashUrl;
|
|
22
|
+
this.anonymise = config.experimental?.anonymiseEventLog;
|
|
20
23
|
this.get('/', this.getUsers, permissions_1.ADMIN);
|
|
21
24
|
this.get('/search', this.search);
|
|
22
25
|
this.post('/', this.createUser, permissions_1.ADMIN);
|
|
@@ -48,10 +51,20 @@ class UserAdminController extends controller_1.default {
|
|
|
48
51
|
const sessions = await this.sessionService.getActiveSessions();
|
|
49
52
|
res.json(sessions);
|
|
50
53
|
}
|
|
54
|
+
anonymiseUsers(users) {
|
|
55
|
+
return users.map((u) => ({
|
|
56
|
+
...u,
|
|
57
|
+
email: (0, anonymise_1.anonymise)(u.email || 'random'),
|
|
58
|
+
imageUrl: 'https://gravatar.com/avatar/21232f297a57a5a743894a0e4a801fc3?size=42&default=retro',
|
|
59
|
+
}));
|
|
60
|
+
}
|
|
51
61
|
async search(req, res) {
|
|
52
62
|
const { q } = req.query;
|
|
53
63
|
try {
|
|
54
|
-
|
|
64
|
+
let users = q && q.length > 1 ? await this.userService.search(q) : [];
|
|
65
|
+
if (this.anonymise) {
|
|
66
|
+
users = this.anonymiseUsers(users);
|
|
67
|
+
}
|
|
55
68
|
res.json(users);
|
|
56
69
|
}
|
|
57
70
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-admin.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user-admin.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AACvC,yDAAsD;AAYtD,oFAA0E;
|
|
1
|
+
{"version":3,"file":"user-admin.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user-admin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED