oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Update to FOSUserBundle 3.1

Browse source 
Also remove some deprecation from Symfony.
Use `LegacyEventDispatcherProxy` to handle Symfony 4 dispatch from FOSUser
This commit is contained in:
Jeremy Benoist 2022-12-13 13:39:24 +01:00
parent 141d289ec0
commit 33267f0736
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
30 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
View file

@ -1,40 +0,0 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{{ form_start(form, {'attr': {'class': 'craue_config_settings_modify'}}) }}
{{ form_errors(form) }}
<div class="row">
<div class="div_tabs col s12">
<ul class="tabs">
{% for section in sections|craue_sortSections %}
<li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section|trans({}, 'CraueConfigBundle') }}</a></li>
{% endfor %}
</ul>
</div>
{% for section in sections|craue_sortSections %}
<div id="set-{{ section }}" class="col s12">
{% for setting in form.settings if setting.vars.value.section == section %}
{{ form_row(setting.value, {
'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'),
}) }}
{% endfor %}
</div>
{% endfor %}
</div>
<button class="btn waves-effect waves-light" type="submit" name="action">
{{ 'modify_settings'|trans({}, 'CraueConfigBundle') }}
</button>
{{ form_widget(form._token) }}
</div>
</div>
</div>
{% endblock %}

12
app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig
View file

@ -1,12 +0,0 @@
{% trans_default_domain 'FOSUserBundle' %}
{{ form_start(form, {'action': path('fos_user_change_password'), 'attr': {'class': 'fos_user_change_password'}}) }}
<div class="card-content">
<div class="row">
{{ form_widget(form) }}
<div>
<input type="submit" value="{{ 'change_password.submit'|trans }}" />
</div>
</div>
</div>
</form>

11
app/Resources/FOSUserBundle/views/Registration/check_email.html.twig
View file

