diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-22 10:51:18 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-22 10:51:18 +0000 |
commit | 208eb7d69790ad6842274cd46cf5a0e8006eb9f5 (patch) | |
tree | e847e29de7b3d66fff9570247eeb585526cb1e08 /app/assets | |
parent | 68cc9ea22daa8c13b2cb880dcde2606b6b5b43b6 (diff) | |
download | gitlab-ce-208eb7d69790ad6842274cd46cf5a0e8006eb9f5.tar.gz |
Added dispatcher imports for sessions routedispatcher-ph-more
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 24 | ||||
-rw-r--r-- | app/assets/javascripts/pages/omniauth_callbacks/index.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/pages/sessions/index.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/shared/sessions/u2f.js | 16 |
4 files changed, 34 insertions, 16 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f2479ec33d7..ed7010d6286 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -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) diff --git a/app/assets/javascripts/pages/omniauth_callbacks/index.js b/app/assets/javascripts/pages/omniauth_callbacks/index.js new file mode 100644 index 00000000000..54f4e56359a --- /dev/null +++ b/app/assets/javascripts/pages/omniauth_callbacks/index.js @@ -0,0 +1,5 @@ +import initU2F from '../../shared/sessions/u2f'; + +export default () => { + initU2F(); +}; diff --git a/app/assets/javascripts/pages/sessions/index.js b/app/assets/javascripts/pages/sessions/index.js new file mode 100644 index 00000000000..54f4e56359a --- /dev/null +++ b/app/assets/javascripts/pages/sessions/index.js @@ -0,0 +1,5 @@ +import initU2F from '../../shared/sessions/u2f'; + +export default () => { + initU2F(); +}; diff --git a/app/assets/javascripts/shared/sessions/u2f.js b/app/assets/javascripts/shared/sessions/u2f.js new file mode 100644 index 00000000000..1d075f7e872 --- /dev/null +++ b/app/assets/javascripts/shared/sessions/u2f.js @@ -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; +}; |