Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions app/apps/server/communication/uikit.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import express from 'express';
import rateLimit from 'express-rate-limit';
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
import { UIKitIncomingInteractionType } from '@rocket.chat/apps-engine/definition/uikit';

import { Users } from '../../../models/server';
import { settings } from '../../../settings/server';

const apiServer = express();

Expand All @@ -13,11 +16,22 @@ WebApp.connectHandlers.use(apiServer);
// eslint-disable-next-line new-cap
const router = express.Router();

const unauthorized = (res) =>
res.status(401).send({
status: 'error',
message: 'You must be logged in to do this.',
const unauthorized = (res) => res.status(401).send({
status: 'error',
message: 'You must be logged in to do this.',
});

Meteor.startup(() => {
// use specific rate limit of 600 (which is 60 times the default limits) requests per minute (around 10/second)
const apiLimiter = rateLimit({
windowMs: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default'),
max: settings.get('API_Enable_Rate_Limiter_Limit_Calls_Default') * 60,
skip: () =>
settings.get('API_Enable_Rate_Limiter') !== true
|| (process.env.NODE_ENV === 'development' && settings.get('API_Enable_Rate_Limiter_Dev') !== true),
});
router.use(apiLimiter);
});

router.use((req, res, next) => {
const {
Expand Down
2 changes: 1 addition & 1 deletion app/bigbluebutton/server/bigbluebutton-api.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
import crypto from 'crypto';

var BigBlueButtonApi, filterCustomParameters, include, noChecksumMethods, root,
var BigBlueButtonApi, filterCustomParameters, include, noChecksumMethods,
__indexOf = [].indexOf || function (item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };

BigBlueButtonApi = (function () {
Expand Down
3 changes: 1 addition & 2 deletions app/emoji-emojione/lib/generateEmojiIndex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

// node --experimental-modules generateEmojiIndex.mjs
import fs from 'fs';
import https from 'https';
import nsg from 'node-sprite-generator';
import _ from 'underscore';
import gm from 'gm';
import gm from 'gm'; // lgtm[js/unused-local-variable]

const assetFolder = '../../../node_modules/emojione-assets';
const emojiJsonFile = `${ assetFolder }/emoji.json`;
Expand Down
Loading