Skip to content
Snippets Groups Projects
Unverified Commit 14896b04 authored by Guilherme Gazzo's avatar Guilherme Gazzo Committed by GitHub
Browse files

[FIX] 2FA required rendering blank page (#19364)

parent edda3511
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
{{#if require2faSetup}} {{#if require2faSetup}}
<main id="rocket-chat" class="{{embeddedVersion}}"> <main id="rocket-chat" class="{{embeddedVersion}}">
<div class="rc-old main-content content-background-color"> <div class="rc-old main-content content-background-color">
{{> Template.dynamic template="accountSecurity"}} {{> accountSecurity }}
</div> </div>
</main> </main>
{{else}} {{else}}
......
...@@ -17,6 +17,7 @@ import { hasRole } from '../../authorization'; ...@@ -17,6 +17,7 @@ import { hasRole } from '../../authorization';
import { tooltip } from '../../ui/client/components/tooltip'; import { tooltip } from '../../ui/client/components/tooltip';
import { callbacks } from '../../callbacks/client'; import { callbacks } from '../../callbacks/client';
import { isSyncReady } from '../../../client/lib/userData'; import { isSyncReady } from '../../../client/lib/userData';
import { createTemplateForComponent } from '../../../client/reactAdapters';
function executeCustomScript(script) { function executeCustomScript(script) {
eval(script);//eslint-disable-line eval(script);//eslint-disable-line
...@@ -29,6 +30,8 @@ function customScriptsOnLogout() { ...@@ -29,6 +30,8 @@ function customScriptsOnLogout() {
} }
} }
createTemplateForComponent('accountSecurity', () => import('../../../client/account/security/AccountSecurityPage'));
callbacks.add('afterLogoutCleanUp', () => customScriptsOnLogout(), callbacks.priority.LOW, 'custom-script-on-logout'); callbacks.add('afterLogoutCleanUp', () => customScriptsOnLogout(), callbacks.priority.LOW, 'custom-script-on-logout');
Template.body.onRendered(function() { Template.body.onRendered(function() {
......
import { HTML } from 'meteor/htmljs';
import { FlowRouter } from 'meteor/kadira:flow-router'; import { FlowRouter } from 'meteor/kadira:flow-router';
import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { BlazeLayout } from 'meteor/kadira:blaze-layout';
import { createTemplateForComponent } from '../../../../client/reactAdapters'; import { createTemplateForComponent } from '../../../../client/reactAdapters';
createTemplateForComponent('auditPage', () => import('../../../client/audit/AuditPage')); createTemplateForComponent('auditPage', () => import('../../../client/audit/AuditPage'), {
createTemplateForComponent('auditLogPage', () => import('../../../client/audit/AuditLogPage')); renderContainerView: () => HTML.DIV({ style: 'height: 100%;' }), // eslint-disable-line new-cap
});
createTemplateForComponent('auditLogPage', () => import('../../../client/audit/AuditLogPage'), {
renderContainerView: () => HTML.DIV({ style: 'height: 100%;' }), // eslint-disable-line new-cap
});
FlowRouter.route('/audit', { FlowRouter.route('/audit', {
name: 'audit-home', name: 'audit-home',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment