mirror of
https://github.com/netzbegruenung/user_saml.git
synced 2024-05-11 21:26:05 +02:00
we only allow multiple user back ends in combination with SAML, not with environment variables
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
1eccb28948
commit
b6b576852a
|
@ -88,11 +88,6 @@ class Admin implements ISettings {
|
||||||
'lowercaseUrlencoding' => $this->l10n->t('ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification.'),
|
'lowercaseUrlencoding' => $this->l10n->t('ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification.'),
|
||||||
];
|
];
|
||||||
$generalSettings = [
|
$generalSettings = [
|
||||||
'idp0_display_name' => [
|
|
||||||
'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
|
|
||||||
'type' => 'line',
|
|
||||||
'required' => false,
|
|
||||||
],
|
|
||||||
'uid_mapping' => [
|
'uid_mapping' => [
|
||||||
'text' => $this->l10n->t('Attribute to map the UID to.'),
|
'text' => $this->l10n->t('Attribute to map the UID to.'),
|
||||||
'type' => 'line',
|
'type' => 'line',
|
||||||
|
@ -102,13 +97,7 @@ class Admin implements ISettings {
|
||||||
'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend. (e.g. LDAP)'),
|
'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend. (e.g. LDAP)'),
|
||||||
'type' => 'checkbox',
|
'type' => 'checkbox',
|
||||||
'global' => true,
|
'global' => true,
|
||||||
],
|
]
|
||||||
'allow_multiple_user_back_ends' => [
|
|
||||||
'text' => $this->l10n->t('Allow the use of multiple user back-ends (e.g. LDAP)'),
|
|
||||||
'type' => 'checkbox',
|
|
||||||
'hideForEnv' => true,
|
|
||||||
'global' => true,
|
|
||||||
],
|
|
||||||
];
|
];
|
||||||
$attributeMappingSettings = [
|
$attributeMappingSettings = [
|
||||||
'displayName_mapping' => [
|
'displayName_mapping' => [
|
||||||
|
@ -140,6 +129,17 @@ class Admin implements ISettings {
|
||||||
'type' => 'checkbox',
|
'type' => 'checkbox',
|
||||||
'global' => true,
|
'global' => true,
|
||||||
];
|
];
|
||||||
|
$generalSettings['idp0_display_name'] = [
|
||||||
|
'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
|
||||||
|
'type' => 'line',
|
||||||
|
'required' => false,
|
||||||
|
];
|
||||||
|
$generalSettings['allow_multiple_user_back_ends'] = [
|
||||||
|
'text' => $this->l10n->t('Allow the use of multiple user back-ends (e.g. LDAP)'),
|
||||||
|
'type' => 'checkbox',
|
||||||
|
'hideForEnv' => true,
|
||||||
|
'global' => true,
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
$params = [
|
$params = [
|
||||||
|
|
|
@ -169,6 +169,8 @@ class AdminTest extends \Test\TestCase {
|
||||||
|
|
||||||
$params = $this->formDataProvider();
|
$params = $this->formDataProvider();
|
||||||
unset($params['general']['use_saml_auth_for_desktop']);
|
unset($params['general']['use_saml_auth_for_desktop']);
|
||||||
|
unset($params['general']['idp0_display_name']);
|
||||||
|
unset($params['general']['allow_multiple_user_back_ends']);
|
||||||
$params['type'] = '';
|
$params['type'] = '';
|
||||||
|
|
||||||
$expected = new TemplateResponse('user_saml', 'admin', $params);
|
$expected = new TemplateResponse('user_saml', 'admin', $params);
|
||||||
|
|
Loading…
Reference in a new issue