-
- {{_ "Two-factor_authentication_native_mobile_app_warning"}}
-
-
{{#if isEnabled}}
{{else}}
diff --git a/packages/rocketchat-analytics/client/loadScript.js b/packages/rocketchat-analytics/client/loadScript.js
index 4e1ee8d7bdae..7d472b89cd71 100644
--- a/packages/rocketchat-analytics/client/loadScript.js
+++ b/packages/rocketchat-analytics/client/loadScript.js
@@ -44,14 +44,14 @@ Template.body.onRendered(() => {
const addTrackers = JSON.parse(piwikAdditionalTracker);
for (let i = 0; i < addTrackers.length; i++) {
const tracker = addTrackers[i];
- window._paq.push(['addTracker', `${ tracker['trackerURL'] }piwik.php`, tracker['siteId']]);
+ window._paq.push(['addTracker', `${ tracker['trackerURL'] }js/`, tracker['siteId']]);
}
}
} catch (e) {
// parsing JSON faild
console.log('Error while parsing JSON value of "piwikAdditionalTracker": ', e);
}
- window._paq.push(['setTrackerUrl', `${ piwikUrl }piwik.php`]);
+ window._paq.push(['setTrackerUrl', `${ piwikUrl }js/`]);
window._paq.push(['setSiteId', Number.parseInt(piwikSiteId)]);
const d = document;
const g = d.createElement('script');
@@ -59,7 +59,7 @@ Template.body.onRendered(() => {
g.type = 'text/javascript';
g.async = true;
g.defer = true;
- g.src = `${ piwikUrl }piwik.js`;
+ g.src = `${ piwikUrl }js/`;
s.parentNode.insertBefore(g, s);
})();
}
diff --git a/packages/rocketchat-api/package.js b/packages/rocketchat-api/package.js
index f97043855418..b842bb304da8 100644
--- a/packages/rocketchat-api/package.js
+++ b/packages/rocketchat-api/package.js
@@ -19,6 +19,7 @@ Package.onUse(function(api) {
api.addFiles('server/helpers/requestParams.js', 'server');
api.addFiles('server/helpers/getPaginationItems.js', 'server');
api.addFiles('server/helpers/getUserFromParams.js', 'server');
+ api.addFiles('server/helpers/getUserInfo.js', 'server');
api.addFiles('server/helpers/isUserFromParams.js', 'server');
api.addFiles('server/helpers/parseJsonQuery.js', 'server');
api.addFiles('server/helpers/deprecationWarning.js', 'server');
@@ -27,7 +28,6 @@ Package.onUse(function(api) {
//Add default routes
api.addFiles('server/default/info.js', 'server');
- api.addFiles('server/default/metrics.js', 'server');
//Add v1 routes
api.addFiles('server/v1/channels.js', 'server');
diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index 29bd0c08c844..eb90cfcba238 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -5,7 +5,6 @@ const logger = new Logger('API', {});
class API extends Restivus {
constructor(properties) {
super(properties);
- this.logger = new Logger(`API ${ properties.version ? properties.version : 'default' } Logger`, {});
this.authMethods = [];
this.fieldSeparator = '.';
this.defaultFieldsToExclude = {
@@ -60,6 +59,10 @@ class API extends Restivus {
return RocketChat.API.helperMethods;
}
+ getHelperMethod(name) {
+ return RocketChat.API.helperMethods.get(name);
+ }
+
addAuthMethod(method) {
this.authMethods.push(method);
}
@@ -135,6 +138,8 @@ class API extends Restivus {
routes = [routes];
}
+ const version = this._config.version;
+
routes.forEach((route) => {
//Note: This is required due to Restivus calling `addRoute` in the constructor of itself
if (this.hasHelperMethods()) {
@@ -146,16 +151,29 @@ class API extends Restivus {
//Add a try/catch for each endpoint
const originalAction = endpoints[method].action;
endpoints[method].action = function _internalRouteActionHandler() {
- this.logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`);
+ const rocketchatRestApiEnd = RocketChat.metrics.rocketchatRestApi.startTimer({
+ method,
+ version,
+ user_agent: this.request.headers['user-agent'],
+ entrypoint: route
+ });
+
+ logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`);
let result;
try {
result = originalAction.apply(this);
} catch (e) {
- this.logger.debug(`${ method } ${ route } threw an error:`, e.stack);
- return RocketChat.API.v1.failure(e.message, e.error);
+ logger.debug(`${ method } ${ route } threw an error:`, e.stack);
+ result = RocketChat.API.v1.failure(e.message, e.error);
}
- return result ? result : RocketChat.API.v1.success();
+ result = result || RocketChat.API.v1.success();
+
+ rocketchatRestApiEnd({
+ status: result.statusCode
+ });
+
+ return result;
};
for (const [name, helperMethod] of this.getHelperMethods()) {
@@ -163,7 +181,7 @@ class API extends Restivus {
}
//Allow the endpoints to make usage of the logger which respects the user's settings
- endpoints[method].logger = this.logger;
+ endpoints[method].logger = logger;
});
}
@@ -224,6 +242,7 @@ class API extends Restivus {
this.addRoute('login', {authRequired: false}, {
post() {
const args = loginCompatibility(this.bodyParams);
+ const getUserInfo = self.getHelperMethod('getUserInfo');
const invocation = new DDPCommon.MethodInvocation({
connection: {
@@ -273,7 +292,8 @@ class API extends Restivus {
status: 'success',
data: {
userId: this.userId,
- authToken: auth.token
+ authToken: auth.token,
+ me: getUserInfo(this.user)
}
};
diff --git a/packages/rocketchat-api/server/default/metrics.js b/packages/rocketchat-api/server/default/metrics.js
deleted file mode 100644
index 89b761c199a1..000000000000
--- a/packages/rocketchat-api/server/default/metrics.js
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketChat.API.default.addRoute('metrics', { authRequired: false }, {
- get() {
- return {
- headers: { 'Content-Type': 'text/plain' },
- body: RocketChat.promclient.register.metrics()
- };
- }
-});
diff --git a/packages/rocketchat-api/server/helpers/getUserInfo.js b/packages/rocketchat-api/server/helpers/getUserInfo.js
new file mode 100644
index 000000000000..0ab30a33ab44
--- /dev/null
+++ b/packages/rocketchat-api/server/helpers/getUserInfo.js
@@ -0,0 +1,56 @@
+const getInfoFromUserObject = (user) => {
+ const {
+ _id,
+ name,
+ emails,
+ status,
+ statusConnection,
+ username,
+ utcOffset,
+ active,
+ language,
+ roles,
+ settings
+ } = user;
+ return {
+ _id,
+ name,
+ emails,
+ status,
+ statusConnection,
+ username,
+ utcOffset,
+ active,
+ language,
+ roles,
+ settings
+ };
+};
+
+
+RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) {
+ const me = getInfoFromUserObject(user);
+ const isVerifiedEmail = () => {
+ if (me && me.emails && Array.isArray(me.emails)) {
+ return me.emails.find((email) => email.verified);
+ }
+ return false;
+ };
+ const getUserPreferences = () => {
+ const defaultUserSettingPrefix = 'Accounts_Default_User_Preferences_';
+ const allDefaultUserSettings = RocketChat.settings.get(new RegExp(`^${ defaultUserSettingPrefix }.*$`));
+
+ return allDefaultUserSettings.reduce((accumulator, setting) => {
+ const settingWithoutPrefix = setting.key.replace(defaultUserSettingPrefix, ' ').trim();
+ accumulator[settingWithoutPrefix] = RocketChat.getUserPreference(user, settingWithoutPrefix);
+ return accumulator;
+ }, {});
+ };
+ const verifiedEmail = isVerifiedEmail();
+ me.email = verifiedEmail ? verifiedEmail.address : undefined;
+ me.settings = {
+ preferences: getUserPreferences()
+ };
+
+ return me;
+});
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index eb76ca5a2038..55a870b526b6 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -140,6 +140,60 @@ RocketChat.API.v1.addRoute('channels.close', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('channels.counters', { authRequired: true }, {
+ get() {
+ const access = RocketChat.authz.hasPermission(this.userId, 'view-room-administration');
+ const ruserId = this.requestParams().userId;
+ let user = this.userId;
+ let unreads = null;
+ let userMentions = null;
+ let unreadsFrom = null;
+ let joined = false;
+ let msgs = null;
+ let latest = null;
+ let members = null;
+ let lm = null;
+
+ if (ruserId) {
+ if (!access) {
+ return RocketChat.API.v1.unauthorized();
+ }
+ user = ruserId;
+ }
+ const room = findChannelByIdOrName({
+ params: this.requestParams(),
+ returnUsernames: true
+ });
+ const channel = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user);
+ lm = channel._room.lm ? channel._room.lm : channel._room._updatedAt;
+
+ if (typeof channel !== 'undefined' && channel.open) {
+ if (channel.ls) {
+ unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(channel.rid, channel.ls, lm);
+ unreadsFrom = channel.ls;
+ }
+ userMentions = channel.userMentions;
+ joined = true;
+ }
+
+ if (access || joined) {
+ msgs = room.msgs;
+ latest = lm;
+ members = room.usernames.length;
+ }
+
+ return RocketChat.API.v1.success({
+ joined,
+ members,
+ unreads,
+ unreadsFrom,
+ msgs,
+ latest,
+ userMentions
+ });
+ }
+});
+
// Channel -> create
function createChannelValidator(params) {
@@ -503,6 +557,10 @@ RocketChat.API.v1.addRoute('channels.members', { authRequired: true }, {
returnUsernames: true
});
+ if (findResult.broadcast && !RocketChat.authz.hasPermission(this.userId, 'view-broadcast-member-list')) {
+ return RocketChat.API.v1.unauthorized();
+ }
+
const { offset, count } = this.getPaginationItems();
const { sort } = this.parseJsonQuery();
@@ -671,6 +729,24 @@ RocketChat.API.v1.addRoute('channels.rename', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('channels.setCustomFields', { authRequired: true }, {
+ post() {
+ if (!this.bodyParams.customFields || !(typeof this.bodyParams.customFields === 'object')) {
+ return RocketChat.API.v1.failure('The bodyParam "customFields" is required with a type like object.');
+ }
+
+ const findResult = findChannelByIdOrName({ params: this.requestParams() });
+
+ Meteor.runAsUser(this.userId, () => {
+ Meteor.call('saveRoomSettings', findResult._id, 'roomCustomFields', this.bodyParams.customFields);
+ });
+
+ return RocketChat.API.v1.success({
+ channel: RocketChat.models.Rooms.findOneById(findResult._id, { fields: RocketChat.API.v1.defaultFieldsToExclude })
+ });
+ }
+});
+
RocketChat.API.v1.addRoute('channels.setDescription', { authRequired: true }, {
post() {
if (!this.bodyParams.description || !this.bodyParams.description.trim()) {
@@ -866,3 +942,14 @@ RocketChat.API.v1.addRoute('channels.getAllUserMentionsByChannel', { authRequire
}
});
+RocketChat.API.v1.addRoute('channels.roles', { authRequired: true }, {
+ get() {
+ const findResult = findChannelByIdOrName({ params: this.requestParams() });
+
+ const roles = Meteor.runAsUser(this.userId, () => Meteor.call('getRoomRoles', findResult._id));
+
+ return RocketChat.API.v1.success({
+ roles
+ });
+ }
+});
diff --git a/packages/rocketchat-api/server/v1/commands.js b/packages/rocketchat-api/server/v1/commands.js
index 0c3e26d8fe40..21717555cd0b 100644
--- a/packages/rocketchat-api/server/v1/commands.js
+++ b/packages/rocketchat-api/server/v1/commands.js
@@ -59,7 +59,7 @@ RocketChat.API.v1.addRoute('commands.run', { authRequired: true }, {
}
if (typeof body.roomId !== 'string') {
- return RocketChat.API.v1.failure('The room\'s id where to execute this command must provided and be a string.');
+ return RocketChat.API.v1.failure('The room\'s id where to execute this command must be provided and be a string.');
}
const cmd = body.command.toLowerCase();
@@ -84,3 +84,81 @@ RocketChat.API.v1.addRoute('commands.run', { authRequired: true }, {
return RocketChat.API.v1.success({ result });
}
});
+
+RocketChat.API.v1.addRoute('commands.preview', { authRequired: true }, {
+ // Expects these query params: command: 'giphy', params: 'mine', roomId: 'value'
+ get() {
+ const query = this.queryParams;
+ const user = this.getLoggedInUser();
+
+ if (typeof query.command !== 'string') {
+ return RocketChat.API.v1.failure('You must provide a command to get the previews from.');
+ }
+
+ if (query.params && typeof query.params !== 'string') {
+ return RocketChat.API.v1.failure('The parameters for the command must be a single string.');
+ }
+
+ if (typeof query.roomId !== 'string') {
+ return RocketChat.API.v1.failure('The room\'s id where the previews are being displayed must be provided and be a string.');
+ }
+
+ const cmd = query.command.toLowerCase();
+ if (!RocketChat.slashCommands.commands[cmd]) {
+ return RocketChat.API.v1.failure('The command provided does not exist (or is disabled).');
+ }
+
+ // This will throw an error if they can't or the room is invalid
+ Meteor.call('canAccessRoom', query.roomId, user._id);
+
+ const params = query.params ? query.params : '';
+
+ let preview;
+ Meteor.runAsUser(user._id, () => {
+ preview = Meteor.call('getSlashCommandPreviews', { cmd, params, msg: { rid: query.roomId } });
+ });
+
+ return RocketChat.API.v1.success({ preview });
+ },
+ // Expects a body format of: { command: 'giphy', params: 'mine', roomId: 'value', previewItem: { id: 'sadf8' type: 'image', value: 'https://dev.null/gif } }
+ post() {
+ const body = this.bodyParams;
+ const user = this.getLoggedInUser();
+
+ if (typeof body.command !== 'string') {
+ return RocketChat.API.v1.failure('You must provide a command to run the preview item on.');
+ }
+
+ if (body.params && typeof body.params !== 'string') {
+ return RocketChat.API.v1.failure('The parameters for the command must be a single string.');
+ }
+
+ if (typeof body.roomId !== 'string') {
+ return RocketChat.API.v1.failure('The room\'s id where the preview is being executed in must be provided and be a string.');
+ }
+
+ if (typeof body.previewItem === 'undefined') {
+ return RocketChat.API.v1.failure('The preview item being executed must be provided.');
+ }
+
+ if (!body.previewItem.id || !body.previewItem.type || typeof body.previewItem.value === 'undefined') {
+ return RocketChat.API.v1.failure('The preview item being executed is in the wrong format.');
+ }
+
+ const cmd = body.command.toLowerCase();
+ if (!RocketChat.slashCommands.commands[cmd]) {
+ return RocketChat.API.v1.failure('The command provided does not exist (or is disabled).');
+ }
+
+ // This will throw an error if they can't or the room is invalid
+ Meteor.call('canAccessRoom', body.roomId, user._id);
+
+ const params = body.params ? body.params : '';
+
+ Meteor.runAsUser(user._id, () => {
+ Meteor.call('executeSlashCommandPreview', { cmd, params, msg: { rid: body.roomId } }, body.previewItem);
+ });
+
+ return RocketChat.API.v1.success();
+ }
+});
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index 3826a38bca9d..73fa7d3cc113 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -107,6 +107,75 @@ RocketChat.API.v1.addRoute('groups.close', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('groups.counters', { authRequired: true }, {
+ get() {
+ const access = RocketChat.authz.hasPermission(this.userId, 'view-room-administration');
+ const params = this.requestParams();
+ let user = this.userId;
+ let room;
+ let unreads = null;
+ let userMentions = null;
+ let unreadsFrom = null;
+ let joined = false;
+ let msgs = null;
+ let latest = null;
+ let members = null;
+ let lm = null;
+
+ if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
+ throw new Meteor.Error('error-room-param-not-provided', 'The parameter "roomId" or "roomName" is required');
+ }
+
+ if (params.roomId) {
+ room = RocketChat.models.Rooms.findOneById(params.roomId);
+ } else if (params.roomName) {
+ room = RocketChat.models.Rooms.findOneByName(params.roomName);
+ }
+
+ if (!room || room.t !== 'p') {
+ throw new Meteor.Error('error-room-not-found', 'The required "roomId" or "roomName" param provided does not match any group');
+ }
+
+ if (room.archived) {
+ throw new Meteor.Error('error-room-archived', `The private group, ${ room.name }, is archived`);
+ }
+
+ if (params.userId) {
+ if (!access) {
+ return RocketChat.API.v1.unauthorized();
+ }
+ user = params.userId;
+ }
+ const group = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user);
+ lm = group._room.lm ? group._room.lm : group._room._updatedAt;
+
+ if (typeof group !== 'undefined' && group.open) {
+ if (group.ls) {
+ unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(group.rid, group.ls, lm);
+ unreadsFrom = group.ls;
+ }
+ userMentions = group.userMentions;
+ joined = true;
+ }
+
+ if (access || joined) {
+ msgs = room.msgs;
+ latest = lm;
+ members = room.usernames.length;
+ }
+
+ return RocketChat.API.v1.success({
+ joined,
+ members,
+ unreads,
+ unreadsFrom,
+ msgs,
+ latest,
+ userMentions
+ });
+ }
+});
+
//Create Private Group
RocketChat.API.v1.addRoute('groups.create', { authRequired: true }, {
post() {
@@ -380,6 +449,11 @@ RocketChat.API.v1.addRoute('groups.listAll', { authRequired: true }, {
RocketChat.API.v1.addRoute('groups.members', { authRequired: true }, {
get() {
const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId });
+
+ if (findResult._room.broadcast && !RocketChat.authz.hasPermission(this.userId, 'view-broadcast-member-list')) {
+ return RocketChat.API.v1.unauthorized();
+ }
+
const { offset, count } = this.getPaginationItems();
const { sort } = this.parseJsonQuery();
@@ -540,6 +614,24 @@ RocketChat.API.v1.addRoute('groups.rename', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('groups.setCustomFields', { authRequired: true }, {
+ post() {
+ if (!this.bodyParams.customFields || !(typeof this.bodyParams.customFields === 'object')) {
+ return RocketChat.API.v1.failure('The bodyParam "customFields" is required with a type like object.');
+ }
+
+ const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId });
+
+ Meteor.runAsUser(this.userId, () => {
+ Meteor.call('saveRoomSettings', findResult.rid, 'roomCustomFields', this.bodyParams.customFields);
+ });
+
+ return RocketChat.API.v1.success({
+ group: RocketChat.models.Rooms.findOneById(findResult.rid, { fields: RocketChat.API.v1.defaultFieldsToExclude })
+ });
+ }
+});
+
RocketChat.API.v1.addRoute('groups.setDescription', { authRequired: true }, {
post() {
if (!this.bodyParams.description || !this.bodyParams.description.trim()) {
@@ -649,3 +741,15 @@ RocketChat.API.v1.addRoute('groups.unarchive', { authRequired: true }, {
return RocketChat.API.v1.success();
}
});
+
+RocketChat.API.v1.addRoute('groups.roles', { authRequired: true }, {
+ get() {
+ const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId });
+
+ const roles = Meteor.runAsUser(this.userId, () => Meteor.call('getRoomRoles', findResult.rid));
+
+ return RocketChat.API.v1.success({
+ roles
+ });
+ }
+});
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index 6d5905016705..c2ad7d8da8e0 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -49,6 +49,58 @@ RocketChat.API.v1.addRoute(['dm.close', 'im.close'], { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute(['dm.counters', 'im.counters'], { authRequired: true }, {
+ get() {
+ const access = RocketChat.authz.hasPermission(this.userId, 'view-room-administration');
+ const ruserId = this.requestParams().userId;
+ let user = this.userId;
+ let unreads = null;
+ let userMentions = null;
+ let unreadsFrom = null;
+ let joined = false;
+ let msgs = null;
+ let latest = null;
+ let members = null;
+ let lm = null;
+
+ if (ruserId) {
+ if (!access) {
+ return RocketChat.API.v1.unauthorized();
+ }
+ user = ruserId;
+ }
+ const rs = findDirectMessageRoom(this.requestParams(), {'_id': user});
+ const room = rs.room;
+ const dm = rs.subscription;
+ lm = room.lm ? room.lm : room._updatedAt;
+
+ if (typeof dm !== 'undefined' && dm.open) {
+ if (dm.ls && room.msgs) {
+ unreads = dm.unread;
+ unreadsFrom = dm.ls;
+ }
+ userMentions = dm.userMentions;
+ joined = true;
+ }
+
+ if (access || joined) {
+ msgs = room.msgs;
+ latest = lm;
+ members = room.usernames.length;
+ }
+
+ return RocketChat.API.v1.success({
+ joined,
+ members,
+ unreads,
+ unreadsFrom,
+ msgs,
+ latest,
+ userMentions
+ });
+ }
+});
+
RocketChat.API.v1.addRoute(['dm.files', 'im.files'], { authRequired: true }, {
get() {
const findResult = findDirectMessageRoom(this.requestParams(), this.user);
diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
index 3937078483b5..1dc196e6bc2a 100644
--- a/packages/rocketchat-api/server/v1/misc.js
+++ b/packages/rocketchat-api/server/v1/misc.js
@@ -1,4 +1,3 @@
-import _ from 'underscore';
RocketChat.API.v1.addRoute('info', { authRequired: false }, {
get() {
@@ -20,29 +19,7 @@ RocketChat.API.v1.addRoute('info', { authRequired: false }, {
RocketChat.API.v1.addRoute('me', { authRequired: true }, {
get() {
- const me = _.pick(this.user, [
- '_id',
- 'name',
- 'emails',
- 'status',
- 'statusConnection',
- 'username',
- 'utcOffset',
- 'active',
- 'language',
- 'roles',
- 'settings'
- ]);
-
- const verifiedEmail = me.emails.find((email) => email.verified);
- const userHasNotSetPreferencesYet = !me.settings || !me.settings.preferences;
-
- me.email = verifiedEmail ? verifiedEmail.address : undefined;
- if (userHasNotSetPreferencesYet) {
- me.settings = { preferences: {} };
- }
-
- return RocketChat.API.v1.success(me);
+ return RocketChat.API.v1.success(this.getUserInfo(RocketChat.models.Users.findOneById(this.userId)));
}
});
@@ -168,12 +145,17 @@ RocketChat.API.v1.addRoute('directory', { authRequired: true }, {
const { sort, query } = this.parseJsonQuery();
const { text, type } = query;
- const sortDirection = sort && sort === 1 ? 'asc' : 'desc';
+ if (sort && Object.keys(sort).length > 1) {
+ return RocketChat.API.v1.failure('This method support only one "sort" parameter');
+ }
+ const sortBy = sort ? Object.keys(sort)[0] : undefined;
+ const sortDirection = sort && Object.values(sort)[0] === 1 ? 'asc' : 'desc';
const result = Meteor.runAsUser(this.userId, () => Meteor.call('browseChannels', {
text,
type,
- sort: sortDirection,
+ sortBy,
+ sortDirection,
page: offset,
limit: count
}));
@@ -181,6 +163,11 @@ RocketChat.API.v1.addRoute('directory', { authRequired: true }, {
if (!result) {
return RocketChat.API.v1.failure('Please verify the parameters');
}
- return RocketChat.API.v1.success({ result });
+ return RocketChat.API.v1.success({
+ result: result.results,
+ count: result.results.length,
+ offset,
+ total: result.total
+ });
}
});
diff --git a/packages/rocketchat-api/server/v1/push.js b/packages/rocketchat-api/server/v1/push.js
index 4194a01ac633..31180997c8b7 100644
--- a/packages/rocketchat-api/server/v1/push.js
+++ b/packages/rocketchat-api/server/v1/push.js
@@ -16,7 +16,7 @@ RocketChat.API.v1.addRoute('push.token', { authRequired: true }, {
}
if (!value || typeof value !== 'string') {
- throw new Meteor.Error('error-token-param-not-valid', 'The required "token" body param is missing or invalid.');
+ throw new Meteor.Error('error-token-param-not-valid', 'The required "value" body param is missing or invalid.');
}
if (!appName || typeof appName !== 'string') {
diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
index cbac450b8ee2..b4bd19ebf505 100644
--- a/packages/rocketchat-api/server/v1/settings.js
+++ b/packages/rocketchat-api/server/v1/settings.js
@@ -101,10 +101,23 @@ RocketChat.API.v1.addRoute('settings/:_id', { authRequired: true }, {
return RocketChat.API.v1.unauthorized();
}
+ // allow special handling of particular setting types
+ const setting = RocketChat.models.Settings.findOneNotHiddenById(this.urlParams._id);
+ if (setting.type === 'action' && this.bodyParams && this.bodyParams.execute) {
+ //execute the configured method
+ Meteor.call(setting.value);
+ return RocketChat.API.v1.success();
+ }
+
+ if (setting.type === 'color' && this.bodyParams && this.bodyParams.editor && this.bodyParams.value) {
+ RocketChat.models.Settings.updateOptionsById(this.urlParams._id, { editor: this.bodyParams.editor });
+ RocketChat.models.Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+ return RocketChat.API.v1.success();
+ }
+
check(this.bodyParams, {
value: Match.Any
});
-
if (RocketChat.models.Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value)) {
return RocketChat.API.v1.success();
}
diff --git a/packages/rocketchat-api/server/v1/subscriptions.js b/packages/rocketchat-api/server/v1/subscriptions.js
index 6b17cf66e820..e58fe4094a26 100644
--- a/packages/rocketchat-api/server/v1/subscriptions.js
+++ b/packages/rocketchat-api/server/v1/subscriptions.js
@@ -69,3 +69,19 @@ RocketChat.API.v1.addRoute('subscriptions.read', { authRequired: true }, {
}
});
+RocketChat.API.v1.addRoute('subscriptions.unread', { authRequired: true }, {
+ post() {
+ const { roomId, firstUnreadMessage } = this.bodyParams;
+ if (!roomId && (firstUnreadMessage && !firstUnreadMessage._id)) {
+ return RocketChat.API.v1.failure('At least one of "roomId" or "firstUnreadMessage._id" params is required');
+ }
+
+ Meteor.runAsUser(this.userId, () =>
+ Meteor.call('unreadMessages', firstUnreadMessage, roomId)
+ );
+
+ return RocketChat.API.v1.success();
+ }
+});
+
+
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index 12ae7a470b87..496833312557 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -327,7 +327,6 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
collapseMediaByDefault: Match.Maybe(Boolean),
autoImageLoad: Match.Maybe(Boolean),
emailNotificationMode: Match.Maybe(String),
- roomsListExhibitionMode: Match.Maybe(String),
unreadAlert: Match.Maybe(Boolean),
notificationsSoundVolume: Match.Maybe(Number),
desktopNotifications: Match.Maybe(String),
@@ -348,7 +347,7 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
sidebarSortby: Match.Optional(String),
sidebarViewMode: Match.Optional(String),
sidebarHideAvatar: Match.Optional(Boolean),
- mergeChannels: Match.Optional(Boolean),
+ sidebarGroupByType: Match.Optional(Boolean),
muteFocusedConversations: Match.Optional(Boolean)
})
});
@@ -363,6 +362,13 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
preferences = _.extend({ _id: userId, settings: { preferences: this.bodyParams.data } });
}
+ // Keep compatibility with old values
+ if (preferences.emailNotificationMode === 'all') {
+ preferences.emailNotificationMode = 'mentions';
+ } else if (preferences.emailNotificationMode === 'disabled') {
+ preferences.emailNotificationMode = 'nothing';
+ }
+
Meteor.runAsUser(this.userId, () => RocketChat.saveUser(this.userId, preferences));
return RocketChat.API.v1.success({ user: RocketChat.models.Users.findOneById(this.bodyParams.userId, { fields: preferences }) });
@@ -409,3 +415,11 @@ RocketChat.API.v1.addRoute('users.forgotPassword', { authRequired: false }, {
return RocketChat.API.v1.failure('User not found');
}
});
+
+RocketChat.API.v1.addRoute('users.getUsernameSuggestion', { authRequired: true }, {
+ get() {
+ const result = Meteor.runAsUser(this.userId, () => Meteor.call('getUsernameSuggestion'));
+
+ return RocketChat.API.v1.success({ result });
+ }
+});
diff --git a/packages/rocketchat-apps/assets/stylesheets/apps.css b/packages/rocketchat-apps/assets/stylesheets/apps.css
index b8800c68d5f6..87757e032ab6 100644
--- a/packages/rocketchat-apps/assets/stylesheets/apps.css
+++ b/packages/rocketchat-apps/assets/stylesheets/apps.css
@@ -18,3 +18,11 @@ div.apps-error {
width: 100%;
font-size: 45px;
}
+
+.preferences-page--apps .rc-table-tr {
+ opacity: 0.5;
+}
+
+.preferences-page--apps .rc-table-tr.active {
+ opacity: 1;
+}
diff --git a/packages/rocketchat-apps/client/admin/appInstall.js b/packages/rocketchat-apps/client/admin/appInstall.js
index 0369f75254c4..e1e03a37991d 100644
--- a/packages/rocketchat-apps/client/admin/appInstall.js
+++ b/packages/rocketchat-apps/client/admin/appInstall.js
@@ -65,21 +65,26 @@ Template.appInstall.events({
if (url) {
try {
t.isInstalling.set(true);
+ const isUpdating = t.isUpdatingId.get();
let result;
- if (t.isUpdatingId.get()) {
+ if (isUpdating) {
result = await RocketChat.API.post(`apps/${ t.isUpdatingId.get() }`, { url });
} else {
result = await RocketChat.API.post('apps', { url });
}
- FlowRouter.go(`/admin/apps/${ result.app.id }`);
+ if (result.compilerErrors.length !== 0 || result.app.status === 'compiler_error') {
+ console.warn(`The App contains errors and could not be ${ isUpdating ? 'updated' : 'installed' }.`);
+ } else {
+ FlowRouter.go(`/admin/apps/${ result.app.id }`);
+ }
} catch (err) {
console.warn('err', err);
- } finally {
- t.isInstalling.set(false);
}
+ t.isInstalling.set(false);
+
return;
}
@@ -103,19 +108,26 @@ Template.appInstall.events({
t.isInstalling.set(true);
try {
+ const isUpdating = t.isUpdatingId.get();
let result;
- if (t.isUpdatingId.get()) {
+ if (isUpdating) {
result = await RocketChat.API.upload(`apps/${ t.isUpdatingId.get() }`, data);
} else {
result = await RocketChat.API.upload('apps', data);
}
- FlowRouter.go(`/admin/apps/${ result.app.id }`);
+ console.log('install result', result);
+
+ if (result.compilerErrors.length !== 0 || result.app.status === 'compiler_error') {
+ console.warn(`The App contains errors and could not be ${ isUpdating ? 'updated' : 'installed' }.`);
+ } else {
+ FlowRouter.go(`/admin/apps/${ result.app.id }`);
+ }
} catch (err) {
console.warn('err', err);
- } finally {
- t.isInstalling.set(false);
}
+
+ t.isInstalling.set(false);
}
});
diff --git a/packages/rocketchat-apps/client/admin/appManage.html b/packages/rocketchat-apps/client/admin/appManage.html
index ce53365fa337..a1859be07917 100644
--- a/packages/rocketchat-apps/client/admin/appManage.html
+++ b/packages/rocketchat-apps/client/admin/appManage.html
@@ -10,6 +10,9 @@
+
+ {{_ "Activate"}}
+
+
+
+ {{else}}
+ Sadly, an error has occured while loading this page.
+{{_ "Apps_WhatIsIt_paragraph1"}}
+{{_ "Apps_WhatIsIt_paragraph2"}}
++ {{_ "Apps_WhatIsIt_paragraph3"}} + https://github.com/RocketChat/Rocket.Chat.Apps-dev-environment/blob/master/README.md +
++ {{_ "Apps_WhatIsIt_paragraph4"}} + +
+ {{/if}} +![\"\"](\"https://goalify.chat/images/logo-colored.png\"){kind=logo}
\r\n ![\"facebook\"](\"https://api.goalify.plus/images/email/facebook-blog.png\")
![\"linkedin\"](\"https://api.goalify.plus/images/email/linkedin-blog.png\")
![\"twitter\"](\"https://api.goalify.plus/images/email/twitter-blog.png\")
![\"gmail\"](\"https://api.goalify.plus/images/email/google-blog.png\")