Repository: knox Updated Branches: refs/heads/master 037dc504d -> 364d3f472
KNOX-995 - KnoxSSO Form IDP Issue with Firefox Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/364d3f47 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/364d3f47 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/364d3f47 Branch: refs/heads/master Commit: 364d3f47257b5ea6b4956b96ad571e3cfdae80f2 Parents: 037dc50 Author: Larry McCay <lmc...@hortonworks.com> Authored: Sat Aug 12 11:45:18 2017 -0400 Committer: Larry McCay <lmc...@hortonworks.com> Committed: Sat Aug 12 11:46:17 2017 -0400 ---------------------------------------------------------------------- .../resources/applications/knoxauth/app/js/knoxauth.js | 11 +---------- gateway-release/src/assembly.xml | 3 ++- 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/364d3f47/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js b/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js index 13c2051..57bfff2 100644 --- a/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js +++ b/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js @@ -18,7 +18,6 @@ var loginPageSuffix = "/knoxauth/login.html"; var webssoURL = "/api/v1/websso?originalUrl="; var userAgent = navigator.userAgent.toLowerCase(); -var firstLogIn = true; function get(name){ //KNOX-820 changing the regex so that multiple query params get included with the 'originalUrl' @@ -84,13 +83,5 @@ var login = function() { } } - if (userAgent.indexOf("firefox") != -1){ //TODO: check version number - if (firstLogIn) _login(); - else logoff(_login); - } - else{ - _login(); - } - - if (firstLogIn) firstLogIn = false; + _login(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/364d3f47/gateway-release/src/assembly.xml ---------------------------------------------------------------------- diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml index ebbc093..83a5428 100644 --- a/gateway-release/src/assembly.xml +++ b/gateway-release/src/assembly.xml @@ -106,6 +106,7 @@ <exclude>${gateway-group}:gateway-server-launcher</exclude> <exclude>${gateway-group}:gateway-shell-launcher</exclude> <exclude>${gateway-group}:gateway-demo-ldap-launcher</exclude> + <exclude>${gateway-group}:gateway-applications</exclude> </excludes> </dependencySet> <dependencySet> @@ -144,4 +145,4 @@ </includes> </dependencySet> </dependencySets> -</assembly> \ No newline at end of file +</assembly>