github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(auth): track skips per user [EE-3318] (#7089)

oscarzhou-portainer-patch-1
itsconquest 2022-06-20 17:00:07 +12:00 committed by GitHub
parent 92eaa02156
commit ae731b5496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/portainer/services/stateManager.js
View File

@ -25,6 +25,7 @@ function StateManagerFactory(
UI: { UI: {
dismissedInfoPanels: {}, dismissedInfoPanels: {},
dismissedInfoHash: '', dismissedInfoHash: '',
timesPasswordChangeSkipped: {},
}, },
}; };
@ -50,13 +51,12 @@ function StateManagerFactory(
manager.setPasswordChangeSkipped = function (userID) { manager.setPasswordChangeSkipped = function (userID) {
state.UI.instanceId = state.UI.instanceId || state.application.instanceId; state.UI.instanceId = state.UI.instanceId || state.application.instanceId;
state.UI.timesPasswordChangeSkipped = state.UI.timesPasswordChangeSkipped || {};
state.UI.timesPasswordChangeSkipped[userID] = state.UI.timesPasswordChangeSkipped[userID] + 1 || 1; state.UI.timesPasswordChangeSkipped[userID] = state.UI.timesPasswordChangeSkipped[userID] + 1 || 1;
LocalStorage.storeUIState(state.UI); LocalStorage.storeUIState(state.UI);
}; };
manager.resetPasswordChangeSkips = function (userID) { manager.resetPasswordChangeSkips = function (userID) {
if (state.UI.timesPasswordChangeSkipped && state.UI.timesPasswordChangeSkipped[userID]) state.UI.timesPasswordChangeSkipped[userID] = 0; if (state.UI.timesPasswordChangeSkipped[userID]) state.UI.timesPasswordChangeSkipped[userID] = 0;
LocalStorage.storeUIState(state.UI); LocalStorage.storeUIState(state.UI);
}; };

2
app/portainer/views/account/accountController.js
View File

@ -130,7 +130,7 @@ angular.module('portainer.app').controller('AccountController', [
$scope.AuthenticationMethod = data.AuthenticationMethod; $scope.AuthenticationMethod = data.AuthenticationMethod;
if (state.UI.requiredPasswordLength && state.UI.requiredPasswordLength !== data.RequiredPasswordLength) { if (state.UI.requiredPasswordLength && state.UI.requiredPasswordLength !== data.RequiredPasswordLength) {
StateManager.clearPasswordChangeSkips($scope.userID.toString()); StateManager.clearPasswordChangeSkips();
} }
$scope.timesPasswordChangeSkipped = $scope.timesPasswordChangeSkipped =