mirror of
https://github.com/slawkens/myaac.git
synced 2026-03-18 00:33:32 +01:00
[WIP] 2fa - Optimize code, views
This commit is contained in:
@@ -23,7 +23,13 @@
|
||||
<li><label for="totp">Enter the verification code you have received from the used
|
||||
authenticator app:</label><br>
|
||||
<div style="margin-top: 15px; margin-bottom: 15px;">
|
||||
<input form="form" id="totp" name="totp" autocomplete="off"></div>
|
||||
|
||||
<input form="form" id="auth-code" name="auth-code" maxlength="6" autocomplete="off">
|
||||
{% if errors|length > 0 %}
|
||||
<br/>
|
||||
<div class="FormFieldError">{{ errors[0] }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</li>
|
||||
<li>Click on "Continue" to connect the authenticator app to your
|
||||
Tibia account.
|
||||
@@ -46,13 +52,14 @@
|
||||
<td>
|
||||
<form id="form" method="post" action="{{ getLink('account/2fa/app/enable') }}">
|
||||
|
||||
<input type="hidden" name="action" value="link">
|
||||
<input type="hidden" name="action" value="link">
|
||||
|
||||
{{ csrf() }}
|
||||
{{ csrf() }}
|
||||
|
||||
{% set button_color = 'green' %}
|
||||
{% set button_name = 'Continue' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
{% set button_color = 'green' %}
|
||||
{% set button_name = 'Continue' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form action="{{ getLink('account/manage') }}" method="post" style="padding:0;margin:0;">
|
||||
@@ -60,7 +67,7 @@
|
||||
{{ csrf() }}
|
||||
|
||||
{% set button_color = 'blue' %}
|
||||
{% set button_name = 'Request' %}
|
||||
{% set button_name = 'Cancel' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
</form>
|
||||
</td>
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<span class="red"><b>Please read this warning carefully as it contains important security information! If you skip this message, you might lose your Tibia account!</b></span><br><br>
|
||||
<span class="red"><b>Please read this warning carefully as it contains important security information! If you skip this message, you might lose your {{ config.lua.serverName }} account!</b></span><br><br>
|
||||
<p>Before you connect your account with an authenticator app, you will be asked to
|
||||
enter your recovery key. If you do not have a valid recovery key, you need to
|
||||
order a new one before you can connect your account with an authenticator.</p>
|
||||
<p>Why?<br>The recovery key is the only way to unlink the authenticator app from
|
||||
your Tibia account in various cases, among others, if:</p>
|
||||
your {{ config.lua.serverName }} account in various cases, among others, if:</p>
|
||||
<ul style="list-style-type:square">
|
||||
<li>you lose your device (mobile phone, tablet, etc.) with the authenticator
|
||||
app
|
||||
@@ -26,17 +26,30 @@
|
||||
(e.g. Google or iTunes sync) even if you have app data backup&synchronisation
|
||||
activated in the settings of your device!</p>
|
||||
<p>In all these scenarios, the recovery key is the only way to get access to your
|
||||
Tibia account. Note that not even customer support will be able to help you in
|
||||
{{ config.lua.serverName }} account. Note that not even customer support will be able to help you in
|
||||
these cases if you do not have a valid recovery key.<br>For this reason, make
|
||||
sure to store your recovery key always in a safe place!</p><br>Do you have a
|
||||
valid recovery key and would like to request the email with the confirmation key to
|
||||
start connecting your Tibia account to an authenticator app?<br><br><b>Enter your
|
||||
recovery key:</b><br>
|
||||
start connecting your {{ config.lua.serverName }} account to an authenticator app?<br><br><b>Enter your
|
||||
recovery key:</b><br/>
|
||||
|
||||
<div style="margin-top: 15px; margin-bottom: 15px;">
|
||||
|
||||
<input class="UpperCaseInput" name="key1" value="" size="5" maxlength="5" autocomplete="off"> -
|
||||
<input class="UpperCaseInput" name="key2" value="" size="5" maxlength="5" autocomplete="off"> - <input class="UpperCaseInput" name="key3" value="" size="5" maxlength="5" autocomplete="off"> -
|
||||
<input class="UpperCaseInput" name="key4" value="" size="5" maxlength="5" autocomplete="off"></div>
|
||||
{% if newRecoveryKeyFormat %}
|
||||
|
||||
<input form="form" class="UpperCaseInput" name="key1" value="" size="5" maxlength="5" autocomplete="off"> -
|
||||
<input form="form" class="UpperCaseInput" name="key2" value="" size="5" maxlength="5" autocomplete="off"> - <input class="UpperCaseInput" name="key3" value="" size="5" maxlength="5" autocomplete="off"> -
|
||||
<input form="form" class="UpperCaseInput" name="key4" value="" size="5" maxlength="5" autocomplete="off">
|
||||
|
||||
{% else %}
|
||||
<input form="form" class="UpperCaseInput" name="key" value="" autocomplete="off">
|
||||
{% endif %}
|
||||
|
||||
{% if errors|length > 0 %}
|
||||
<br/>
|
||||
<div class="FormFieldError">{{ errors[0] }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@@ -49,14 +62,15 @@
|
||||
<tbody>
|
||||
<tr align="center">
|
||||
<td>
|
||||
<form action="{{ getLink('account/2fa/app/enable') }}" method="post" style="padding:0;margin:0;">
|
||||
<form id="form" action="{{ getLink('account/2fa/app/enable') }}" method="post" style="padding:0;margin:0;">
|
||||
|
||||
<input type="hidden" name="action" value="request" />
|
||||
<input type="hidden" name="action" value="request" />
|
||||
|
||||
{{ csrf() }}
|
||||
{{ csrf() }}
|
||||
|
||||
{% set button_name = 'Request' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
{% set button_name = 'Request' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form action="{{ getLink('account/register') }}" method="post" style="padding:0;margin:0;">
|
||||
@@ -79,3 +93,9 @@
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<style>
|
||||
.UpperCaseInput {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
TODO
|
||||
@@ -15,7 +15,7 @@
|
||||
<div class="LabelV200" style="float:left;">Authenticator App
|
||||
Token:
|
||||
</div>
|
||||
<input form="form-code" id="auth-code" name="auth-code" maxlength="6" autocomplete="off"></div>
|
||||
<input form="form" id="auth-code" name="auth-code" maxlength="6" autocomplete="off"></div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@@ -33,7 +33,7 @@
|
||||
<tbody>
|
||||
<tr align="center" valign="top">
|
||||
<td>
|
||||
<form id="form-code" action="{{ getLink('account/manage') }}" method="post">
|
||||
<form id="form" action="{{ getLink('account/manage') }}" method="post">
|
||||
|
||||
{{ csrf() }}
|
||||
|
||||
|
||||
25
system/templates/account/2fa/app/manage.connected.html.twig
Normal file
25
system/templates/account/2fa/app/manage.connected.html.twig
Normal file
@@ -0,0 +1,25 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="TableContentContainer ">
|
||||
<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<div style="float: right; width: 135px;">
|
||||
<form action="{{ getLink('account/2fa/app/disable') }}" method="post" style="padding:0;margin:0;">
|
||||
{{ csrf() }}
|
||||
|
||||
{% set button_name = 'Unlink' %}
|
||||
{{ include('buttons.base.html.twig') }}
|
||||
</form>
|
||||
</div>
|
||||
<b>Your Tibia account is <span style="color: green">connected</span> to an authenticator app.</b>
|
||||
<p>If you do not want to use an authenticator app any longer, you can "Unlink" the authenticator
|
||||
App. Note, however, an authenticator app is an important security feature which helps to
|
||||
prevent any unauthorized access to your Tibia account.</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
36
system/templates/account/2fa/app/manage.enable.html.twig
Normal file
36
system/templates/account/2fa/app/manage.enable.html.twig
Normal file
@@ -0,0 +1,36 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="TableShadowContainerRightTop">
|
||||
<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div>
|
||||
</div>
|
||||
<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
|
||||
<div class="TableContentContainer">
|
||||
<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
|
||||
<tbody><tr>
|
||||
<td class="LabelV"><b>Connect your {{ config.lua.serverName }} account to an authenticator app!</b>
|
||||
<div style="float: right; font-size: 1px;">
|
||||
<form action="{{ getLink('account/2fa/app/enable') }}" method="post" style="margin: 0; padding: 0;">
|
||||
{{ csrf() }}
|
||||
{% set button_name = 'Request' %}
|
||||
{% include('buttons.base.html.twig') %}
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<p>As a first step to connect an <b>authenticator app</b> to your account, click on "Request"! An email with a confirmation key will be sent to the email address assigned to your account.</p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="TableShadowContainer">
|
||||
<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);">
|
||||
<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div>
|
||||
<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
Reference in New Issue
Block a user