diff --git a/src/bundle/DependencyInjection/Configuration/Parser/UserRegistration.php b/src/bundle/DependencyInjection/Configuration/Parser/UserRegistration.php index 6b085bf8..67457136 100644 --- a/src/bundle/DependencyInjection/Configuration/Parser/UserRegistration.php +++ b/src/bundle/DependencyInjection/Configuration/Parser/UserRegistration.php @@ -29,14 +29,9 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder) ->info('Content type identifier used for registration.') ->defaultValue('user') ->end() - ->scalarNode('group_id') - ->info('Content id of the user group where users who register are created.') - ->defaultValue(11) - ->setDeprecated('ibexa/user', '4.6', 'The child node "%node%" at path "%path%" is deprecated, use group_remote_id instead.') - ->end() ->scalarNode('group_remote_id') - ->info('Content remote id of the user group where users who register are created - takes precedence over group_id if set.') - ->defaultNull() + ->info('Content remote id of the user group where users who register are created.') + ->defaultValue('5f7f0bdb3381d6a461d8c29ff53d908f') ->end() ->arrayNode('templates') ->info('User registration templates.') @@ -78,14 +73,6 @@ public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerIn ); } - if (!empty($settings['group_id'])) { - $contextualizer->setContextualParameter( - 'user_registration.group_id', - $currentScope, - $settings['group_id'] - ); - } - if (!empty($settings['group_remote_id'])) { $contextualizer->setContextualParameter( 'user_registration.group_remote_id', diff --git a/src/bundle/Resources/config/ibexa_core_default_settings.yaml b/src/bundle/Resources/config/ibexa_core_default_settings.yaml index 89bb7121..6abf7649 100644 --- a/src/bundle/Resources/config/ibexa_core_default_settings.yaml +++ b/src/bundle/Resources/config/ibexa_core_default_settings.yaml @@ -12,7 +12,7 @@ parameters: ibexa.site_access.config.default.user_reset_password.templates.success: "@@IbexaUser/reset_password/success.html.twig" # Registration - ibexa.site_access.config.default.user_registration.group_id: 11 + ibexa.site_access.config.default.user_registration.group_remote_id: '5f7f0bdb3381d6a461d8c29ff53d908f' ibexa.site_access.config.default.user_registration.user_type_identifier: 'user' ibexa.site_access.config.default.user_registration.templates.form: "@@IbexaContentForms/Content/content_edit.html.twig" ibexa.site_access.config.default.user_registration.templates.confirmation: "@@IbexaUser/register/register_confirmation.html.twig" diff --git a/src/lib/ConfigResolver/ConfigurableRegistrationGroupLoader.php b/src/lib/ConfigResolver/ConfigurableRegistrationGroupLoader.php index c2511ca8..dd38632d 100644 --- a/src/lib/ConfigResolver/ConfigurableRegistrationGroupLoader.php +++ b/src/lib/ConfigResolver/ConfigurableRegistrationGroupLoader.php @@ -31,22 +31,12 @@ public function __construct(ConfigResolverInterface $configResolver, Repository public function loadGroup() { - if ($this->configResolver->hasParameter('user_registration.group_remote_id')) { - return $this->repository->sudo(function (Repository $repository): UserGroup { - return $repository - ->getUserService() - ->loadUserGroupByRemoteId( - $this->configResolver->getParameter('user_registration.group_remote_id') - ); - }); - } - return $this->repository->sudo(function (Repository $repository): UserGroup { return $repository - ->getUserService() - ->loadUserGroup( - $this->configResolver->getParameter('user_registration.group_id') - ); + ->getUserService() + ->loadUserGroupByRemoteId( + $this->configResolver->getParameter('user_registration.group_remote_id') + ); }); } }