cnpmcore 3.80.1 → 3.81.0
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.
- package/dist/app/core/entity/TeamMember.d.ts +2 -0
- package/dist/app/core/entity/TeamMember.js +2 -1
- package/dist/app/core/service/OrgService.js +3 -1
- package/dist/app/core/service/TeamService.d.ts +2 -2
- package/dist/app/core/service/TeamService.js +16 -6
- package/dist/app/port/controller/OrgController.d.ts +1 -0
- package/dist/app/port/controller/OrgController.js +3 -3
- package/dist/app/port/controller/TeamController.d.ts +10 -0
- package/dist/app/port/controller/TeamController.js +102 -5
- package/dist/app/repository/TeamRepository.d.ts +4 -1
- package/dist/app/repository/TeamRepository.js +11 -4
- package/dist/app/repository/model/TeamMember.d.ts +1 -0
- package/dist/app/repository/model/TeamMember.js +5 -1
- package/package.json +1 -1
|
@@ -4,12 +4,14 @@ interface TeamMemberData extends EntityData {
|
|
|
4
4
|
teamMemberId: string;
|
|
5
5
|
teamId: string;
|
|
6
6
|
userId: string;
|
|
7
|
+
role: string;
|
|
7
8
|
}
|
|
8
9
|
export type CreateTeamMemberData = Omit<EasyData<TeamMemberData, 'teamMemberId'>, 'id'>;
|
|
9
10
|
export declare class TeamMember extends Entity {
|
|
10
11
|
teamMemberId: string;
|
|
11
12
|
teamId: string;
|
|
12
13
|
userId: string;
|
|
14
|
+
role: string;
|
|
13
15
|
constructor(data: TeamMemberData);
|
|
14
16
|
static create(data: CreateTeamMemberData): TeamMember;
|
|
15
17
|
}
|
|
@@ -9,6 +9,7 @@ class TeamMember extends Entity_1.Entity {
|
|
|
9
9
|
this.teamMemberId = data.teamMemberId;
|
|
10
10
|
this.teamId = data.teamId;
|
|
11
11
|
this.userId = data.userId;
|
|
12
|
+
this.role = data.role || 'member';
|
|
12
13
|
}
|
|
13
14
|
static create(data) {
|
|
14
15
|
const newData = EntityUtil_1.EntityUtil.defaultData(data, 'teamMemberId');
|
|
@@ -16,4 +17,4 @@ class TeamMember extends Entity_1.Entity {
|
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
19
|
exports.TeamMember = TeamMember;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVhbU1lbWJlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9UZWFtTWVtYmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUE4QztBQUM5QyxtREFBMEQ7QUFXMUQsTUFBYSxVQUFXLFNBQVEsZUFBTTtJQU1wQyxZQUFZLElBQW9CO1FBQzlCLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNaLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQztRQUN0QyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxRQUFRLENBQUM7SUFDcEMsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBMEI7UUFDdEMsTUFBTSxPQUFPLEdBQUcsdUJBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQzdELE9BQU8sSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakMsQ0FBQztDQUNGO0FBbEJELGdDQWtCQyJ9
|
|
@@ -44,6 +44,7 @@ let OrgService = class OrgService extends AbstractService_1.AbstractService {
|
|
|
44
44
|
const teamMember = TeamMember_1.TeamMember.create({
|
|
45
45
|
teamId: developersTeam.teamId,
|
|
46
46
|
userId: cmd.creatorUserId,
|
|
47
|
+
role: 'owner',
|
|
47
48
|
});
|
|
48
49
|
await this.orgRepository.createOrgCascade(org, developersTeam, ownerMember, teamMember);
|
|
49
50
|
this.logger.info('[OrgService:createOrg] orgId: %s, name: %s, creatorUserId: %s', org.orgId, org.name, cmd.creatorUserId);
|
|
@@ -93,6 +94,7 @@ let OrgService = class OrgService extends AbstractService_1.AbstractService {
|
|
|
93
94
|
const teamMember = TeamMember_1.TeamMember.create({
|
|
94
95
|
teamId: developersTeam.teamId,
|
|
95
96
|
userId,
|
|
97
|
+
role: 'member',
|
|
96
98
|
});
|
|
97
99
|
await this.teamRepository.addMember(teamMember);
|
|
98
100
|
}
|
|
@@ -133,4 +135,4 @@ exports.OrgService = OrgService = __decorate([
|
|
|
133
135
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
134
136
|
})
|
|
135
137
|
], OrgService);
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3JnU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL3NlcnZpY2UvT3JnU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFDckIsMkNBQTJEO0FBQzNELGtFQUErRDtBQUMvRCxzREFBeUQ7QUFDekQsa0VBQStEO0FBQy9ELG9FQUFpRTtBQUNqRSx1Q0FBb0M7QUFDcEMsbURBQWdEO0FBQ2hELHlDQUFzQztBQUN0QyxxREFBa0Q7QUFXM0MsSUFBTSxVQUFVLEdBQWhCLE1BQU0sVUFBVyxTQUFRLGlDQUFlO0lBTzdDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBaUI7UUFDL0IsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEUsSUFBSSxRQUFRLEVBQUU7WUFDWixNQUFNLElBQUksMkJBQWMsQ0FBQyxRQUFRLEdBQUcsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLENBQUM7U0FDOUQ7UUFFRCx3RUFBd0U7UUFDeEUsTUFBTSxHQUFHLEdBQUcsU0FBRyxDQUFDLE1BQU0sQ0FBQztZQUNyQixJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUk7WUFDZCxXQUFXLEVBQUUsR0FBRyxDQUFDLFdBQVc7U0FDN0IsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxjQUFjLEdBQUcsV0FBSSxDQUFDLE1BQU0sQ0FBQztZQUNqQyxLQUFLLEVBQUUsR0FBRyxDQUFDLEtBQUs7WUFDaEIsSUFBSSxFQUFFLDJCQUFlO1lBQ3JCLFdBQVcsRUFBRSxjQUFjO1NBQzVCLENBQUMsQ0FBQztRQUNILE1BQU0sV0FBVyxHQUFHLHFCQUFTLENBQUMsTUFBTSxDQUFDO1lBQ25DLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSztZQUNoQixNQUFNLEVBQUUsR0FBRyxDQUFDLGFBQWE7WUFDekIsSUFBSSxFQUFFLE9B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
|
|
@@ -5,9 +5,9 @@ import { TeamPackage } from '../entity/TeamPackage';
|
|
|
5
5
|
export declare class TeamService extends AbstractService {
|
|
6
6
|
private readonly orgRepository;
|
|
7
7
|
private readonly teamRepository;
|
|
8
|
-
createTeam(orgId: string, name: string, description?: string): Promise<Team>;
|
|
8
|
+
createTeam(orgId: string, name: string, description?: string, creatorUserId?: string): Promise<Team>;
|
|
9
9
|
removeTeam(teamId: string): Promise<void>;
|
|
10
|
-
addMember(teamId: string, userId: string): Promise<TeamMember>;
|
|
10
|
+
addMember(teamId: string, userId: string, role?: 'owner' | 'member'): Promise<TeamMember>;
|
|
11
11
|
removeMember(teamId: string, userId: string): Promise<void>;
|
|
12
12
|
listMembers(teamId: string): Promise<TeamMember[]>;
|
|
13
13
|
grantPackageAccess(teamId: string, packageId: string): Promise<TeamPackage>;
|
|
@@ -20,7 +20,7 @@ const Team_1 = require("../entity/Team");
|
|
|
20
20
|
const TeamMember_1 = require("../entity/TeamMember");
|
|
21
21
|
const TeamPackage_1 = require("../entity/TeamPackage");
|
|
22
22
|
let TeamService = class TeamService extends AbstractService_1.AbstractService {
|
|
23
|
-
async createTeam(orgId, name, description) {
|
|
23
|
+
async createTeam(orgId, name, description, creatorUserId) {
|
|
24
24
|
const existing = await this.teamRepository.findTeam(orgId, name);
|
|
25
25
|
if (existing) {
|
|
26
26
|
throw new egg_errors_1.ForbiddenError(`Team "${name}" already exists`);
|
|
@@ -31,7 +31,12 @@ let TeamService = class TeamService extends AbstractService_1.AbstractService {
|
|
|
31
31
|
description,
|
|
32
32
|
});
|
|
33
33
|
await this.teamRepository.saveTeam(team);
|
|
34
|
-
|
|
34
|
+
// Auto-add creator as team owner
|
|
35
|
+
if (creatorUserId) {
|
|
36
|
+
const member = TeamMember_1.TeamMember.create({ teamId: team.teamId, userId: creatorUserId, role: 'owner' });
|
|
37
|
+
await this.teamRepository.addMember(member);
|
|
38
|
+
}
|
|
39
|
+
this.logger.info('[TeamService:createTeam] teamId: %s, orgId: %s, name: %s, creator: %s', team.teamId, orgId, name, creatorUserId);
|
|
35
40
|
return team;
|
|
36
41
|
}
|
|
37
42
|
async removeTeam(teamId) {
|
|
@@ -46,7 +51,7 @@ let TeamService = class TeamService extends AbstractService_1.AbstractService {
|
|
|
46
51
|
await this.teamRepository.removeTeamCascade(teamId);
|
|
47
52
|
this.logger.info('[TeamService:removeTeam] teamId: %s', teamId);
|
|
48
53
|
}
|
|
49
|
-
async addMember(teamId, userId) {
|
|
54
|
+
async addMember(teamId, userId, role = 'member') {
|
|
50
55
|
const team = await this.teamRepository.findTeamByTeamId(teamId);
|
|
51
56
|
if (!team) {
|
|
52
57
|
throw new egg_errors_1.NotFoundError('Team not found');
|
|
@@ -62,11 +67,16 @@ let TeamService = class TeamService extends AbstractService_1.AbstractService {
|
|
|
62
67
|
}
|
|
63
68
|
const existing = await this.teamRepository.findMember(teamId, userId);
|
|
64
69
|
if (existing) {
|
|
70
|
+
// Update role if changed
|
|
71
|
+
if (existing.role !== role) {
|
|
72
|
+
existing.role = role;
|
|
73
|
+
await this.teamRepository.addMember(existing);
|
|
74
|
+
}
|
|
65
75
|
return existing;
|
|
66
76
|
}
|
|
67
|
-
const member = TeamMember_1.TeamMember.create({ teamId, userId });
|
|
77
|
+
const member = TeamMember_1.TeamMember.create({ teamId, userId, role });
|
|
68
78
|
await this.teamRepository.addMember(member);
|
|
69
|
-
this.logger.info('[TeamService:addMember] teamId: %s, userId: %s', teamId, userId);
|
|
79
|
+
this.logger.info('[TeamService:addMember] teamId: %s, userId: %s, role: %s', teamId, userId, role);
|
|
70
80
|
return member;
|
|
71
81
|
}
|
|
72
82
|
async removeMember(teamId, userId) {
|
|
@@ -112,4 +122,4 @@ exports.TeamService = TeamService = __decorate([
|
|
|
112
122
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
113
123
|
})
|
|
114
124
|
], TeamService);
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVhbVNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1RlYW1TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUlxQjtBQUNyQiwyQ0FBMkQ7QUFDM0Qsa0VBQStEO0FBQy9ELHNEQUF5RDtBQUN6RCxrRUFBK0Q7QUFDL0Qsb0VBQWlFO0FBQ2pFLHlDQUFzQztBQUN0QyxxREFBa0Q7QUFDbEQsdURBQW9EO0FBSzdDLElBQU0sV0FBVyxHQUFqQixNQUFNLFdBQVksU0FBUSxpQ0FBZTtJQVE5QyxLQUFLLENBQUMsVUFBVSxDQUFDLEtBQWEsRUFBRSxJQUFZLEVBQUUsV0FBb0IsRUFBRSxhQUFzQjtRQUN4RixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNqRSxJQUFJLFFBQVEsRUFBRTtZQUNaLE1BQU0sSUFBSSwyQkFBYyxDQUFDLFNBQVMsSUFBSSxrQkFBa0IsQ0FBQyxDQUFDO1NBQzNEO1FBRUQsTUFBTSxJQUFJLEdBQUcsV0FBSSxDQUFDLE1BQU0sQ0FBQztZQUN2QixLQUFLO1lBQ0wsSUFBSTtZQUNKLFdBQVc7U0FDWixDQUFDLENBQUM7UUFDSCxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRXpDLGlDQUFpQztRQUNqQyxJQUFJLGFBQWEsRUFBRTtZQUNqQixNQUFNLE1BQU0sR0FBRyx1QkFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDaEcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUM3QztRQUVELElB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
|
|
@@ -121,8 +121,8 @@ let OrgController = class OrgController extends AbstractController_1.AbstractCon
|
|
|
121
121
|
if (!targetUser) {
|
|
122
122
|
throw new egg_errors_1.NotFoundError(`User "${username}" not found`);
|
|
123
123
|
}
|
|
124
|
-
const
|
|
125
|
-
return
|
|
124
|
+
const teamResults = await this.teamRepository.listTeamsByUserIdAndOrgId(targetUser.userId, org.orgId);
|
|
125
|
+
return teamResults.map(t => ({ name: t.team.name, description: t.team.description, role: t.role }));
|
|
126
126
|
}
|
|
127
127
|
};
|
|
128
128
|
exports.OrgController = OrgController;
|
|
@@ -219,4 +219,4 @@ __decorate([
|
|
|
219
219
|
exports.OrgController = OrgController = __decorate([
|
|
220
220
|
(0, tegg_1.HTTPController)()
|
|
221
221
|
], OrgController);
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"OrgController.js","sourceRoot":"","sources":["../../../../app/port/controller/OrgController.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { AbstractController } from './AbstractController';
|
|
|
3
3
|
export declare class TeamController extends AbstractController {
|
|
4
4
|
private readonly orgService;
|
|
5
5
|
private readonly teamService;
|
|
6
|
+
private readonly orgRepository;
|
|
6
7
|
private readonly teamRepository;
|
|
7
8
|
private isAllowScopeOrg;
|
|
8
9
|
private findOrg;
|
|
@@ -24,6 +25,15 @@ export declare class TeamController extends AbstractController {
|
|
|
24
25
|
ok: boolean;
|
|
25
26
|
}>;
|
|
26
27
|
listTeamMembers(ctx: EggContext, orgName: string, teamName: string): Promise<string[]>;
|
|
28
|
+
listTeamMembersWithRole(ctx: EggContext, orgName: string, teamName: string): Promise<{
|
|
29
|
+
user: string;
|
|
30
|
+
role: string;
|
|
31
|
+
}[]>;
|
|
32
|
+
updateTeamMemberRole(ctx: EggContext, orgName: string, teamName: string, username: string, body: {
|
|
33
|
+
role: string;
|
|
34
|
+
}): Promise<{
|
|
35
|
+
ok: boolean;
|
|
36
|
+
}>;
|
|
27
37
|
addTeamMember(ctx: EggContext, orgName: string, teamName: string, body: {
|
|
28
38
|
user: string;
|
|
29
39
|
}): Promise<{
|
|
@@ -18,6 +18,7 @@ const egg_errors_1 = require("egg-errors");
|
|
|
18
18
|
const AbstractController_1 = require("./AbstractController");
|
|
19
19
|
const OrgService_1 = require("../../core/service/OrgService");
|
|
20
20
|
const TeamService_1 = require("../../core/service/TeamService");
|
|
21
|
+
const OrgRepository_1 = require("../../repository/OrgRepository");
|
|
21
22
|
const TeamRepository_1 = require("../../repository/TeamRepository");
|
|
22
23
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
23
24
|
let TeamController = class TeamController extends AbstractController_1.AbstractController {
|
|
@@ -48,21 +49,48 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
|
|
|
48
49
|
return { org, authorizedUser };
|
|
49
50
|
}
|
|
50
51
|
async requireTeamWriteAccess(ctx, orgName, teamName) {
|
|
51
|
-
const
|
|
52
|
+
const authorizedUser = await this.userRoleManager.requiredAuthorizedUser(ctx, 'setting');
|
|
53
|
+
const isAdmin = await this.userRoleManager.isAdmin(ctx);
|
|
54
|
+
let org;
|
|
55
|
+
if (this.isAllowScopeOrg(orgName)) {
|
|
56
|
+
org = await this.orgService.ensureOrgForScope(`@${orgName}`);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
org = await this.orgService.findOrgByName(orgName);
|
|
60
|
+
if (!org) {
|
|
61
|
+
throw new egg_errors_1.NotFoundError(`Org "${orgName}" not found`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
52
64
|
const team = await this.teamRepository.findTeam(org.orgId, teamName);
|
|
53
65
|
if (!team) {
|
|
54
66
|
throw new egg_errors_1.NotFoundError(`Team "${teamName}" not found`);
|
|
55
67
|
}
|
|
56
|
-
|
|
68
|
+
// Admin always has access
|
|
69
|
+
if (isAdmin) {
|
|
70
|
+
return { org, team, authorizedUser };
|
|
71
|
+
}
|
|
72
|
+
// Org owner has access
|
|
73
|
+
if (!this.isAllowScopeOrg(orgName)) {
|
|
74
|
+
const orgMember = await this.orgRepository.findMember(org.orgId, authorizedUser.userId);
|
|
75
|
+
if (orgMember && orgMember.role === 'owner') {
|
|
76
|
+
return { org, team, authorizedUser };
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
// Team owner has access
|
|
80
|
+
const teamMember = await this.teamRepository.findMember(team.teamId, authorizedUser.userId);
|
|
81
|
+
if (teamMember && teamMember.role === 'owner') {
|
|
82
|
+
return { org, team, authorizedUser };
|
|
83
|
+
}
|
|
84
|
+
throw new egg_errors_1.ForbiddenError('Only team owner or admin can perform this action');
|
|
57
85
|
}
|
|
58
86
|
// --- Team CRUD ---
|
|
59
87
|
// npm team create @scope:team → PUT /-/org/:orgName/team
|
|
60
88
|
async createTeam(ctx, orgName, body) {
|
|
61
|
-
const { org } = await this.requireOrgWriteAccess(ctx, orgName);
|
|
89
|
+
const { org, authorizedUser } = await this.requireOrgWriteAccess(ctx, orgName);
|
|
62
90
|
if (!body.name) {
|
|
63
91
|
throw new egg_errors_1.UnprocessableEntityError('name is required');
|
|
64
92
|
}
|
|
65
|
-
await this.teamService.createTeam(org.orgId, body.name, body.description);
|
|
93
|
+
await this.teamService.createTeam(org.orgId, body.name, body.description, authorizedUser.userId);
|
|
66
94
|
return { ok: true };
|
|
67
95
|
}
|
|
68
96
|
// npm team ls @scope → GET /-/org/:orgName/team
|
|
@@ -101,6 +129,7 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
|
|
|
101
129
|
}
|
|
102
130
|
// --- Team Members (npm uses "user") ---
|
|
103
131
|
// npm team ls @scope:team → GET /-/team/:orgName/:teamName/user
|
|
132
|
+
// npm compatible: returns string array ["user1", "user2"]
|
|
104
133
|
async listTeamMembers(ctx, orgName, teamName) {
|
|
105
134
|
await this.userRoleManager.requiredAuthorizedUser(ctx, 'read');
|
|
106
135
|
const org = await this.findOrg(orgName);
|
|
@@ -115,6 +144,44 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
|
|
|
115
144
|
const users = await this.userRepository.findUsersByUserIds(members.map(m => m.userId));
|
|
116
145
|
return users.map(u => u.displayName);
|
|
117
146
|
}
|
|
147
|
+
// Private API: GET /-/team/:orgName/:teamName/member
|
|
148
|
+
// Returns [{user, role}] with team member role info
|
|
149
|
+
async listTeamMembersWithRole(ctx, orgName, teamName) {
|
|
150
|
+
await this.userRoleManager.requiredAuthorizedUser(ctx, 'read');
|
|
151
|
+
const org = await this.findOrg(orgName);
|
|
152
|
+
if (!org) {
|
|
153
|
+
throw new egg_errors_1.NotFoundError(`Org "${orgName}" not found`);
|
|
154
|
+
}
|
|
155
|
+
const team = await this.teamRepository.findTeam(org.orgId, teamName);
|
|
156
|
+
if (!team) {
|
|
157
|
+
throw new egg_errors_1.NotFoundError(`Team "${teamName}" not found`);
|
|
158
|
+
}
|
|
159
|
+
const members = await this.teamService.listMembers(team.teamId);
|
|
160
|
+
const users = await this.userRepository.findUsersByUserIds(members.map(m => m.userId));
|
|
161
|
+
const userMap = new Map(users.map(u => [u.userId, u]));
|
|
162
|
+
return members.map(m => ({
|
|
163
|
+
user: userMap.get(m.userId)?.displayName ?? '',
|
|
164
|
+
role: m.role,
|
|
165
|
+
}));
|
|
166
|
+
}
|
|
167
|
+
// Private API: PATCH /-/team/:orgName/:teamName/member/:username
|
|
168
|
+
// Update team member role
|
|
169
|
+
async updateTeamMemberRole(ctx, orgName, teamName, username, body) {
|
|
170
|
+
const { team } = await this.requireTeamWriteAccess(ctx, orgName, teamName);
|
|
171
|
+
if (!body.role || (body.role !== 'owner' && body.role !== 'member')) {
|
|
172
|
+
throw new egg_errors_1.UnprocessableEntityError('role is required and must be "owner" or "member"');
|
|
173
|
+
}
|
|
174
|
+
const targetUser = await this.userRepository.findUserByName(username);
|
|
175
|
+
if (!targetUser) {
|
|
176
|
+
throw new egg_errors_1.NotFoundError(`User "${username}" not found`);
|
|
177
|
+
}
|
|
178
|
+
const member = await this.teamRepository.findMember(team.teamId, targetUser.userId);
|
|
179
|
+
if (!member) {
|
|
180
|
+
throw new egg_errors_1.NotFoundError(`User "${username}" is not a member of this team`);
|
|
181
|
+
}
|
|
182
|
+
await this.teamService.addMember(team.teamId, targetUser.userId, body.role);
|
|
183
|
+
return { ok: true };
|
|
184
|
+
}
|
|
118
185
|
// npm team add <user> @scope:team → PUT /-/team/:orgName/:teamName/user
|
|
119
186
|
async addTeamMember(ctx, orgName, teamName, body) {
|
|
120
187
|
const { team } = await this.requireTeamWriteAccess(ctx, orgName, teamName);
|
|
@@ -199,6 +266,10 @@ __decorate([
|
|
|
199
266
|
(0, tegg_1.Inject)(),
|
|
200
267
|
__metadata("design:type", TeamService_1.TeamService)
|
|
201
268
|
], TeamController.prototype, "teamService", void 0);
|
|
269
|
+
__decorate([
|
|
270
|
+
(0, tegg_1.Inject)(),
|
|
271
|
+
__metadata("design:type", OrgRepository_1.OrgRepository)
|
|
272
|
+
], TeamController.prototype, "orgRepository", void 0);
|
|
202
273
|
__decorate([
|
|
203
274
|
(0, tegg_1.Inject)(),
|
|
204
275
|
__metadata("design:type", TeamRepository_1.TeamRepository)
|
|
@@ -262,6 +333,32 @@ __decorate([
|
|
|
262
333
|
__metadata("design:paramtypes", [Object, String, String]),
|
|
263
334
|
__metadata("design:returntype", Promise)
|
|
264
335
|
], TeamController.prototype, "listTeamMembers", null);
|
|
336
|
+
__decorate([
|
|
337
|
+
(0, tegg_1.HTTPMethod)({
|
|
338
|
+
path: '/-/team/:orgName/:teamName/member',
|
|
339
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
340
|
+
}),
|
|
341
|
+
__param(0, (0, tegg_1.Context)()),
|
|
342
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
343
|
+
__param(2, (0, tegg_1.HTTPParam)()),
|
|
344
|
+
__metadata("design:type", Function),
|
|
345
|
+
__metadata("design:paramtypes", [Object, String, String]),
|
|
346
|
+
__metadata("design:returntype", Promise)
|
|
347
|
+
], TeamController.prototype, "listTeamMembersWithRole", null);
|
|
348
|
+
__decorate([
|
|
349
|
+
(0, tegg_1.HTTPMethod)({
|
|
350
|
+
path: '/-/team/:orgName/:teamName/member/:username',
|
|
351
|
+
method: tegg_1.HTTPMethodEnum.PATCH,
|
|
352
|
+
}),
|
|
353
|
+
__param(0, (0, tegg_1.Context)()),
|
|
354
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
355
|
+
__param(2, (0, tegg_1.HTTPParam)()),
|
|
356
|
+
__param(3, (0, tegg_1.HTTPParam)()),
|
|
357
|
+
__param(4, (0, tegg_1.HTTPBody)()),
|
|
358
|
+
__metadata("design:type", Function),
|
|
359
|
+
__metadata("design:paramtypes", [Object, String, String, String, Object]),
|
|
360
|
+
__metadata("design:returntype", Promise)
|
|
361
|
+
], TeamController.prototype, "updateTeamMemberRole", null);
|
|
265
362
|
__decorate([
|
|
266
363
|
(0, tegg_1.HTTPMethod)({
|
|
267
364
|
path: '/-/team/:orgName/:teamName/user',
|
|
@@ -329,4 +426,4 @@ __decorate([
|
|
|
329
426
|
exports.TeamController = TeamController = __decorate([
|
|
330
427
|
(0, tegg_1.HTTPController)()
|
|
331
428
|
], TeamController);
|
|
332
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeamController.js","sourceRoot":"","sources":["../../../../app/port/controller/TeamController.ts"],"names":[],"mappings":"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"}
|
|
429
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeamController.js","sourceRoot":"","sources":["../../../../app/port/controller/TeamController.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,10 @@ export declare class TeamRepository extends AbstractRepository {
|
|
|
13
13
|
removeTeam(teamId: string): Promise<void>;
|
|
14
14
|
removeAllTeamsByOrgId(orgId: string): Promise<void>;
|
|
15
15
|
listTeamsByUserId(userId: string): Promise<Team[]>;
|
|
16
|
-
listTeamsByUserIdAndOrgId(userId: string, orgId: string): Promise<
|
|
16
|
+
listTeamsByUserIdAndOrgId(userId: string, orgId: string): Promise<{
|
|
17
|
+
team: Team;
|
|
18
|
+
role: string;
|
|
19
|
+
}[]>;
|
|
17
20
|
findMember(teamId: string, userId: string): Promise<TeamMember | null>;
|
|
18
21
|
addMember(member: TeamMember): Promise<void>;
|
|
19
22
|
removeMember(teamId: string, userId: string): Promise<void>;
|
|
@@ -66,10 +66,13 @@ let TeamRepository = class TeamRepository extends AbstractRepository_1.AbstractR
|
|
|
66
66
|
const memberModels = await this.TeamMember.find({ userId, teamId: { $in: orgTeamIds } });
|
|
67
67
|
if (memberModels.length === 0)
|
|
68
68
|
return [];
|
|
69
|
-
const
|
|
69
|
+
const memberRoleMap = new Map(memberModels.map(m => [m.teamId, m.role || 'member']));
|
|
70
70
|
return orgTeams
|
|
71
|
-
.filter(t =>
|
|
72
|
-
.map(model =>
|
|
71
|
+
.filter(t => memberRoleMap.has(t.teamId))
|
|
72
|
+
.map(model => ({
|
|
73
|
+
team: ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Team_1.Team),
|
|
74
|
+
role: memberRoleMap.get(model.teamId) || 'member',
|
|
75
|
+
}));
|
|
73
76
|
}
|
|
74
77
|
// --- TeamMember ---
|
|
75
78
|
async findMember(teamId, userId) {
|
|
@@ -80,6 +83,10 @@ let TeamRepository = class TeamRepository extends AbstractRepository_1.AbstractR
|
|
|
80
83
|
}
|
|
81
84
|
async addMember(member) {
|
|
82
85
|
if (member.id) {
|
|
86
|
+
const model = await this.TeamMember.findOne({ id: member.id });
|
|
87
|
+
if (model) {
|
|
88
|
+
await ModelConvertor_1.ModelConvertor.saveEntityToModel(member, model);
|
|
89
|
+
}
|
|
83
90
|
return;
|
|
84
91
|
}
|
|
85
92
|
await ModelConvertor_1.ModelConvertor.convertEntityToModel(member, this.TeamMember);
|
|
@@ -177,4 +184,4 @@ exports.TeamRepository = TeamRepository = __decorate([
|
|
|
177
184
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
178
185
|
})
|
|
179
186
|
], TeamRepository);
|
|
180
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeamRepository.js","sourceRoot":"","sources":["../../../app/repository/TeamRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAkE;AAClE,0DAAuD;AACvD,6DAA0D;AAI1D,8CAA2C;AAC3C,0DAAuD;AACvD,4DAAyD;AAKlD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,uCAAkB;IAUpD,oBAAoB;IAEpB,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,IAAY;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAI,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACnC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAI,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAI,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACvD,IAAI,KAAK,EAAE;gBACT,MAAM,+BAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACrD;YACD,OAAO;SACR;QACD,MAAM,+BAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc;QAC7B,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACvC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc;QACpC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5D,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAI,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc,EAAE,KAAa;QAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACjD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACzF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACzC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAE,CAAC,CAAC,CAAC;QACvF,OAAO,QAAQ;aACZ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;aACxC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACb,IAAI,EAAE,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAI,CAAC;YACtD,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,QAAQ;SAClD,CAAC,CAAC,CAAC;IACR,CAAC;IAED,qBAAqB;IAErB,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,MAAc;QAC7C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAU,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAkB;QAChC,IAAI,MAAM,CAAC,EAAE,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,KAAK,EAAE;gBACT,MAAM,+BAAc,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aACvD;YACD,OAAO;SACR;QACD,MAAM,+BAAc,CAAC,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,MAAc;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,KAAa,EAAE,MAAc;QAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAU,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc;QAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,KAAa;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,sBAAsB;IAEtB,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,SAAiB;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,yBAAW,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,WAAwB;QACvC,IAAI,WAAW,CAAC,EAAE,EAAE;YAClB,OAAO;SACR;QACD,MAAM,+BAAc,CAAC,oBAAoB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAc,EAAE,SAAiB;QACnD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,+BAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,yBAAW,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc;QACpC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACnD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAChE,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAC/D,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,KAAa;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,CAAC,KAAK,CAAC;IACjB,CAAC;IAED,qEAAqE;IACrE,KAAK,CAAC,gBAAgB,CAAC,SAAiB,EAAE,MAAc;QACtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC5C,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACnF,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;CACF,CAAA;AA7KY,wCAAc;AAER;IADhB,IAAA,aAAM,GAAE;;4CAC+B;AAGvB;IADhB,IAAA,aAAM,GAAE;;kDAC2C;AAGnC;IADhB,IAAA,aAAM,GAAE;;mDAC6C;yBAR3C,cAAc;IAH1B,IAAA,qBAAc,EAAC;QACd,WAAW,EAAE,kBAAW,CAAC,MAAM;KAChC,CAAC;GACW,cAAc,CA6K1B"}
|
|
@@ -42,7 +42,11 @@ __decorate([
|
|
|
42
42
|
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24)),
|
|
43
43
|
__metadata("design:type", String)
|
|
44
44
|
], TeamMember.prototype, "userId", void 0);
|
|
45
|
+
__decorate([
|
|
46
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(20)),
|
|
47
|
+
__metadata("design:type", String)
|
|
48
|
+
], TeamMember.prototype, "role", void 0);
|
|
45
49
|
exports.TeamMember = TeamMember = __decorate([
|
|
46
50
|
(0, orm_1.Model)()
|
|
47
51
|
], TeamMember);
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVhbU1lbWJlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L21vZGVsL1RlYW1NZW1iZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEseUNBQW1EO0FBQ25ELG1DQUF5QztBQUdsQyxJQUFNLFVBQVUsR0FBaEIsTUFBTSxVQUFXLFNBQVEsYUFBSTtDQXdCbkMsQ0FBQTtBQXhCWSxnQ0FBVTtBQUtyQjtJQUpDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxFQUFFO1FBQzNCLE9BQU8sRUFBRSxJQUFJO1FBQ2IsYUFBYSxFQUFFLElBQUk7S0FDcEIsQ0FBQzs7c0NBQ1M7QUFHWDtJQURDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxDQUFDOzhCQUN2QyxJQUFJOzZDQUFDO0FBR2hCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLENBQUM7OEJBQ3pDLElBQUk7NkNBQUM7QUFHaEI7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7Z0RBQ1g7QUFHckI7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7MENBQ2pCO0FBR2Y7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7MENBQ2pCO0FBR2Y7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7d0NBQ25CO3FCQXZCRixVQUFVO0lBRHRCLElBQUEsV0FBSyxHQUFFO0dBQ0ssVUFBVSxDQXdCdEIifQ==
|