You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2023/09/23 17:38:47 UTC
[solr] branch branch_9x updated: SOLR-16991: Fix bug: Concurrent requests failing JWT Auth intermittently (#1949)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new db626d9b3a7 SOLR-16991: Fix bug: Concurrent requests failing JWT Auth intermittently (#1949)
db626d9b3a7 is described below
commit db626d9b3a73c7a4ad22cdf50cd3e620ff513c3d
Author: Lamine <10...@users.noreply.github.com>
AuthorDate: Sat Sep 23 12:29:49 2023 -0500
SOLR-16991: Fix bug: Concurrent requests failing JWT Auth intermittently (#1949)
(cherry picked from commit 4980fbd1dd89a44086e52b9950cf181585001343)
---
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/app.js | 4 ++++
solr/webapp/web/js/angular/controllers/login.js | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ba6d4cf9855..2e87ec74088 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -149,6 +149,8 @@ Bug Fixes
* SOLR-16701: Fix race condition on PRS enabled collection deletion (Patson Luk)
+* SOLR-16991: Concurrent requests failing JWT authentication in Admin UI intermittently (Lamine Idjeraoui, janhoy)
+
Dependency Upgrades
---------------------
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index 206f246e866..0cb3bf529b9 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -592,6 +592,10 @@ solrAdminApp.controller('MainController', function($scope, $route, $rootScope, $
$scope.http401 = sessionStorage.getItem("http401");
};
+ $scope.showHideMenu = function() {
+ $scope.http401 = sessionStorage.getItem("http401");
+ };
+
$scope.isMultiDestAlias = function(selectedColl) {
return selectedColl && selectedColl.type === 'alias' && selectedColl.collections.includes(',');
};
diff --git a/solr/webapp/web/js/angular/controllers/login.js b/solr/webapp/web/js/angular/controllers/login.js
index 0e22100c306..6f1a63a8ef1 100644
--- a/solr/webapp/web/js/angular/controllers/login.js
+++ b/solr/webapp/web/js/angular/controllers/login.js
@@ -18,7 +18,7 @@
solrAdminApp.controller('LoginController',
['$scope', '$routeParams', '$rootScope', '$location', '$window', 'AuthenticationService', 'Constants',
function ($scope, $routeParams, $rootScope, $location, $window, AuthenticationService, Constants) {
- $scope.resetMenu("login", Constants.IS_ROOT_PAGE);
+ $scope.showHideMenu();
$scope.subPath = $routeParams.route;
$rootScope.exceptions = {};