Merge Backend

app/api/server/v1/teams.ts

@@ -2,7 +2,7 @@ import { Promise } from 'meteor/promise';
 
 import { API } from '../api';
 import { Team } from '../../../../server/sdk';
-import { hasPermission } from '../../../authorization/server';
+import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/server';
 
 API.v1.addRoute('teams.list', { authRequired: true }, {
 	get() {
@@ -40,6 +40,9 @@ API.v1.addRoute('teams.listAll', { authRequired: true }, {
 
 API.v1.addRoute('teams.create', { authRequired: true }, {
 	post() {
+		if (!hasPermission(this.userId, 'create-team')) {
+			return API.v1.unauthorized();
+		}
 		const { name, type, members, room, owner } = this.bodyParams;
 
 		if (!name) {
@@ -62,15 +65,71 @@ API.v1.addRoute('teams.create', { authRequired: true }, {
 
 API.v1.addRoute('teams.members', { authRequired: true }, {
 	get() {
-		const { teamId } = this.queryParams;
+		const { offset, count } = this.getPaginationItems();
+		const { teamId, teamName } = this.queryParams;
+
+		const { records, total } = Promise.await(Team.members(teamId, teamName, { offset, count }));
+
+		return API.v1.success({
+			members: records,
+			total,
+			count: records.length,
+			offset,
+		});
+	},
+});
+
+API.v1.addRoute('teams.addMembers', { authRequired: true }, {
+	post() {
+		if (!hasAtLeastOnePermission(this.userId, ['add-team-member', 'edit-team-member'])) {
+			return API.v1.unauthorized();
+		}
+
+		const { teamId, teamName, members } = this.bodyParams;
+
+		Promise.await(Team.addMembers(this.userId, teamId, teamName, members));
+
+		return API.v1.success();
+	},
+});
+
+API.v1.addRoute('teams.updateMember', { authRequired: true }, {
+	post() {
+		if (!hasAtLeastOnePermission(this.userId, ['edit-team-member'])) {
+			return API.v1.unauthorized();
+		}
+
+		const { teamId, teamName, member } = this.bodyParams;
+
+		Promise.await(Team.updateMember(teamId, teamName, member));
+
+		return API.v1.success();
+	},
+});
 
-		if (!teamId) {
-			return API.v1.failure('Team ID is required');
+API.v1.addRoute('teams.removeMembers', { authRequired: true }, {
+	post() {
+		if (!hasAtLeastOnePermission(this.userId, ['edit-team-member'])) {
+			return API.v1.unauthorized();
 		}
 
-		const members = Promise.await(Team.members(this.userId, teamId));
+		const { teamId, teamName, members } = this.bodyParams;
+
+		Promise.await(Team.removeMembers(teamId, teamName, members));
+
+		return API.v1.success();
+	},
+});
+
+API.v1.addRoute('teams.leave', { authRequired: true }, {
+	post() {
+		const { teamId, teamName } = this.bodyParams;
+
+		Promise.await(Team.removeMembers(teamId, teamName, [{
+			userId: this.userId,
+		}]));
 
-		return API.v1.success({ members });
+		return API.v1.success();
 	},
 });
 

app/lib/server/functions/addUserToRoom.js

@@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import { AppEvents, Apps } from '../../../apps/server';
 import { callbacks } from '../../../callbacks';
 import { Messages, Rooms, Subscriptions } from '../../../models';
+import { Team } from '../../../../server/sdk';
 import { RoomMemberActions, roomTypes } from '../../../utils/server';
 
 export const addUserToRoom = function(rid, user, inviter, silenced) {
@@ -84,5 +85,10 @@ export const addUserToRoom = function(rid, user, inviter, silenced) {
 		});
 	}
 
+	if (room.teamMain && room.teamId) {
+		// if user is joining to main team channel, create a membership
+		Promise.await(Team.addMember(inviter, user._id, room.teamId));
+	}
+
 	return true;
 };

app/models/server/raw/Team.ts

@@ -1,4 +1,4 @@
-import { Collection, FindOneOptions, Cursor } from 'mongodb';
+import { Collection, FindOneOptions, Cursor, UpdateWriteOpResult } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { ITeam } from '../../../../definition/ITeam';
@@ -25,4 +25,18 @@ export class TeamRaw extends BaseRaw<T> {
 	findOneByName(name: string, options?: FindOneOptions<T>): Promise<T | null> {
 		return this.col.findOne({ name }, options);
 	}
+
+	findOneByMainRoomId(roomId: string, options?: FindOneOptions<T>): Promise<T | null> {
+		return this.col.findOne({ roomId }, options);
+	}
+
+	updateMainRoomForTeam(id: string, roomId: string): Promise<UpdateWriteOpResult> {
+		return this.col.updateOne({
+			_id: id,
+		}, {
+			$set: {
+				roomId,
+			},
+		});
+	}
 }

app/models/server/raw/TeamMember.ts

@@ -1,7 +1,8 @@
-import { Collection, FindOneOptions, Cursor } from 'mongodb';
+import { Collection, FindOneOptions, Cursor, InsertOneWriteOpResult, UpdateWriteOpResult } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { ITeamMember } from '../../../../definition/ITeam';
+import { IUser } from '../../../../definition/IUser';
 
 type T = ITeamMember;
 export class TeamMemberRaw extends BaseRaw<T> {
@@ -30,4 +31,40 @@ export class TeamMemberRaw extends BaseRaw<T> {
 	findByTeamId(teamId: string, options?: FindOneOptions<T>): Cursor<T> {
 		return this.col.find({ teamId }, options);
 	}
+
+	updateOneByUserIdAndTeamId(userId: string, teamId: string, update: Partial<T>): Promise<UpdateWriteOpResult> {
+		return this.col.updateOne({ userId, teamId }, { $set: update });
+	}
+
+	createOneByTeamIdAndUserId(teamId: string, userId: string, createdBy: Pick<IUser, '_id' | 'username'>): Promise<InsertOneWriteOpResult<T>> {
+		return this.insertOne({
+			teamId,
+			userId,
+			createdAt: new Date(),
+			_updatedAt: new Date(),
+			createdBy,
+		});
+	}
+
+	updateRolesByTeamIdAndUserId(teamId: string, userId: string, roles: Array<string>): Promise<UpdateWriteOpResult> {
+		return this.col.updateOne({
+			teamId,
+			userId,
+		}, {
+			$addToSet: {
+				roles: { $each: roles },
+			},
+		});
+	}
+
+	removeRolesByTeamIdAndUserId(teamId: string, userId: string, roles: Array<string>): Promise<UpdateWriteOpResult> {
+		return this.col.updateOne({
+			teamId,
+			userId,
+		}, {
+			$pull: {
+				roles: { $in: roles },
+			},
+		});
+	}
 }

definition/ITeam.ts

@@ -9,6 +9,7 @@ export enum TEAM_TYPE {
 export interface ITeam extends IRocketChatRecord {
 	name: string;
 	type: TEAM_TYPE;
+	roomId: string;
 	createdBy: Pick<IUser, '_id' | 'username' >;
 	createdAt: Date;
 }

server/methods/addRoomLeader.js

@@ -5,6 +5,7 @@ import { hasPermission } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
+import { Team } from '../sdk';
 
 Meteor.methods({
 	addRoomLeader(rid, userId) {
@@ -57,6 +58,11 @@ Meteor.methods({
 			role: 'leader',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.addRolesToMember(team._id, userId, ['leader']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'added',

server/methods/addRoomModerator.js

@@ -5,6 +5,7 @@ import { hasPermission } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
+import { Team } from '../sdk';
 
 Meteor.methods({
 	addRoomModerator(rid, userId) {
@@ -57,6 +58,11 @@ Meteor.methods({
 			role: 'moderator',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.addRolesToMember(team._id, userId, ['moderator']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'added',

server/methods/addRoomOwner.js

@@ -3,6 +3,7 @@ import { check } from 'meteor/check';
 
 import { hasPermission } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
+import { Team } from '../sdk';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
 
@@ -57,6 +58,11 @@ Meteor.methods({
 			role: 'owner',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.addRolesToMember(team._id, userId, ['owner']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'added',

server/methods/removeRoomLeader.js

@@ -5,6 +5,7 @@ import { hasPermission } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
+import { Team } from '../sdk';
 
 Meteor.methods({
 	removeRoomLeader(rid, userId) {
@@ -57,6 +58,11 @@ Meteor.methods({
 			role: 'leader',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.removeRolesFromMember(team._id, userId, ['leader']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'removed',

server/methods/removeRoomModerator.js

@@ -5,6 +5,7 @@ import { hasPermission } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
+import { Team } from '../sdk';
 
 Meteor.methods({
 	removeRoomModerator(rid, userId) {
@@ -57,6 +58,11 @@ Meteor.methods({
 			role: 'moderator',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.removeRolesFromMember(team._id, userId, ['moderator']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'removed',

server/methods/removeRoomOwner.js

@@ -5,6 +5,7 @@ import { hasPermission, getUsersInRole } from '../../app/authorization';
 import { Users, Subscriptions, Messages } from '../../app/models';
 import { settings } from '../../app/settings';
 import { api } from '../sdk/api';
+import { Team } from '../sdk';
 
 Meteor.methods({
 	removeRoomOwner(rid, userId) {
@@ -64,6 +65,11 @@ Meteor.methods({
 			role: 'owner',
 		});
 
+		const team = Promise.await(Team.getOneByRoomId(rid));
+		if (team) {
+			Promise.await(Team.removeRolesFromMember(team._id, userId, ['owner']));
+		}
+
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'removed',

server/sdk/types/IRoomService.ts

@@ -12,8 +12,9 @@ interface ICreateRoomOptions extends Partial<Record<string, string | ISubscripti
 	subscriptionExtra?: ISubscriptionExtraData;
 }
 
-interface ICreateRoomExtraData extends Record<string, string> {
+interface ICreateRoomExtraData extends Record<string, string | boolean> {
 	teamId: string;
+	teamMain: boolean;
 }
 
 export interface ICreateRoomParams {

server/sdk/types/ITeamService.ts

@@ -8,11 +8,20 @@ export interface ITeamCreateParams {
 	owner?: string; // the team owner. If not present, owner = requester
 }
 
+export interface ITeamMemberParams {
+	userId?: string;
+	userName?: string;
+	roles?: Array<string>;
+}
+
 export interface ITeamService {
 	create(uid: string, params: ITeamCreateParams): Promise<ITeam>;
 	list(uid: string, options?: IPaginationOptions): Promise<IRecordsWithTotal<ITeam>>;
 	listAll(options?: IPaginationOptions): Promise<IRecordsWithTotal<ITeam>>;
-	members(uid: string, teamId: string): Promise<Array<ITeamMember>>;
+	members(teamId: string, teamName: string, options?: IPaginationOptions): Promise<IRecordsWithTotal<ITeamMember>>;
+	addMembers(uid: string, teamId: string, teamName: string, members: Array<ITeamMemberParams>): Promise<void>;
+	updateMember(teamId: string, teamName: string, members: ITeamMemberParams): Promise<void>;
+	removeMembers(teamId: string, teamName: string, members: Array<ITeamMemberParams>): Promise<void>;
 	getInfoByName(teamName: string): Promise<Partial<ITeam> | undefined>;
 	getInfoById(teamId: string): Promise<Partial<ITeam> | undefined>;
 }