Merge branch 'master' into permission_rework

config/bundles.php

@@ -23,6 +23,8 @@ return [
     Florianv\SwapBundle\FlorianvSwapBundle::class => ['all' => true],
     Nelmio\SecurityBundle\NelmioSecurityBundle::class => ['all' => true],
     Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
+    Jbtronics\TFAWebauthn\TFAWebauthnBundle::class => ['all' => true],
     Scheb\TwoFactorBundle\SchebTwoFactorBundle::class => ['all' => true],
-    R\U2FTwoFactorBundle\RU2FTwoFactorBundle::class => ['all' => true],
+    SpomkyLabs\CborBundle\SpomkyLabsCborBundle::class => ['all' => true],
+    Webauthn\Bundle\WebauthnBundle::class => ['all' => true],
 ];

config/packages/r_u2f_two_factor.yaml

@@ -1,4 +0,0 @@
-ru2_f_two_factor:
-  formTemplate: "/security/U2F/u2f_login.html.twig"
-  registerTemplate: "/security/U2F/u2f_register.html.twig"
-  authCodeParameter: _auth_code

config/packages/scheb_2fa.yaml

@@ -25,4 +25,4 @@ scheb_two_factor:
         # If you're using guard-based authentication, you have to use this one:
         # - Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken
         # If you're using authenticator-based security (introduced in Symfony 5.1), you have to use this one:
-        # - Symfony\Component\Security\Http\Authenticator\Token\PostAuthenticationToken
+        # - Symfony\Component\Security\Http\Authenticator\Token\PostAuthenticationToken

config/packages/twig.yaml

@@ -16,6 +16,7 @@ twig:
         error_page_admin_email: '%partdb.error_pages.admin_email%'
         error_page_show_help: '%partdb.error_pages.show_help%'
         sidebar_items: '%partdb.sidebar.items%'
+        sidebar_tree_updater: '@App\Services\Trees\SidebarTreeUpdater'
 
 when@test:
     twig:

config/packages/webauthn_2fa.yaml

@@ -0,0 +1,5 @@
+tfa_webauthn:
+  enabled: true
+  template: security/Webauthn/webauthn_login.html.twig
+
+  rpName: '%partdb.title%'

config/routes/scheb_2fa.yaml

@@ -4,8 +4,4 @@
         _controller: "scheb_two_factor.form_controller::form"
 
 2fa_login_check:
-    path: /{_locale}/2fa_check
-
-r_u2f_register:
-    resource: "@RU2FTwoFactorBundle/Resources/config/routing.yml"
-    prefix: /{_locale}/user
+    path: /{_locale}/2fa_check