Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
Expand Down Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 4 additions & 14 deletions src/lib/ConfigResolver/ConfigurableRegistrationGroupLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
);
});
}
}
Loading