Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordizzy <diosmosis@users.noreply.github.com>2021-05-10 03:00:42 +0300
committerGitHub <noreply@github.com>2021-05-10 03:00:42 +0300
commit07d33998967f4c42a800c2374fd951e9d42cd2b4 (patch)
tree496c0b7ce4cd2f9a1a826aaa9af4270831df8c1d /plugins/UsersManager
parent13e784ea481a9e35d5ccd9521c5464889411e970 (diff)
require password confirmation when resetting 2fa (#17528)
* require password confirmation when resetting 2fa * fix test * fix test * update screenshots
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html9
-rw-r--r--plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js5
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
index 4c7f016bb5..af48840665 100644
--- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
+++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
@@ -166,7 +166,16 @@
<div class="twofa-confirm-modal modal">
<div class="modal-content">
<h2>{{:: 'UsersManager_AreYouSure'|translate }}</h2>
+ <p>{{:: 'UsersManager_ConfirmWithPassword'|translate }}</p>
+
+ <div piwik-field uicontrol="password" name="currentUserPassword" autocomplete="off"
+ ng-model="$ctrl.passwordConfirmation"
+ full-width="true"
+ title="{{ 'UsersManager_YourCurrentPassword'|translate }}"
+ value="">
+ </div>
</div>
+
<div class="modal-footer">
<a href="" class="modal-action modal-close btn" ng-click="$ctrl.reset2FA()">{{:: 'General_Yes'|translate }}</a>
<a href="" class="modal-action modal-close modal-no">{{:: 'General_No'|translate }}</a>
diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js
index 449eddf29b..9b6792ea41 100644
--- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js
+++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js
@@ -139,7 +139,8 @@
vm.isResetting2FA = true;
return piwikApi.post({
method: 'TwoFactorAuth.resetTwoFactorAuth',
- userLogin: vm.user.login
+ userLogin: vm.user.login,
+ passwordConfirmation: vm.passwordConfirmation
}).catch(function (e) {
vm.isResetting2FA = false;
throw e;
@@ -149,6 +150,8 @@
vm.activeTab = 'basic';
showUserSavedNotification();
+ }).finally(function () {
+ vm.passwordConfirmation = '';
});
}