Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't redirect when manually adding 2fa (#22474) 

<img width="369" alt="Screenshot 2023-07-06 at 3 41 12 PM" src="https://github.com/discourse/discourse/assets/50783505/847d54ed-a62a-4266-b99e-31279f5bf747">

No changes in styling, the adding of classes was to give targets for testing
This commit is contained in:
Isaac Janzen 2023-07-06 16:44:40 -05:00 committed by GitHub
parent d41fa579c8
commit a9040be47c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.hbs
View File

@ -26,11 +26,15 @@
</div> </div>
<p> <p>
{{#if this.showSecondFactorKey}} {{#if this.showSecondFactorKey}}
{{this.secondFactorKey}} <div class="second-factor-key">
{{this.secondFactorKey}}
</div>
{{else}} {{else}}
<a href {{on "click" this.enableShowSecondFactorKey}}>{{i18n <a
"user.second_factor.show_key_description" href
}}</a> class="show-second-factor-key"
{{on "click" this.enableShowSecondFactorKey}}
>{{i18n "user.second_factor.show_key_description"}}</a>
{{/if}} {{/if}}
</p> </p>
</div> </div>

4
app/assets/javascripts/discourse/app/components/modal/second-factor-add-totp.js
View File

@ -33,7 +33,9 @@ export default class SecondFactorAddTotp extends Component {
} }
@action @action
enableShowSecondFactorKey() { enableShowSecondFactorKey(e) {
e.preventDefault();
e.stopImmediatePropagation();
this.showSecondFactorKey = true; this.showSecondFactorKey = true;
} }

7
app/assets/javascripts/discourse/tests/acceptance/user-preferences-second-factor-test.js
View File

@ -66,8 +66,13 @@ acceptance("User Preferences - Second Factor", function (needs) {
await click(".new-totp"); await click(".new-totp");
assert.ok(exists(".qr-code img"), "shows qr code image"); assert.ok(exists(".qr-code img"), "shows qr code image");
await click(".add-totp"); await click(".modal a.show-second-factor-key");
assert.ok(
exists(".modal .second-factor-key"),
"displays second factor key"
);
await click(".add-totp");
assert.ok( assert.ok(
query(".alert-error").innerHTML.includes("provide a name and the code"), query(".alert-error").innerHTML.includes("provide a name and the code"),
"shows name/token missing error message" "shows name/token missing error message"