kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Added dispatcher imports for sessions route

This commit is contained in:
Phil Hughes 2018-01-22 10:51:18 +00:00
parent 68cc9ea22d
commit 208eb7d697
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/dispatcher.js
View File

@ -23,7 +23,6 @@ import GLForm from './gl_form';
import Shortcuts from './shortcuts';
import ShortcutsNavigation from './shortcuts_navigation';
import ShortcutsIssuable from './shortcuts_issuable';
import U2FAuthenticate from './u2f/authenticate';
import Diff from './diff';
import SearchAutocomplete from './search_autocomplete';
import Activities from './activities';
@ -537,18 +536,15 @@ import Activities from './activities';
}
switch (path[0]) {
case 'sessions':
import('./pages/sessions')
.then(callDefault)
.catch(fail);
break;
case 'omniauth_callbacks':
if (!gon.u2f) break;
const u2fAuthenticate = new U2FAuthenticate(
$('#js-authenticate-u2f'),
'#js-login-u2f-form',
gon.u2f,
document.querySelector('#js-login-2fa-device'),
document.querySelector('.js-2fa-form'),
);
u2fAuthenticate.start();
// needed in rspec
gl.u2fAuthenticate = u2fAuthenticate;
import('./pages/omniauth_callbacks')
.then(callDefault)
.catch(fail);
break;
case 'admin':
import('./pages/admin')
.then(callDefault)
@ -598,10 +594,6 @@ import Activities from './activities';
break;
}
break;
case 'dashboard':
case 'root':
new UserCallout();
break;
case 'profiles':
import('./pages/profiles/index/')
.then(callDefault)

5
app/assets/javascripts/pages/omniauth_callbacks/index.js Normal file
View File

@ -0,0 +1,5 @@
import initU2F from '../../shared/sessions/u2f';
export default () => {
initU2F();
};

5
app/assets/javascripts/pages/sessions/index.js Normal file
View File

@ -0,0 +1,5 @@
import initU2F from '../../shared/sessions/u2f';
export default () => {
initU2F();
};

16
app/assets/javascripts/shared/sessions/u2f.js Normal file
View File

@ -0,0 +1,16 @@
import U2FAuthenticate from '../../u2f/authenticate';
export default () => {
if (!gon.u2f) return;
const u2fAuthenticate = new U2FAuthenticate(
$('#js-authenticate-u2f'),
'#js-login-u2f-form',
gon.u2f,
document.querySelector('#js-login-2fa-device'),
document.querySelector('.js-2fa-form'),
);
u2fAuthenticate.start();
// needed in rspec
gl.u2fAuthenticate = u2fAuthenticate;
};