NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-05-03 01:24:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #613 from KoffeinKaio/fix-checkboxes

Browse source 
Fix displaying of global checkboxes in user_saml settings
This commit is contained in:
blizzz 2022-05-24 13:55:33 +02:00 committed by GitHub
parent 8fdb09403f 68f9c58314
commit 323c27df0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Settings/Admin.php
View file

@ -186,10 +186,17 @@ class Admin implements ISettings {
$type = $this->config->getAppValue('user_saml', 'type');
if ($type === 'saml') {
$generalSettings['require_provisioned_account'] = [
'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend (e.g. LDAP).', [$this->defaults->getName()]),
'type' => 'checkbox',
'global' => true,
'value' => $this->config->getAppValue('user_saml', 'general-require_provisioned_account', 0)
];
$generalSettings['use_saml_auth_for_desktop'] = [
'text' => $this->l10n->t('Use SAML auth for the %s desktop clients (requires user re-authentication)', [$this->defaults->getName()]),
'type' => 'checkbox',
'global' => true,
'value' => $this->config->getAppValue('user_saml', 'general-use_saml_auth_for_desktop', 0)
];
$generalSettings['idp0_display_name'] = [
'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
@ -201,6 +208,7 @@ class Admin implements ISettings {
'type' => 'checkbox',
'hideForEnv' => true,
'global' => true,
'value' => $this->config->getAppValue('user_saml', 'general-allow_multiple_user_back_ends')
];
}

4
templates/admin.php
View file

@ -55,12 +55,12 @@ style('user_saml', 'admin');
<?php foreach ($_['general'] as $key => $attribute): ?>
<?php if ($attribute['type'] === 'checkbox' && $attribute['global']): ?>
<p>
<input type="checkbox" data-key="<?php p($key)?>" id="user-saml-general-<?php p($key)?>" name="<?php p($key)?>" value="<?php p($_['config']['general-'.$key] ?? '0') ?>">
<input type="checkbox" data-key="<?php p($key)?>" id="user-saml-general-<?php p($key)?>" name="<?php p($key)?>" value="<?php p($attribute['value'] ?? '0') ?>">
<label for="user-saml-general-<?php p($key)?>"><?php p($attribute['text']) ?></label><br/>
</p>
<?php elseif ($attribute['type'] === 'line' && isset($attribute['global'])): ?>
<p>
<input data-key="<?php p($key)?>" name="<?php p($key) ?>" value="<?php p($_['config']['general-'.$key] ?? '') ?>" type="text" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?> placeholder="<?php p($attribute['text']) ?>"/>
<input data-key="<?php p($key)?>" name="<?php p($key) ?>" value="<?php p($attribute['value'] ?? '') ?>" type="text" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?> placeholder="<?php p($attribute['text']) ?>"/>
</p>
<?php endif; ?>
<?php endforeach; ?>

16
tests/unit/Settings/AdminTest.php
View file

@ -237,17 +237,25 @@ class AdminTest extends \Test\TestCase {
2 => 'Provider 2',
]);
$this->config
->expects($this->once())
->expects($this->exactly(4)) # mode + three global values
->method('getAppValue')
->with('user_saml', 'type')
->willReturn('saml');
->withConsecutive(
['user_saml', 'type'],
['user_saml', 'general-require_provisioned_account'],
['user_saml', 'general-use_saml_auth_for_desktop'],
['user_saml', 'general-allow_multiple_user_back_ends'],
)
->willReturnOnConsecutiveCalls('saml', 0, 0, '');
$this->defaults
->expects($this->once())
->expects($this->any())
->method('getName')
->willReturn('Nextcloud');
$params = $this->formDataProvider();
$params['type'] = 'saml';
$params['general']['require_provisioned_account']['value'] = 0;
$params['general']['use_saml_auth_for_desktop']['value'] = 0;
$params['general']['allow_multiple_user_back_ends']['value'] = '';
$expected = new TemplateResponse('user_saml', 'admin', $params);
$this->assertEquals($expected, $this->admin->getForm());