jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor authentication system (#2602)

Browse Source 
Make auth configuration available via UI, remove FOSUserBundle and SAML-Bundle dependency
This commit is contained in:
Kevin Papst
2021-06-10 15:34:13 +02:00
committed by GitHub
parent 286b63e2c8
commit 7f20cb045c
155 changed files with 5590 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/base.html.twig
View File

@@ -16,17 +16,12 @@
{% block page_content_start %}
{% if app.session and app.session.started and app.session.flashbag.peekAll|length > 0 %}
{% set close = adminlte_close_alert|default(true) %}
{% set domain = 'flashmessages' %}
<script type="text/javascript">
document.addEventListener('kimai.initialized', function(options) {
var ALERT = options.detail.kimai.getPlugin('alert');
{% for type, messages in app.session.flashbag.all %}
{% for message in messages %}
{% if type == 'fos_user_success' %}
{% set type = 'success' %}
{% set domain = 'FOSUserBundle' %}
{% endif %}
{% if type == 'error' %}
ALERT.error('{{ message|trans({}, domain) }}');
{% elseif type == 'warning' %}

23
templates/bundles/FOSUserBundle/Registration/confirmed.html.twig
View File

@@ -1,23 +0,0 @@
{% extends '@AdminLTE/FOSUserBundle/Registration/confirmed.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}
{% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
{{ event.content|raw }}
{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
{{ event.content|raw }}
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}

23
templates/bundles/FOSUserBundle/Resetting/request.html.twig
View File

@@ -1,23 +0,0 @@
{% extends '@AdminLTE/FOSUserBundle/Resetting/request.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}
{% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
{{ event.content|raw }}
{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
{{ event.content|raw }}
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}

40
templates/bundles/FOSUserBundle/Resetting/reset.html.twig
View File

@@ -1,40 +0,0 @@
{% extends '@AdminLTE/FOSUserBundle/Resetting/request.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}
{% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
{{ event.content|raw }}
{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
{{ event.content|raw }}
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}
{% block login_form %}
{% trans_default_domain 'FOSUserBundle' %}
{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
{{ form_widget(form) }}
<div class="row">
<div class="col-xs-12">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'resetting.request.submit'|trans }}</button>
</div>
</div>
{{ form_end(form) }}
{% endblock %}

32
templates/bundles/FOSUserBundle/Security/login.html.twig
View File

@@ -1,32 +0,0 @@
{% extends '@AdminLTE/FOSUserBundle/Security/login.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}
{% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
{{ event.content|raw }}
{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
{{ event.content|raw }}
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}
{% block login_social_auth %}
{% if saml.activate %}
<a href="{{ path('saml_login') }}" class="btn btn-block btn-google">
{{ saml.title|trans }}
</a>
<br>
{% endif %}
{% endblock %}

57
templates/security/login.html.twig Normal file
View File

@@ -0,0 +1,57 @@
{% extends '@AdminLTE/FOSUserBundle/Security/login.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
{% block head %}
{{ parent() }}
{% include 'partials/head.html.twig' %}
{% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
{{ event.content|raw }}
{% endblock %}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
{{ event.content|raw }}
{% endblock %}
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}
{% block login_social_auth %}
{% if kimai_config.samlActive %}
{% set class = 'btn-primary' %}
{% if kimai_config.loginFormActive %}
{% set class = 'btn-google' %}
<hr>
{% endif %}
<a href="{{ path('saml_login') }}" class="btn btn-block {{ class }}">
{{ kimai_config.samlTitle|trans }}
</a>
<br>
{% endif %}
{% endblock %}
{% block login_form %}
{% if kimai_config.loginFormActive %}
{{ parent() }}
{% endif %}
{% endblock %}
{% block login_actions %}
{% if kimai_config.passwordResetActive %}
<a href="{{ path('fos_user_resetting_request') }}">
{{ 'I forgot my password'|trans({}, 'AdminLTEBundle') }}
</a>
<br>
{% endif %}
{% if kimai_config.selfRegistrationActive %}
<a href="{{ path('fos_user_registration_register') }}">
{{ 'Register a new account'|trans({}, 'AdminLTEBundle') }}
</a>
{% endif %}
{% endblock %}

11
templates/security/password-reset/check_email.html.twig Normal file
View File

@@ -0,0 +1,11 @@
{% extends 'security/password-reset/layout.html.twig' %}
{% block login_form %}
<p>
{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime})|nl2br }}
</p>
{% endblock %}

4
templates/bundles/FOSUserBundle/layout.html.twig → templates/security/password-reset/layout.html.twig
View File

@@ -1,4 +1,4 @@
{% extends '@AdminLTE/FOSUserBundle/layout.html.twig' %}
{% extends '@AdminLTE/FOSUserBundle/Resetting/request.html.twig' %}
{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
{% block title %}{{- get_title() -}}{% endblock %}
@@ -20,4 +20,4 @@
{{ encore_entry_script_tags('app') }}
{% set event = trigger(constant('App\\Event\\ThemeEvent::JAVASCRIPT')) %}
{{ event.content|raw }}
{% endblock %}
{% endblock %}

1
templates/security/password-reset/request.html.twig Normal file
View File

@@ -0,0 +1 @@
{% extends 'security/password-reset/layout.html.twig' %}

16
templates/security/password-reset/reset.html.twig Normal file
View File

@@ -0,0 +1,16 @@
{% extends 'security/password-reset/layout.html.twig' %}
{% block login_form %}
{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
{{ form_widget(form) }}
<div class="row">
<div class="col-xs-12">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'Reset your password'|trans({}, 'AdminLTEBundle') }}</button>
</div>
</div>
{{ form_end(form) }}
{% endblock %}

9
templates/security/self-registration/check_email.html.twig Normal file
View File

@@ -0,0 +1,9 @@
{% extends 'security/self-registration/layout.html.twig' %}
{% block login_form %}
<p>
{{ 'registration.check_email'|trans({'%email%': user.email}) }}
</p>
{% endblock %}

16
templates/security/self-registration/confirmed.html.twig Normal file
View File

@@ -0,0 +1,16 @@
{% extends 'security/self-registration/layout.html.twig' %}
{% block login_form %}
<p>
{{ 'registration.confirmed'|trans({'%username%': user.username}, 'AdminLTEBundle') }}
</p>
{% endblock %}
{% block login_actions %}
<br>
<a href="{{ path('homepage') }}">
{{ 'Show homepage'|trans({}, 'AdminLTEBundle') }}
</a>
{% endblock %}

0
templates/bundles/FOSUserBundle/Registration/register.html.twig → templates/security/self-registration/layout.html.twig
View File

1
templates/security/self-registration/register.html.twig Normal file
View File

@@ -0,0 +1 @@
{% extends 'security/self-registration/layout.html.twig' %}