RocketChat · rodrigok · Nov 1, 2018 · Oct 19, 2018 · Oct 19, 2018 · Oct 19, 2018
diff --git a/packages/rocketchat-2fa/client/TOTPPassword.js b/packages/rocketchat-2fa/client/TOTPPassword.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { t, modal } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 
 function reportError(error, callback) {

diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
+import { t, modal } from 'meteor/rocketchat:ui';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

diff --git a/packages/rocketchat-2fa/client/index.js b/packages/rocketchat-2fa/client/index.js
@@ -0,0 +1,3 @@
+import './accountSecurity.html';
+import './accountSecurity';
+import './TOTPPassword';
diff --git a/packages/rocketchat-2fa/package.js b/packages/rocketchat-2fa/package.js
@@ -14,22 +14,9 @@ Package.onUse(function(api) {
 		'rocketchat:lib',
 		'sha',
 		'random',
+		'rocketchat:ui',
 	]);
 
-	api.addFiles('client/accountSecurity.html', 'client');
-	api.addFiles('client/accountSecurity.js', 'client');
-	api.addFiles('client/TOTPPassword.js', 'client');
-
-	api.addFiles('server/lib/totp.js', 'server');
-
-	api.addFiles('server/methods/checkCodesRemaining.js', 'server');
-	api.addFiles('server/methods/disable.js', 'server');
-	api.addFiles('server/methods/enable.js', 'server');
-	api.addFiles('server/methods/regenerateCodes.js', 'server');
-	api.addFiles('server/methods/validateTempToken.js', 'server');
-
-	api.addFiles('server/models/users.js', 'server');
-
-	api.addFiles('server/startup/settings.js', 'server');
-	api.addFiles('server/loginHandler.js', 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-2fa/server/index.js b/packages/rocketchat-2fa/server/index.js
@@ -0,0 +1,9 @@
+import './startup/settings';
+import './lib/totp';
+import './models/users';
+import './methods/checkCodesRemaining';
+import './methods/disable';
+import './methods/enable';
+import './methods/regenerateCodes';
+import './methods/validateTempToken';
+import './loginHandler';
diff --git a/packages/rocketchat-2fa/server/lib/totp.js b/packages/rocketchat-2fa/server/lib/totp.js
@@ -1,5 +1,6 @@
 import { SHA256 } from 'meteor/sha';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import speakeasy from 'speakeasy';
 
 RocketChat.TOTP = {

diff --git a/packages/rocketchat-2fa/server/loginHandler.js b/packages/rocketchat-2fa/server/loginHandler.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Accounts.registerLoginHandler('totp', function(options) {
 	if (!options.totp || !options.totp.code) {

diff --git a/packages/rocketchat-2fa/server/methods/checkCodesRemaining.js b/packages/rocketchat-2fa/server/methods/checkCodesRemaining.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+
 Meteor.methods({
 	'2fa:checkCodesRemaining'() {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/disable.js b/packages/rocketchat-2fa/server/methods/disable.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 Meteor.methods({
 	'2fa:disable'(code) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/enable.js b/packages/rocketchat-2fa/server/methods/enable.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 Meteor.methods({
 	'2fa:enable'() {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/regenerateCodes.js b/packages/rocketchat-2fa/server/methods/regenerateCodes.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 Meteor.methods({
 	'2fa:regenerateCodes'(userToken) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/validateTempToken.js b/packages/rocketchat-2fa/server/methods/validateTempToken.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 Meteor.methods({
 	'2fa:validateTempToken'(userToken) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/models/users.js b/packages/rocketchat-2fa/server/models/users.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Users.disable2FAAndSetTempSecretByUserId = function(userId, tempToken) {
 	return this.update({
 		_id: userId,

diff --git a/packages/rocketchat-2fa/server/startup/settings.js b/packages/rocketchat-2fa/server/startup/settings.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('Accounts', function() {
 	this.section('Two Factor Authentication', function() {
 		this.add('Accounts_TwoFactorAuthentication_Enabled', true, {

diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
 
-this.modal = {
+modal = {
 	renderedModal: null,
 	open(config = {}, fn, onCancel) {
 		config.confirmButtonText = config.confirmButtonText || (config.type === 'error' ? t('Ok') : t('Send'));

diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
@@ -147,4 +147,5 @@ Package.onUse(function(api) {
 
 	api.export('fileUpload');
 	api.export('t');
+	api.export('modal');
 });