GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Security][Exception] Security exception handling, login and register. TODO EmailNotFoundException and NicknameNotFoundException.

Browse Source
This commit is contained in:
Eliseu Amaro 2021-09-15 14:47:29 +01:00
parent 26af284353
commit e9d809d441
6 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/assets/css/base.css
View File

@ -480,13 +480,12 @@ summary:hover .icon-details-open {
}
.form-group {
all: unset;
display: flex;
flex-direction: column;
margin-bottom: 10px;
}
.form-group label {
margin-bottom: 5px;
}
.help-block {
margin-top: 5px;
margin-bottom: 10px;
@ -500,6 +499,8 @@ summary:hover .icon-details-open {
.help-block > .list-unstyled,
.alert,
.alert-danger {
display: inline-block;
border: solid 2px #FF6347;
background-color: #FF634733;
border-radius: var(--unit-size);

2
src/Security/Authenticator.php
View File

@ -97,7 +97,7 @@ class Authenticator extends AbstractFormLoginAuthenticator
$user = DB::findOneBy('local_user', ['or' => ['nickname' => $nick, 'outgoing_email' => $nick]]);
} catch (Exception $e) {
throw new CustomUserMessageAuthenticationException(
_m('\'{nickname}\' doesn\'t match any registered nickname or email.', ['nickname' => $credentials['nickname']]));
_m('Invalid login credentials.'));
}
return $user;

7
src/Util/Exception/EmailNotFoundException.php Normal file
View File

@ -0,0 +1,7 @@
<?php
namespace App\Util\Exception;
class EmailNotFoundException extends EmailException {
// TODO: everything
}

9
src/Util/Exception/NicknameNotFoundException.php Normal file
View File

@ -0,0 +1,9 @@
<?php
namespace App\Util\Exception;
use App\Util\Exception\NicknameException;
class NicknameNotFoundException extends NicknameException {
// TODO: everything
}

7
templates/security/login.html.twig
View File

@ -14,12 +14,15 @@
<legend class="section-form-legend">{{ "Login" | trans }}</legend>
{% if error %}
<label class="alert alert-danger">
{{ error.getMessage() }}
</label>
<ul>
{#<ul>
{% for flashError in app.flashes('verify_email_error') %}
<li class="alert alert-danger">{{ error.messageKey | trans(error.messageData, 'security') }}</li>
{% endfor %}
</ul>
</ul>#}
{% endif %}

15
templates/security/register.html.twig
View File

@ -15,14 +15,13 @@
<fieldset>
<legend class="section-form-legend">{{ "Register" | trans }}</legend>
<ul>
{% for flashError in app.flashes('verify_email_error') %}
<li class="alert alert-danger" role="alert">{{ flashError }}</li>
{% endfor %}
{% for flashError in app.flashes('verify_nickname_error') %}
<li class="alert alert-danger" role="alert">{{ flashError }}</li>
{% endfor %}
</ul>
{% for flashError in app.flashes('verify_email_error') %}
<label class="alert alert-danger" role="alert">{{ flashError }}</label>
{% endfor %}
{% for flashError in app.flashes('verify_nickname_error') %}
<label class="alert alert-danger" role="alert">{{ flashError }}</label>
{% endfor %}
{{ form_row(registration_form.nickname) }}
{{ form_row(registration_form.email) }}