From 2303b08389279ac0a55765716a089299e9669bed Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 23 May 2018 17:03:48 +0100 Subject: Fixed U2F authentication when used with LDAP Closes #46661 --- app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js | 3 +++ changelogs/unreleased/ldap-u2f-fix.yml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js create mode 100644 changelogs/unreleased/ldap-u2f-fix.yml diff --git a/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js b/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js new file mode 100644 index 00000000000..edd7e38471b --- /dev/null +++ b/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js @@ -0,0 +1,3 @@ +import initU2F from '../../../shared/sessions/u2f'; + +document.addEventListener('DOMContentLoaded', initU2F); diff --git a/changelogs/unreleased/ldap-u2f-fix.yml b/changelogs/unreleased/ldap-u2f-fix.yml new file mode 100644 index 00000000000..40b017f3d1b --- /dev/null +++ b/changelogs/unreleased/ldap-u2f-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed U2F login when used with LDAP +merge_request: +author: +type: fixed -- cgit v1.2.1