pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jeremy Benoist
2018-12-02 18:39:02 +01:00
parent edc79ad886
commit 2dfbe9e5fa
4 changed files with 36 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
View File

@ -86,8 +86,7 @@
<br/>
<img id="androidQrcode" />
<script>
const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
document.getElementById('androidQrcode').src = imgBase64;
document.getElementById('androidQrcode').src = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
</script>
</div>
</fieldset>
@ -186,20 +185,20 @@
{{ form_widget(form.user.googleTwoFactor) }}
{{ form_errors(form.user.googleTwoFactor) }}
</div>
{% for OTPSecret in app.session.flashbag.get('OTPSecret') %}
{% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %}
<div class="row">
You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password.
<br/>
That code will disapear after a page reload.
<br/><br/>
<strong>{{ OTPSecret.code }}</strong>
<strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong>
<br/><br/>
Or you can scan that QR Code with your app:
<br/>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');;
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');;
</script>
</div>
{% endfor %}

6
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View File

@ -212,20 +212,20 @@
</div>
</div>
{% for OTPSecret in app.session.flashbag.get('OTPSecret') %}
{% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %}
<div class="card-panel yellow darken-1 black-text">
You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password.
<br/>
That code will disapear after a page reload.
<br/><br/>
<strong>{{ OTPSecret.code }}</strong>
<strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong>
<br/><br/>
Or you can scan that QR Code with your app:
<br/>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');;
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');;
</script>
</div>
{% endfor %}