diff --git a/bin/controls/Settings.js b/bin/controls/Settings.js index 49b2cb73536aca41bb42bf01b3e4c61f1a9f55c2..647361c235cf070c0308766a951f80c76f530bc3 100644 --- a/bin/controls/Settings.js +++ b/bin/controls/Settings.js @@ -50,6 +50,10 @@ define('package/quiqqer/authgoogle2fa/bin/controls/Settings', [ '$deleteKeys' ], + options: { + uid: false + }, + initialize: function (options) { this.setAttribute('title', QUILocale.get(lg, 'passwords.panel.title')); @@ -152,6 +156,10 @@ define('package/quiqqer/authgoogle2fa/bin/controls/Settings', [ * Event: onInject */ $onInject: function () { + + console.log(this.getAttribute('uid')); + console.log(this.getElm().get('data-qui-options-uid')); + this.resize(); this.refresh(); }, diff --git a/src/QUI/Auth/Google2Fa/Auth.php b/src/QUI/Auth/Google2Fa/Auth.php index 21818e115780ee708337d7c7c3389dd28293fe11..87da03a7ab3e152cb8be7027adf70c8a484d7c38 100644 --- a/src/QUI/Auth/Google2Fa/Auth.php +++ b/src/QUI/Auth/Google2Fa/Auth.php @@ -85,7 +85,9 @@ public function auth($authData) } foreach ($authSecrets as $k => $secretData) { - if ($this->Google2FA->verifyKey(trim($secretData['key']), $authCode)) { + $key = trim(Security::decrypt($secretData['key'])); + + if ($this->Google2FA->verifyKey($key, $authCode)) { return; }