- WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.
+ {{_ "Two-factor_authentication_native_mobile_app_warning"}}
{{#if isEnabled}}
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 3d2e33387f9..95e10d278eb 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -332,13 +332,22 @@ RocketChat.API.v1.addRoute('channels.leave', { authRequired: true }, {
RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, {
get: {
- //This is like this only to provide an example of how we routes can be defined :X
+ //This is defined as such only to provide an example of how the routes can be defined :X
action() {
const { offset, count } = this.getPaginationItems();
const { sort, fields, query } = this.parseJsonQuery();
const ourQuery = Object.assign({}, query, { t: 'c' });
+ //Special check for the permissions
+ if (RocketChat.authz.hasPermission(this.userId, 'view-joined-room')) {
+ ourQuery.usernames = {
+ $in: [ this.user.username ]
+ };
+ } else if (!RocketChat.authz.hasPermission(this.userId, 'view-c-room')) {
+ return RocketChat.API.v1.unauthorized();
+ }
+
const rooms = RocketChat.models.Rooms.find(ourQuery, {
sort: sort ? sort : { name: 1 },
skip: offset,
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index d5c11136d38..f2b38a74761 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -64,6 +64,18 @@ RocketChat.API.v1.addRoute('groups.addOwner', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('groups.addLeader', { authRequired: true }, {
+ post() {
+ const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId });
+ const user = this.getUserFromParams();
+ Meteor.runAsUser(this.userId, () => {
+ Meteor.call('addRoomLeader', findResult.rid, user._id);
+ });
+
+ return RocketChat.API.v1.success();
+ }
+});
+
//Archives a private group only if it wasn't
RocketChat.API.v1.addRoute('groups.archive', { authRequired: true }, {
post() {
@@ -373,6 +385,20 @@ RocketChat.API.v1.addRoute('groups.removeOwner', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('groups.removeLeader', { authRequired: true }, {
+ post() {
+ const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId });
+
+ const user = this.getUserFromParams();
+
+ Meteor.runAsUser(this.userId, () => {
+ Meteor.call('removeRoomLeader', findResult.rid, user._id);
+ });
+
+ return RocketChat.API.v1.success();
+ }
+});
+
RocketChat.API.v1.addRoute('groups.rename', { authRequired: true }, {
post() {
if (!this.bodyParams.name || !this.bodyParams.name.trim()) {
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index 2a9651c3098..924eca1b570 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -19,12 +19,17 @@ RocketChat.API.v1.addRoute('users.create', { authRequired: true }, {
this.bodyParams.joinDefaultChannels = true;
}
+ if (this.bodyParams.customFields) {
+ RocketChat.validateCustomFields(this.bodyParams.customFields);
+ }
+
const newUserId = RocketChat.saveUser(this.userId, this.bodyParams);
if (this.bodyParams.customFields) {
- RocketChat.saveCustomFields(newUserId, this.bodyParams.customFields);
+ RocketChat.saveCustomFieldsWithoutValidation(newUserId, this.bodyParams.customFields);
}
+
if (typeof this.bodyParams.active !== 'undefined') {
Meteor.runAsUser(this.userId, () => {
Meteor.call('setUserActiveStatus', newUserId, this.bodyParams.active);
@@ -105,6 +110,10 @@ RocketChat.API.v1.addRoute('users.info', { authRequired: true }, {
RocketChat.API.v1.addRoute('users.list', { authRequired: true }, {
get() {
+ if (!RocketChat.authz.hasPermission(this.userId, 'view-d-room')) {
+ return RocketChat.API.v1.unauthorized();
+ }
+
const { offset, count } = this.getPaginationItems();
const { sort, fields, query } = this.parseJsonQuery();
diff --git a/packages/rocketchat-authorization/client/stylesheets/permissions.less b/packages/rocketchat-authorization/client/stylesheets/permissions.less
index c970dbf8d1f..f82ebed1bb6 100644
--- a/packages/rocketchat-authorization/client/stylesheets/permissions.less
+++ b/packages/rocketchat-authorization/client/stylesheets/permissions.less
@@ -28,6 +28,10 @@
left: 50%;
transform: translateX(-50%);
}
+
+ .permission-name {
+ cursor: default;
+ }
}
.empty-role {
diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/packages/rocketchat-authorization/client/views/permissions.html
index 3d53eb803e4..e0e47d6b426 100644
--- a/packages/rocketchat-authorization/client/views/permissions.html
+++ b/packages/rocketchat-authorization/client/views/permissions.html
@@ -19,7 +19,7 @@
{{#each permission}}
[{{_id}}]
-
-
-
-