+
+
+
+ {{_ "E2E_Encryption_Password_Change" }}
+
{{{_ "E2E_Encryption_Password_Explanation" }}}
@@ -40,6 +44,26 @@
{{#requiresPermission 'manage-cloud'}}
diff --git a/app/cloud/client/admin/cloud.js b/app/cloud/client/admin/cloud.js
index 4eeb6ce73021..cd9edf0a41a6 100644
--- a/app/cloud/client/admin/cloud.js
+++ b/app/cloud/client/admin/cloud.js
@@ -8,7 +8,7 @@ import queryString from 'query-string';
import toastr from 'toastr';
import { t } from '../../../utils';
-import { SideNav } from '../../../ui-utils/client';
+import { SideNav, modal } from '../../../ui-utils/client';
Template.cloud.onCreated(function() {
@@ -161,6 +161,17 @@ Template.cloud.helpers({
});
Template.cloud.events({
+ 'click .js-register'() {
+ modal.open({
+ template: 'cloudRegisterManually',
+ showCancelButton: false,
+ showConfirmButton: false,
+ showFooter: false,
+ closeOnCancel: true,
+ html: true,
+ confirmOnEnter: false,
+ });
+ },
'click .update-email-btn'() {
const val = $('input[name=cloudEmail]').val();
diff --git a/app/cloud/client/admin/cloudRegisterManually.css b/app/cloud/client/admin/cloudRegisterManually.css
new file mode 100644
index 000000000000..8cd3c5628e34
--- /dev/null
+++ b/app/cloud/client/admin/cloudRegisterManually.css
@@ -0,0 +1,26 @@
+.rc-promtp {
+ display: flex;
+
+ min-height: 188px;
+ padding: 1rem;
+
+ border-radius: 2px;
+ background: #2f343d;
+ flex-flow: column wrap;
+ justify-content: space-between;
+
+ &--element,
+ &--element[disabled] {
+ flex: 1 1 auto;
+
+ resize: none;
+
+ color: #cbced1;
+ border: none;
+ background: none;
+
+ font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
+ font-size: 14px;
+ line-height: 20px;
+ }
+}
diff --git a/app/cloud/client/admin/cloudRegisterManually.html b/app/cloud/client/admin/cloudRegisterManually.html
new file mode 100644
index 000000000000..738a36423501
--- /dev/null
+++ b/app/cloud/client/admin/cloudRegisterManually.html
@@ -0,0 +1,36 @@
+
+ {{> header sectionName="Cloud_Register_manually" hideHelp=true fullpage=true}}
+ {{# if copyStep }}
+
+
+
+
+ {{else}}
+
+
+
+
+ {{/if}}
+
diff --git a/app/cloud/client/admin/cloudRegisterManually.js b/app/cloud/client/admin/cloudRegisterManually.js
new file mode 100644
index 000000000000..223d9bc609ce
--- /dev/null
+++ b/app/cloud/client/admin/cloudRegisterManually.js
@@ -0,0 +1,106 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveDict } from 'meteor/reactive-dict';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+import Clipboard from 'clipboard';
+import toastr from 'toastr';
+
+import { APIClient } from '../../../utils/client';
+import { modal } from '../../../ui-utils/client';
+
+import './cloudRegisterManually.html';
+import './cloudRegisterManually.css';
+
+const CLOUD_STEPS = {
+ COPY: 0,
+ PASTE: 1,
+ DONE: 2,
+ ERROR: 3,
+};
+
+Template.cloudRegisterManually.events({
+ 'submit form'(e) {
+ e.preventDefault();
+ },
+ 'input .js-cloud-key'(e, instance) {
+ instance.state.set('cloudKey', e.currentTarget.value);
+ },
+ 'click .js-next'(event, instance) {
+ instance.state.set('step', CLOUD_STEPS.PASTE);
+ },
+ 'click .js-back'(event, instance) {
+ instance.state.set('step', CLOUD_STEPS.COPY);
+ },
+ 'click .js-finish'(event, instance) {
+ instance.state.set('loading', true);
+
+ APIClient
+ .post('v1/cloud.manualRegister', {}, { cloudBlob: instance.state.get('cloudKey') })
+ .then(() => modal.open({
+ type: 'success',
+ title: TAPi18n.__('Success'),
+ text: TAPi18n.__('Cloud_register_success'),
+ confirmButtonText: TAPi18n.__('Ok'),
+ closeOnConfirm: false,
+ showCancelButton: false,
+ }, () => window.location.reload()))
+ .catch(() => modal.open({
+ type: 'error',
+ title: TAPi18n.__('Error'),
+ text: TAPi18n.__('Cloud_register_error'),
+ }))
+ .then(() => instance.state.set('loading', false));
+ },
+});
+
+Template.cloudRegisterManually.helpers({
+ cloudLink() {
+ return Template.instance().cloudLink.get();
+ },
+ copyStep() {
+ return Template.instance().state.get('step') === CLOUD_STEPS.COPY;
+ },
+ clientKey() {
+ return Template.instance().state.get('clientKey');
+ },
+ isLoading() {
+ return Template.instance().state.get('loading');
+ },
+ step() {
+ return Template.instance().state.get('step');
+ },
+ disabled() {
+ const { state } = Template.instance();
+
+ const shouldDisable = state.get('cloudKey').trim().length === 0 || state.get('loading');
+
+ return shouldDisable && 'disabled';
+ },
+});
+
+Template.cloudRegisterManually.onRendered(function() {
+ const clipboard = new Clipboard('.js-copy');
+ clipboard.on('success', function() {
+ toastr.success(TAPi18n.__('Copied'));
+ });
+
+ const btn = this.find('.cloud-console-btn');
+ // After_copy_the_text_go_to_cloud
+ this.cloudLink.set(TAPi18n.__('Cloud_click_here').replace(/(\[(.*)\]\(\))/ig, (_, __, text) => btn.outerHTML.replace('', `${ text }`)));
+});
+
+Template.cloudRegisterManually.onCreated(function() {
+ this.cloudLink = new ReactiveVar();
+ this.state = new ReactiveDict({
+ step: CLOUD_STEPS.COPY,
+ loading: false,
+ clientKey: '',
+ cloudKey: '',
+ error: '',
+ });
+
+ Meteor.call('cloud:getWorkspaceRegisterData', (error, result) => {
+ this.state.set('clientKey', result);
+ });
+});
diff --git a/app/cloud/client/admin/index.js b/app/cloud/client/admin/index.js
new file mode 100644
index 000000000000..92cb6032c24e
--- /dev/null
+++ b/app/cloud/client/admin/index.js
@@ -0,0 +1,2 @@
+import './cloud';
+import './callback';
diff --git a/app/cloud/client/index.js b/app/cloud/client/index.js
index d0241a21c12e..0165b0a25011 100644
--- a/app/cloud/client/index.js
+++ b/app/cloud/client/index.js
@@ -1,5 +1,6 @@
import './admin/callback';
import './admin/cloud';
+import './admin/cloudRegisterManually';
import { BlazeLayout } from 'meteor/kadira:blaze-layout';
import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -9,14 +10,16 @@ import { hasAtLeastOnePermission } from '../../authorization';
FlowRouter.route('/admin/cloud', {
name: 'cloud-config',
- action() {
+ async action() {
+ await import('./admin');
BlazeLayout.render('main', { center: 'cloud', old: true });
},
});
FlowRouter.route('/admin/cloud/oauth-callback', {
name: 'cloud-oauth-callback',
- action() {
+ async action() {
+ await import('./admin');
BlazeLayout.render('main', { center: 'cloudCallback', old: true });
},
});
diff --git a/app/cloud/server/functions/buildRegistrationData.js b/app/cloud/server/functions/buildRegistrationData.js
new file mode 100644
index 000000000000..4b7af6d47902
--- /dev/null
+++ b/app/cloud/server/functions/buildRegistrationData.js
@@ -0,0 +1,54 @@
+import { settings } from '../../../settings';
+import { Users } from '../../../models';
+import { statistics } from '../../../statistics';
+
+export function buildWorkspaceRegistrationData() {
+ const stats = statistics.get();
+
+ const address = settings.get('Site_Url');
+ const siteName = settings.get('Site_Name');
+
+ // If we have it lets send it because likely an update
+ const workspaceId = settings.get('Cloud_Workspace_Id');
+
+ const firstUser = Users.getOldest({ name: 1, emails: 1 });
+ const contactName = firstUser && firstUser.name;
+ let contactEmail = firstUser && firstUser.emails && firstUser.emails[0].address;
+
+ if (settings.get('Organization_Email')) {
+ contactEmail = settings.get('Organization_Email');
+ }
+
+ const allowMarketing = settings.get('Allow_Marketing_Emails');
+
+ const accountName = settings.get('Organization_Name');
+
+ const website = settings.get('Website');
+
+ const agreePrivacyTerms = settings.get('Cloud_Service_Agree_PrivacyTerms');
+
+ const { organizationType, industry, size: orgSize, country, language, serverType: workspaceType } = stats.wizard;
+
+ return {
+ uniqueId: stats.uniqueId,
+ workspaceId,
+ address,
+ contactName,
+ contactEmail,
+ allowMarketing,
+ accountName,
+ organizationType,
+ industry,
+ orgSize,
+ country,
+ language,
+ agreePrivacyTerms,
+ website,
+ siteName,
+ workspaceType,
+ deploymentMethod: stats.deploy.method,
+ deploymentPlatform: stats.deploy.platform,
+ version: stats.version,
+ setupComplete: true,
+ };
+}
diff --git a/app/cloud/server/functions/connectWorkspace.js b/app/cloud/server/functions/connectWorkspace.js
index 7f62a8b8b9c2..24eff7d9f803 100644
--- a/app/cloud/server/functions/connectWorkspace.js
+++ b/app/cloud/server/functions/connectWorkspace.js
@@ -6,6 +6,7 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
import { getWorkspaceAccessToken } from './getWorkspaceAccessToken';
import { Settings } from '../../../models';
import { settings } from '../../../settings';
+import { saveRegistrationData } from './saveRegistrationData';
export function connectWorkspace(token) {
const { connectToCloud } = retrieveRegistrationStatus();
@@ -46,13 +47,7 @@ export function connectWorkspace(token) {
return false;
}
- Settings.updateValueById('Cloud_Workspace_Id', data.workspaceId);
- Settings.updateValueById('Cloud_Workspace_Name', data.client_name);
- Settings.updateValueById('Cloud_Workspace_Client_Id', data.client_id);
- Settings.updateValueById('Cloud_Workspace_Client_Secret', data.client_secret);
- Settings.updateValueById('Cloud_Workspace_Client_Secret_Expires_At', data.client_secret_expires_at);
- Settings.updateValueById('Cloud_Workspace_PublicKey', data.publicKey);
- Settings.updateValueById('Cloud_Workspace_Registration_Client_Uri', data.registration_client_uri);
+ Promise.await(saveRegistrationData(data));
// Now that we have the client id and secret, let's get the access token
const accessToken = getWorkspaceAccessToken(true);
diff --git a/app/cloud/server/functions/saveRegistrationData.js b/app/cloud/server/functions/saveRegistrationData.js
new file mode 100644
index 000000000000..0d238c0a2a5e
--- /dev/null
+++ b/app/cloud/server/functions/saveRegistrationData.js
@@ -0,0 +1,22 @@
+import { Settings } from '../../../models/server/raw';
+
+export function saveRegistrationData({
+ workspaceId,
+ client_name,
+ client_id,
+ client_secret,
+ client_secret_expires_at,
+ publicKey,
+ registration_client_uri,
+}) {
+ return Promise.all([
+ Settings.updateValueById('Register_Server', true),
+ Settings.updateValueById('Cloud_Workspace_Id', workspaceId),
+ Settings.updateValueById('Cloud_Workspace_Name', client_name),
+ Settings.updateValueById('Cloud_Workspace_Client_Id', client_id),
+ Settings.updateValueById('Cloud_Workspace_Client_Secret', client_secret),
+ Settings.updateValueById('Cloud_Workspace_Client_Secret_Expires_At', client_secret_expires_at),
+ Settings.updateValueById('Cloud_Workspace_PublicKey', publicKey),
+ Settings.updateValueById('Cloud_Workspace_Registration_Client_Uri', registration_client_uri),
+ ]);
+}
diff --git a/app/cloud/server/functions/startRegisterWorkspace.js b/app/cloud/server/functions/startRegisterWorkspace.js
index 50a085745177..3201726b5011 100644
--- a/app/cloud/server/functions/startRegisterWorkspace.js
+++ b/app/cloud/server/functions/startRegisterWorkspace.js
@@ -3,8 +3,8 @@ import { HTTP } from 'meteor/http';
import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
import { syncWorkspace } from './syncWorkspace';
import { settings } from '../../../settings';
-import { Settings, Users } from '../../../models';
-import { statistics } from '../../../statistics';
+import { Settings } from '../../../models';
+import { buildWorkspaceRegistrationData } from './buildRegistrationData';
export function startRegisterWorkspace(resend = false) {
@@ -22,41 +22,7 @@ export function startRegisterWorkspace(resend = false) {
}
}
- const stats = statistics.get();
-
- const address = settings.get('Site_Url');
- const siteName = settings.get('Site_Name');
-
- // If we have it lets send it because likely an update
- const workspaceId = settings.get('Cloud_Workspace_Id');
-
- const firstUser = Users.getOldest({ name: 1, emails: 1 });
- const contactName = firstUser && firstUser.name;
- let contactEmail = firstUser && firstUser.emails && firstUser.emails[0].address;
-
- if (settings.get('Organization_Email')) {
- contactEmail = settings.get('Organization_Email');
- }
-
- const allowMarketing = settings.get('Allow_Marketing_Emails');
-
- const accountName = settings.get('Organization_Name');
- const website = settings.get('Website');
-
- const regInfo = {
- uniqueId: stats.uniqueId,
- workspaceId,
- address,
- contactName,
- contactEmail,
- allowMarketing,
- accountName,
- website,
- siteName,
- deploymentMethod: stats.deploy.method,
- deploymentPlatform: stats.deploy.platform,
- version: stats.version,
- };
+ const regInfo = buildWorkspaceRegistrationData();
const cloudUrl = settings.get('Cloud_Url');
diff --git a/app/cloud/server/functions/syncWorkspace.js b/app/cloud/server/functions/syncWorkspace.js
index 404806bdcc5f..7435ed4daa77 100644
--- a/app/cloud/server/functions/syncWorkspace.js
+++ b/app/cloud/server/functions/syncWorkspace.js
@@ -18,14 +18,27 @@ export function syncWorkspace(reconnectCheck = false) {
const address = settings.get('Site_Url');
const siteName = settings.get('Site_Name');
+ const website = settings.get('Website');
+
+ const setupComplete = settings.get('Show_Setup_Wizard') === 'completed';
+
+ const { organizationType, industry, size: orgSize, country, language, serverType: workspaceType } = stats.wizard;
const info = {
uniqueId: stats.uniqueId,
address,
siteName,
+ website,
+ organizationType,
+ industry,
+ orgSize,
+ country,
+ language,
+ workspaceType,
deploymentMethod: stats.deploy.method,
deploymentPlatform: stats.deploy.platform,
version: stats.version,
+ setupComplete,
};
const workspaceUrl = settings.get('Cloud_Workspace_Registration_Client_Uri');
diff --git a/app/cloud/server/methods.js b/app/cloud/server/methods.js
index b648f2ffaa8f..cca83d62c30b 100644
--- a/app/cloud/server/methods.js
+++ b/app/cloud/server/methods.js
@@ -13,6 +13,7 @@ import { checkUserHasCloudLogin } from './functions/checkUserHasCloudLogin';
import { userLogout } from './functions/userLogout';
import { Settings } from '../../models';
import { hasPermission } from '../../authorization';
+import { buildWorkspaceRegistrationData } from './functions/buildRegistrationData';
Meteor.methods({
'cloud:checkRegisterStatus'() {
@@ -26,6 +27,17 @@ Meteor.methods({
return retrieveRegistrationStatus();
},
+ 'cloud:getWorkspaceRegisterData'() {
+ if (!Meteor.userId()) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cloud:getWorkspaceRegisterData' });
+ }
+
+ if (!hasPermission(Meteor.userId(), 'manage-cloud')) {
+ throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'cloud:getWorkspaceRegisterData' });
+ }
+
+ return Buffer.from(JSON.stringify(buildWorkspaceRegistrationData())).toString('base64');
+ },
'cloud:registerWorkspace'() {
if (!Meteor.userId()) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cloud:startRegister' });
diff --git a/app/cors/server/cors.js b/app/cors/server/cors.js
index 8d59968807a5..c5853db94059 100644
--- a/app/cors/server/cors.js
+++ b/app/cors/server/cors.js
@@ -44,10 +44,25 @@ WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) {
});
}));
+let Support_Cordova_App = false;
+settings.get('Support_Cordova_App', (key, value) => {
+ Support_Cordova_App = value;
+});
+
WebApp.rawConnectHandlers.use(function(req, res, next) {
+ // XSS Protection for old browsers (IE)
+ res.setHeader('X-XSS-Protection', '1');
+
+ if (Support_Cordova_App !== true) {
+ return next();
+ }
+
if (/^\/(api|_timesync|sockjs|tap-i18n)(\/|$)/.test(req.url)) {
res.setHeader('Access-Control-Allow-Origin', '*');
}
+ if (settings.get('Iframe_Restrict_Access')) {
+ res.setHeader('X-Frame-Options', settings.get('Iframe_X_Frame_Options'));
+ }
const { setHeader } = res;
res.setHeader = function(key, val, ...args) {
@@ -56,6 +71,7 @@ WebApp.rawConnectHandlers.use(function(req, res, next) {
}
return setHeader.apply(this, [key, val, ...args]);
};
+
return next();
});
diff --git a/app/custom-oauth/client/custom_oauth_client.js b/app/custom-oauth/client/custom_oauth_client.js
index 780f22370bfc..f1561c84e5d1 100644
--- a/app/custom-oauth/client/custom_oauth_client.js
+++ b/app/custom-oauth/client/custom_oauth_client.js
@@ -91,7 +91,7 @@ export class CustomOAuth {
const loginUrl = `${ this.authorizePath
}${ separator }client_id=${ config.clientId
- }&redirect_uri=${ OAuth._redirectUri(this.name, config)
+ }&redirect_uri=${ encodeURIComponent(OAuth._redirectUri(this.name, config))
}&response_type=code`
+ `&state=${ OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl)
}&scope=${ this.scope }`;
diff --git a/app/custom-oauth/server/custom_oauth_server.js b/app/custom-oauth/server/custom_oauth_server.js
index 660685296f9c..40745c93fb93 100644
--- a/app/custom-oauth/server/custom_oauth_server.js
+++ b/app/custom-oauth/server/custom_oauth_server.js
@@ -191,6 +191,7 @@ export class CustomOAuth {
const serviceData = {
_OAuthCustom: true,
+ serverURL: self.serverURL,
accessToken: response.access_token,
idToken: response.id_token,
expiresAt: +new Date() + (1000 * parseInt(response.expires_in, 10)),
diff --git a/app/custom-sounds/client/admin/adminSounds.js b/app/custom-sounds/client/admin/adminSounds.js
index cb256482bed2..552bcd2ea42b 100644
--- a/app/custom-sounds/client/admin/adminSounds.js
+++ b/app/custom-sounds/client/admin/adminSounds.js
@@ -4,8 +4,9 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import s from 'underscore.string';
-import { CustomSounds } from '../../../models';
+import { CustomSounds as CustomSoundsModel } from '../../../models';
import { RocketChatTabBar, SideNav, TabBar } from '../../../ui-utils';
+import { CustomSounds } from '../lib/CustomSounds';
Template.adminSounds.helpers({
searchText() {
@@ -57,7 +58,7 @@ Template.adminSounds.helpers({
onTableItemClick() {
const instance = Template.instance();
return function(item) {
- instance.tabBarData.set(CustomSounds.findOne({ _id: item._id }));
+ instance.tabBarData.set(CustomSoundsModel.findOne({ _id: item._id }));
instance.tabBar.showGroup('custom-sounds-selected');
instance.tabBar.open('admin-sound-info');
};
@@ -114,7 +115,7 @@ Template.adminSounds.onCreated(function() {
const limit = instance.limit != null ? instance.limit.get() : 0;
- return CustomSounds.find(query, { limit, sort: { name: 1 } }).fetch();
+ return CustomSoundsModel.find(query, { limit, sort: { name: 1 } }).fetch();
};
});
@@ -141,10 +142,7 @@ Template.adminSounds.events({
'click .icon-play-circled'(e) {
e.preventDefault();
e.stopPropagation();
- const $audio = $(`audio#${ this._id }`);
- if ($audio && $audio[0] && $audio[0].play) {
- $audio[0].play();
- }
+ CustomSounds.play(this._id);
},
'click .icon-pause-circled'(e) {
e.preventDefault();
diff --git a/app/custom-sounds/client/admin/route.js b/app/custom-sounds/client/admin/route.js
index cf12f9949f6a..5aebea1934f8 100644
--- a/app/custom-sounds/client/admin/route.js
+++ b/app/custom-sounds/client/admin/route.js
@@ -7,7 +7,8 @@ FlowRouter.route('/admin/custom-sounds', {
subscriptions(/* params, queryParams*/) {
this.register('customSounds', Meteor.subscribe('customSounds'));
},
- action(/* params*/) {
+ async action(/* params*/) {
+ await import('./views');
BlazeLayout.render('main', { center: 'adminSounds' });
},
});
diff --git a/app/custom-sounds/client/admin/soundEdit.js b/app/custom-sounds/client/admin/soundEdit.js
index f28aa360b421..c55f2f5a03d3 100644
--- a/app/custom-sounds/client/admin/soundEdit.js
+++ b/app/custom-sounds/client/admin/soundEdit.js
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import s from 'underscore.string';
diff --git a/app/custom-sounds/client/admin/views.js b/app/custom-sounds/client/admin/views.js
new file mode 100644
index 000000000000..3a2397b2bdaa
--- /dev/null
+++ b/app/custom-sounds/client/admin/views.js
@@ -0,0 +1,8 @@
+import './adminSoundEdit.html';
+import './adminSoundInfo.html';
+import './adminSounds.html';
+import './adminSounds';
+import './soundEdit.html';
+import './soundEdit';
+import './soundInfo.html';
+import './soundInfo';
diff --git a/app/custom-sounds/client/index.js b/app/custom-sounds/client/index.js
index ca11995874f1..918e3247240c 100644
--- a/app/custom-sounds/client/index.js
+++ b/app/custom-sounds/client/index.js
@@ -1,13 +1,5 @@
import './notifications/deleteCustomSound';
import './notifications/updateCustomSound';
-import './admin/adminSoundEdit.html';
-import './admin/adminSoundInfo.html';
-import './admin/adminSounds.html';
-import './admin/adminSounds';
-import './admin/soundEdit.html';
-import './admin/soundEdit';
-import './admin/soundInfo.html';
-import './admin/soundInfo';
import './admin/route';
import './admin/startup';
diff --git a/app/custom-sounds/client/lib/CustomSounds.js b/app/custom-sounds/client/lib/CustomSounds.js
index 3d32b19e74f3..52e1666c4d82 100644
--- a/app/custom-sounds/client/lib/CustomSounds.js
+++ b/app/custom-sounds/client/lib/CustomSounds.js
@@ -57,7 +57,21 @@ class CustomSoundsClass {
const list = Object.values(this.list.get());
return _.sortBy(list, 'name');
}
+
+ play = (sound, { volume = 1, loop = false } = {}) => {
+ const audio = document.querySelector(`audio#${ sound }`);
+ if (!audio || !audio.play) {
+ return;
+ }
+
+ audio.volume = volume;
+ audio.loop = loop;
+ audio.play();
+
+ return audio;
+ }
}
+
export const CustomSounds = new CustomSoundsClass();
Meteor.startup(() =>
diff --git a/app/discussion/client/tabBar.js b/app/discussion/client/tabBar.js
index 8ab8d47bda70..e10e1143eeb5 100644
--- a/app/discussion/client/tabBar.js
+++ b/app/discussion/client/tabBar.js
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { TabBar } from '../../ui-utils/client';
+import { settings } from '../../settings';
Meteor.startup(function() {
return TabBar.addButton({
@@ -10,5 +11,6 @@ Meteor.startup(function() {
icon: 'discussion',
template: 'discussionsTabbar',
order: 10,
+ condition: () => settings.get('Discussion_enabled'),
});
});
diff --git a/app/discussion/client/views/DiscussionList.html b/app/discussion/client/views/DiscussionList.html
index a2548cb5ec72..ebaeacb1e2f4 100644
--- a/app/discussion/client/views/DiscussionList.html
+++ b/app/discussion/client/views/DiscussionList.html
@@ -1,10 +1,12 @@
- {{#if rooms}}
-
+
+
- {{_ "Discussions"}} -
--
- {{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
-
+ {{_ "Discussions"}} +
+-
+ {{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
+
{{_ "No_discussions_yet"}}
-
{{# with messageContext}}
{{#each msg in messages}}
- {{> nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}
+ {{> nrr nrrargs 'message' msg=msg room=room subscription=subscription groupable=false settings=settings u=u}}
{{/each}}
{{/with}}
-
+
{{else}}
diff --git a/app/e2e/client/accountEncryption.js b/app/e2e/client/accountEncryption.js
index da1071b15c36..145244eb1c7a 100644
--- a/app/e2e/client/accountEncryption.js
+++ b/app/e2e/client/accountEncryption.js
@@ -1,4 +1,5 @@
import { Template } from 'meteor/templating';
+import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import toastr from 'toastr';
import s from 'underscore.string';
@@ -12,7 +13,7 @@ Template.accountEncryption.helpers({
return settings.get('E2E_Enable');
},
allowKeyChange() {
- return localStorage.getItem('public_key') && localStorage.getItem('private_key');
+ return Meteor._localStorage.getItem('public_key') && Meteor._localStorage.getItem('private_key');
},
canConfirmNewKey() {
const encryptionKey = Template.instance().encryptionKey.get();
@@ -44,6 +45,11 @@ Template.accountEncryption.events({
'input [name=confirmation-encryptionKey]'(e, instance) {
instance.confirmationEncryptionKey.set(e.target.value);
},
+ 'click button[name=reset-e2e-key]'(e, instance) {
+ e.preventDefault();
+
+ return instance.resetKey();
+ },
'submit form'(e, instance) {
e.preventDefault();
@@ -83,4 +89,12 @@ Template.accountEncryption.onCreated(function() {
this.find('[name=encryptionKey]').value = '';
this.find('[name=confirmation-encryptionKey]').value = '';
};
+
+ this.resetKey = function() {
+ Meteor.call('e2e.resetOwnE2EKey', (error, result) => {
+ if (result) {
+ toastr.success(t('User_e2e_key_was_reset'));
+ }
+ });
+ };
});
diff --git a/app/e2e/client/rocketchat.e2e.js b/app/e2e/client/rocketchat.e2e.js
index 243713b9fa91..24a610d05b35 100644
--- a/app/e2e/client/rocketchat.e2e.js
+++ b/app/e2e/client/rocketchat.e2e.js
@@ -4,7 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
import { EJSON } from 'meteor/ejson';
import { FlowRouter } from 'meteor/kadira:flow-router';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { E2ERoom } from './rocketchat.e2e.room';
import {
@@ -104,8 +104,8 @@ class E2E {
}
this.started = true;
- let public_key = localStorage.getItem('public_key');
- let private_key = localStorage.getItem('private_key');
+ let public_key = Meteor._localStorage.getItem('public_key');
+ let private_key = Meteor._localStorage.getItem('private_key');
await this.loadKeysFromDB();
@@ -142,13 +142,13 @@ class E2E {
// TODO: Split in 2 methods to persist keys
if (!this.db_public_key || !this.db_private_key) {
- await call('e2e.setUserPublicAndPivateKeys', {
- public_key: localStorage.getItem('public_key'),
- private_key: await this.encodePrivateKey(localStorage.getItem('private_key'), this.createRandomPassword()),
+ await call('e2e.setUserPublicAndPrivateKeys', {
+ public_key: Meteor._localStorage.getItem('public_key'),
+ private_key: await this.encodePrivateKey(Meteor._localStorage.getItem('private_key'), this.createRandomPassword()),
});
}
- const randomPassword = localStorage.getItem('e2e.randomPassword');
+ const randomPassword = Meteor._localStorage.getItem('e2e.randomPassword');
if (randomPassword) {
const passwordRevealText = TAPi18n.__('E2E_password_reveal_text', {
postProcess: 'sprintf',
@@ -174,7 +174,7 @@ class E2E {
if (!confirm) {
return;
}
- localStorage.removeItem('e2e.randomPassword');
+ Meteor._localStorage.removeItem('e2e.randomPassword');
this.closeAlert();
});
},
@@ -196,8 +196,8 @@ class E2E {
alerts.close();
}
- localStorage.removeItem('public_key');
- localStorage.removeItem('private_key');
+ Meteor._localStorage.removeItem('public_key');
+ Meteor._localStorage.removeItem('private_key');
this.instancesByRoomId = {};
this.privateKey = null;
this.enabled.set(false);
@@ -232,13 +232,13 @@ class E2E {
}
async changePassword(newPassword) {
- await call('e2e.setUserPublicAndPivateKeys', {
- public_key: localStorage.getItem('public_key'),
- private_key: await this.encodePrivateKey(localStorage.getItem('private_key'), newPassword),
+ await call('e2e.setUserPublicAndPrivateKeys', {
+ public_key: Meteor._localStorage.getItem('public_key'),
+ private_key: await this.encodePrivateKey(Meteor._localStorage.getItem('private_key'), newPassword),
});
- if (localStorage.getItem('e2e.randomPassword')) {
- localStorage.setItem('e2e.randomPassword', newPassword);
+ if (Meteor._localStorage.getItem('e2e.randomPassword')) {
+ Meteor._localStorage.setItem('e2e.randomPassword', newPassword);
}
}
@@ -254,12 +254,12 @@ class E2E {
}
async loadKeys({ public_key, private_key }) {
- localStorage.setItem('public_key', public_key);
+ Meteor._localStorage.setItem('public_key', public_key);
try {
this.privateKey = await importRSAKey(EJSON.parse(private_key), ['decrypt']);
- localStorage.setItem('private_key', private_key);
+ Meteor._localStorage.setItem('private_key', private_key);
} catch (error) {
return console.error('E2E -> Error importing private key: ', error);
}
@@ -278,7 +278,7 @@ class E2E {
try {
const publicKey = await exportJWKKey(key.publicKey);
- localStorage.setItem('public_key', JSON.stringify(publicKey));
+ Meteor._localStorage.setItem('public_key', JSON.stringify(publicKey));
} catch (error) {
return console.error('E2E -> Error exporting public key: ', error);
}
@@ -286,7 +286,7 @@ class E2E {
try {
const privateKey = await exportJWKKey(key.privateKey);
- localStorage.setItem('private_key', JSON.stringify(privateKey));
+ Meteor._localStorage.setItem('private_key', JSON.stringify(privateKey));
} catch (error) {
return console.error('E2E -> Error exporting private key: ', error);
}
@@ -300,7 +300,7 @@ class E2E {
createRandomPassword() {
const randomPassword = `${ Random.id(3) }-${ Random.id(3) }-${ Random.id(3) }`.toLowerCase();
- localStorage.setItem('e2e.randomPassword', randomPassword);
+ Meteor._localStorage.setItem('e2e.randomPassword', randomPassword);
return randomPassword;
}
diff --git a/app/e2e/server/index.js b/app/e2e/server/index.js
index c9cfc3faca30..6f2ab21df038 100644
--- a/app/e2e/server/index.js
+++ b/app/e2e/server/index.js
@@ -2,12 +2,12 @@ import { callbacks } from '../../callbacks';
import { Notifications } from '../../notifications';
import './settings';
-import './methods/setUserPublicAndPivateKeys';
+import './methods/setUserPublicAndPrivateKeys';
import './methods/getUsersOfRoomWithoutKey';
import './methods/updateGroupKey';
import './methods/setRoomKeyID';
import './methods/fetchMyKeys';
-import './methods/resetUserE2EKey';
+import './methods/resetOwnE2EKey';
import './methods/requestSubscriptionKeys';
callbacks.add('afterJoinRoom', (user, room) => {
diff --git a/app/e2e/server/methods/resetUserE2EKey.js b/app/e2e/server/methods/resetOwnE2EKey.js
similarity index 54%
rename from app/e2e/server/methods/resetUserE2EKey.js
rename to app/e2e/server/methods/resetOwnE2EKey.js
index b1259a32b709..8286d5ab275c 100644
--- a/app/e2e/server/methods/resetUserE2EKey.js
+++ b/app/e2e/server/methods/resetOwnE2EKey.js
@@ -1,19 +1,14 @@
import { Meteor } from 'meteor/meteor';
import { Users, Subscriptions } from '../../../models';
-import { hasPermission } from '../../../authorization';
Meteor.methods({
- 'e2e.resetUserE2EKey'(userId) {
- if (!Meteor.userId()) {
- throw new Meteor.Error('error-invalid-user', 'Invalid user', {
- method: 'resetUserE2EKey',
- });
- }
+ 'e2e.resetOwnE2EKey'() {
+ const userId = Meteor.userId();
- if (hasPermission(Meteor.userId(), 'reset-other-user-e2e-key') !== true) {
- throw new Meteor.Error('error-not-allowed', 'Not allowed', {
- method: 'resetUserE2EKey',
+ if (!userId) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+ method: 'resetOwnE2EKey',
});
}
diff --git a/app/e2e/server/methods/setUserPublicAndPivateKeys.js b/app/e2e/server/methods/setUserPublicAndPrivateKeys.js
similarity index 53%
rename from app/e2e/server/methods/setUserPublicAndPivateKeys.js
rename to app/e2e/server/methods/setUserPublicAndPrivateKeys.js
index f1c4604babda..c9fb90499dde 100644
--- a/app/e2e/server/methods/setUserPublicAndPivateKeys.js
+++ b/app/e2e/server/methods/setUserPublicAndPrivateKeys.js
@@ -3,13 +3,13 @@ import { Meteor } from 'meteor/meteor';
import { Users } from '../../../models';
Meteor.methods({
- 'e2e.setUserPublicAndPivateKeys'({ public_key, private_key }) {
+ 'e2e.setUserPublicAndPrivateKeys'({ public_key, private_key }) {
const userId = Meteor.userId();
if (!userId) {
- throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.setUserPublicAndPivateKeys' });
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.setUserPublicAndPrivateKeys' });
}
- return Users.setE2EPublicAndPivateKeysByUserId(userId, { public_key, private_key });
+ return Users.setE2EPublicAndPrivateKeysByUserId(userId, { public_key, private_key });
},
});
diff --git a/app/emoji-custom/client/admin/emojiEdit.js b/app/emoji-custom/client/admin/emojiEdit.js
index b226ea27c470..09404693aa5e 100644
--- a/app/emoji-custom/client/admin/emojiEdit.js
+++ b/app/emoji-custom/client/admin/emojiEdit.js
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import s from 'underscore.string';
diff --git a/app/emoji-custom/client/admin/route.js b/app/emoji-custom/client/admin/route.js
index 7c45afaa4a03..169ff2bb637a 100644
--- a/app/emoji-custom/client/admin/route.js
+++ b/app/emoji-custom/client/admin/route.js
@@ -1,13 +1,10 @@
-import { Meteor } from 'meteor/meteor';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { BlazeLayout } from 'meteor/kadira:blaze-layout';
FlowRouter.route('/admin/emoji-custom', {
name: 'emoji-custom',
- subscriptions(/* params, queryParams*/) {
- this.register('EmojiCustom', Meteor.subscribe('EmojiCustom'));
- },
- action(/* params*/) {
+ async action(/* params*/) {
+ await import('./views');
BlazeLayout.render('main', { center: 'adminEmoji' });
},
});
diff --git a/app/emoji-custom/client/admin/views.js b/app/emoji-custom/client/admin/views.js
new file mode 100644
index 000000000000..9c058a4610eb
--- /dev/null
+++ b/app/emoji-custom/client/admin/views.js
@@ -0,0 +1,9 @@
+import './adminEmoji.html';
+import './adminEmoji';
+import './adminEmojiEdit.html';
+import './adminEmojiInfo.html';
+import './emojiEdit.html';
+import './emojiEdit';
+import './emojiInfo.html';
+import './emojiInfo';
+import './emojiPreview.html';
diff --git a/app/emoji-custom/client/index.js b/app/emoji-custom/client/index.js
index 06b377694769..8b6f4fc9c0fc 100644
--- a/app/emoji-custom/client/index.js
+++ b/app/emoji-custom/client/index.js
@@ -2,13 +2,4 @@ import './lib/emojiCustom';
import './notifications/deleteEmojiCustom';
import './notifications/updateEmojiCustom';
import './admin/startup';
-import './admin/adminEmoji.html';
-import './admin/adminEmoji';
-import './admin/adminEmojiEdit.html';
-import './admin/adminEmojiInfo.html';
-import './admin/emojiEdit.html';
-import './admin/emojiEdit';
-import './admin/emojiInfo.html';
-import './admin/emojiInfo';
-import './admin/emojiPreview.html';
import './admin/route';
diff --git a/app/emoji-custom/client/lib/emojiCustom.js b/app/emoji-custom/client/lib/emojiCustom.js
index 8395f74c3d8e..00ec847f0fca 100644
--- a/app/emoji-custom/client/lib/emojiCustom.js
+++ b/app/emoji-custom/client/lib/emojiCustom.js
@@ -3,9 +3,10 @@ import { Blaze } from 'meteor/blaze';
import { Session } from 'meteor/session';
import { isSetNotNull } from './function-isSet';
-import { RoomManager, call } from '../../../ui-utils';
-import { emoji, EmojiPicker } from '../../../emoji';
-import { CachedCollectionManager } from '../../../ui-cached-collection';
+import { RoomManager } from '../../../ui-utils/client';
+import { emoji, EmojiPicker } from '../../../emoji/client';
+import { CachedCollectionManager } from '../../../ui-cached-collection/client';
+import { APIClient } from '../../../utils/client';
export const getEmojiUrlFromName = function(name, extension) {
Session.get;
@@ -164,21 +165,27 @@ emoji.packages.emojiCustom = {
Meteor.startup(() =>
CachedCollectionManager.onLogin(async () => {
- const emojis = await call('listEmojiCustom');
-
- emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
- for (const currentEmoji of emojis) {
- emoji.packages.emojiCustom.emojisByCategory.rocket.push(currentEmoji.name);
- emoji.packages.emojiCustom.list.push(`:${ currentEmoji.name }:`);
- emoji.list[`:${ currentEmoji.name }:`] = currentEmoji;
- emoji.list[`:${ currentEmoji.name }:`].emojiPackage = 'emojiCustom';
- for (const alias of currentEmoji.aliases) {
- emoji.packages.emojiCustom.list.push(`:${ alias }:`);
- emoji.list[`:${ alias }:`] = {
- emojiPackage: 'emojiCustom',
- aliasOf: currentEmoji.name,
- };
+ try {
+ const { emojis: { update: emojis } } = await APIClient.v1.get('emoji-custom.list');
+
+ emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
+ for (const currentEmoji of emojis) {
+ emoji.packages.emojiCustom.emojisByCategory.rocket.push(currentEmoji.name);
+ emoji.packages.emojiCustom.list.push(`:${ currentEmoji.name }:`);
+ emoji.list[`:${ currentEmoji.name }:`] = currentEmoji;
+ emoji.list[`:${ currentEmoji.name }:`].emojiPackage = 'emojiCustom';
+ for (const alias of currentEmoji.aliases) {
+ emoji.packages.emojiCustom.list.push(`:${ alias }:`);
+ emoji.list[`:${ alias }:`] = {
+ emojiPackage: 'emojiCustom',
+ aliasOf: currentEmoji.name,
+ };
+ }
}
+
+ EmojiPicker.updateRecent('rocket');
+ } catch (e) {
+ console.error('Error getting custom emoji', e);
}
})
);
diff --git a/app/emoji/client/emojiPicker.html b/app/emoji/client/emojiPicker.html
index 7b1bec27f027..0e3a5c7546e1 100644
--- a/app/emoji/client/emojiPicker.html
+++ b/app/emoji/client/emojiPicker.html
@@ -7,7 +7,7 @@
+
+
+
+
+ {{_ "Reset_E2E_Key" }}
+
+ {{{_ "E2E_Reset_Key_Explanation" }}}
+
+
+
+
+
+
{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-
+