@ -1,11 +0,0 @@
{% extends "@FOSUser/layout.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block fos_user_content %}
<div class="card-content">
<div class="row">
<p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
</div>
</div>
{% endblock fos_user_content %}

17
app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig
View file

@ -1,17 +0,0 @@
{% extends "@FOSUser/layout.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block fos_user_content %}
<div class="card-content">
<div class="row">
<p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
{% if targetUrl %}
<p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
{% endif %}
</div>
<div class="card-action center">
<a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'|trans({}, 'messages') }}</a>
</div>
</div>
{% endblock fos_user_content %}

44
app/Resources/FOSUserBundle/views/Registration/register_content.html.twig
View file

@ -1,44 +0,0 @@
{% trans_default_domain 'FOSUserBundle' %}
{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
<div class="card-content">
<div class="row">
{{ form_widget(form._token) }}
{% for flash_message in app.session.flashbag.get('notice') %}
<span class="black-text"><p>{{ flash_message }}</p></span>
{% endfor %}
<div class="input-field col s12">
{{ form_errors(form.email) }}
{{ form_label(form.email) }}
{{ form_widget(form.email) }}
</div>
<div class="input-field col s12">
{{ form_errors(form.username) }}
{{ form_label(form.username) }}
{{ form_widget(form.username) }}
</div>
<div class="input-field col s12">
{{ form_errors(form.plainPassword.first) }}
{{ form_label(form.plainPassword.first) }}
{{ form_widget(form.plainPassword.first) }}
</div>
<div class="input-field col s12">
{{ form_errors(form.plainPassword.second) }}
{{ form_label(form.plainPassword.second) }}
{{ form_widget(form.plainPassword.second) }}
</div>
</div>
</div>
<div class="card-action center">
<a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">{{ 'security.login.submit'|trans }}</a>
<button class="btn waves-effect waves-light" type="submit" name="send">
{{ 'registration.submit'|trans({}, 'FOSUserBundle') }}
<i class="material-icons right">send</i>
</button>
</div>
</form>

11
app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig
View file

@ -1,11 +0,0 @@
{% extends "@FOSUser/layout.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block fos_user_content %}
<div class="card-content">
<div class="row">
<p>{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}</p>
</div>
</div>
{% endblock fos_user_content %}

30
app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig
View file

@ -1,30 +0,0 @@
{% trans_default_domain 'FOSUserBundle' %}
<form action="{{ path('fos_user_resetting_send_email') }}" method="POST" class="fos_user_resetting_request">
<div class="card-content">
<div class="row">
<p>{{ 'security.resetting.description'|trans({}, "messages") }}</p>
{% for flash_message in app.session.flashbag.get('notice') %}
<span class="black-text"><p>{{ flash_message }}</p></span>
{% endfor %}
{% if invalid_username is defined %}
<p>{{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}</p>
{% endif %}
<div class="input-field col s12">
<label for="username">{{ 'resetting.request.username'|trans }}</label>
<input type="text" id="username" name="username" required="required" />
</div>
</div>
</div>
<div class="card-action center">
<a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">
{{ 'security.login.submit'|trans({}, "messages") }}
</a>
<button class="btn waves-effect waves-light" type="submit" name="send">
{{ 'resetting.request.submit'|trans }}
</button>
</div>
</form>

15
app/Resources/FOSUserBundle/views/Resetting/reset_content.html.twig
View file

@ -1,15 +0,0 @@
{% trans_default_domain 'FOSUserBundle' %}
{{ form_start(form, {'action': path('fos_user_resetting_reset', {'token': token}), 'attr': {'class': 'fos_user_resetting_reset'}}) }}
<div class="card-content">
<div class="row">
{{ form_widget(form) }}
</div>
<div class="card-action center">
<button class="btn waves-effect waves-light" type="submit" name="send">
{{ 'resetting.reset.submit'|trans }}
<i class="material-icons right">send</i>
</button>
</div>
</div>
</form>

48
app/Resources/FOSUserBundle/views/Security/login.html.twig
View file

@ -1,48 +0,0 @@
{% extends "@FOSUser/layout.html.twig" %}
{% block fos_user_content %}
<form action="{{ path('fos_user_security_check') }}" method="post" name="loginform">
<div class="card-content">
{% if error %}
<script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
{% endif %}
{% for flash_message in app.session.flashbag.get('notice') %}
<script>Materialize.toast('{{ flash_message }}')</script>
{% endfor %}
<div class="row">
<div class="input-field col s12">
<label for="username">{{ 'security.login.username'|trans }}</label>
<input type="text" id="username" name="_username" value="{{ last_username }}" autofocus />
</div>
<div class="input-field col s12">
<label for="password">{{ 'security.login.password'|trans }}</label>
<input type="password" id="password" name="_password" />
</div>
<div class="input-field col s12">
<input type="checkbox" id="remember_me" name="_remember_me" checked />
<label for="remember_me">{{ 'security.login.keep_logged_in'|trans }}</label>
</div>
</div>
</div>
<div class="card-action center">
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
{% if registration_enabled %}
<a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
{% endif %}
<button class="btn waves-effect waves-light" type="submit" name="send">
{{ 'security.login.submit'|trans }}
<i class="material-icons right">send</i>
</button>
</div>
<div class="card-action center">
<a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
</div>
</form>
{% endblock fos_user_content %}

28
app/Resources/FOSUserBundle/views/layout.html.twig
View file

@ -1,28 +0,0 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'security.login.page_title'|trans }}{% endblock %}
{% block body_class %}login{% endblock %}
{% block menu %}{% endblock %}
{% block messages %}{% endblock %}
{% block content %}
<main class="valign-wrapper">
<div class="valign row">
<div class="card sw">
<div class="center"><img src="{{ asset('img/logo-wallabag.svg') }}" class="typo-logo" alt="wallabag logo" /></div>
{% block fos_user_content %}
{% endblock fos_user_content %}
</div>
<div class="center">
<a href="{{ path('changeLocale', {'language': 'de'}) }}">Deutsch</a> –
<a href="{{ path('changeLocale', {'language': 'en'}) }}">English</a> –
<a href="{{ path('changeLocale', {'language': 'fr'}) }}">Français</a>
</div>
</div>
</main>
{% endblock %}
{% block footer %}
{% endblock %}

6
app/config/config.yml
View file

@ -179,8 +179,10 @@ fos_user:
confirmation:
enabled: "%fosuser_confirmation%"
from_email:
address: "%from_email%"
sender_name: wallabag
address: "%from_email%"
sender_name: wallabag
service:
mailer: fos_user.mailer.twig_swift
fos_oauth_server:
db_driver: orm

2
app/config/security.yml
View file

@ -34,12 +34,10 @@ security:
provider: fos_userbundle
login_firewall:
logout_on_user_change: true
pattern: ^/login$
anonymous: ~
secured_area:
logout_on_user_change: true
pattern: ^/
form_login:
provider: fos_userbundle