Skip to content
Open
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
6 changes: 6 additions & 0 deletions lib/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use OCA\User_SAML\SAMLSettings;
use OCA\User_SAML\Settings\Admin;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
Expand All @@ -28,6 +29,7 @@ public function __construct(
parent::__construct($appName, $request);
}

#[AuthorizedAdminSetting(Admin::class)]
public function getSamlProviderIds(): DataResponse {
$keys = array_keys($this->samlSettings->getListOfIdps());
return new DataResponse([ 'providerIds' => implode(',', $keys)]);
Expand All @@ -36,6 +38,7 @@ public function getSamlProviderIds(): DataResponse {
/**
* @return array of categories containing entries for each config parameter with their value
*/
#[AuthorizedAdminSetting(Admin::class)]
public function getSamlProviderSettings(int $providerId): array {
/**
* This uses the list of available config parameters from the admin section
Expand Down Expand Up @@ -90,18 +93,21 @@ public function getSamlProviderSettings(int $providerId): array {
return $settings;
}

#[AuthorizedAdminSetting(Admin::class)]
public function deleteSamlProviderSettings($providerId): Response {
$this->samlSettings->delete($providerId);
return new Response();
}

#[AuthorizedAdminSetting(Admin::class)]
public function setProviderSetting(int $providerId, string $configKey, string $configValue): Response {
$configuration = $this->samlSettings->get($providerId);
$configuration[$configKey] = $configValue;
$this->samlSettings->set($providerId, $configuration);
return new Response();
}

#[AuthorizedAdminSetting(Admin::class)]
public function newSamlProviderSettingsId(): DataResponse {
return new DataResponse(['id' => $this->samlSettings->getNewProviderId()]);
}
Expand Down
21 changes: 19 additions & 2 deletions lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
use OCP\Defaults;
use OCP\IConfig;
use OCP\IL10N;
use OCP\Settings\ISettings;
use OCP\Settings\IDelegatedSettings;
use OneLogin\Saml2\Constants;

class Admin implements ISettings {
class Admin implements IDelegatedSettings {

public function __construct(
private readonly IL10N $l10n,
Expand Down Expand Up @@ -254,4 +254,21 @@ public function getSection() {
public function getPriority() {
return 0;
}

#[\Override]
public function getName(): ?string {
return $this->l10n->t('SSO & SAML authentication');
}

#[\Override]
public function getAuthorizedAppConfig(): array {
return [
'user_saml' => [
'type',
'general-require_provisioned_account',
'general-allow_multiple_user_back_ends',
'directLoginName',
],
];
}
}
43 changes: 33 additions & 10 deletions tests/unit/Settings/AdminTest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
Expand All @@ -17,16 +19,11 @@
use PHPUnit\Framework\MockObject\MockObject;

class AdminTest extends \Test\TestCase {
/** @var SAMLSettings|MockObject */
private $settings;
/** @var Admin */
private $admin;
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
private $l10n;
/** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */
private $defaults;
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;
private SAMLSettings&MockObject $settings;
private Admin $admin;
private IL10N&MockObject $l10n;
private Defaults&MockObject $defaults;
private IConfig&MockObject $config;

protected function setUp(): void {
$this->l10n = $this->createMock(IL10N::class);
Expand Down Expand Up @@ -289,4 +286,30 @@ public function testGetSection() {
public function testGetPriority() {
$this->assertSame(0, $this->admin->getPriority());
}

public function testGetName(): void {
$this->l10n->expects($this->once())
->method('t')
->with('SSO & SAML authentication')
->willReturn('SSO & SAML authentication');

$this->assertSame('SSO & SAML authentication', $this->admin->getName());
}

public function testGetAuthorizedAppConfig(): void {
$config = $this->admin->getAuthorizedAppConfig();

$this->assertArrayHasKey('user_saml', $config);

$keys = $config['user_saml'];
$this->assertContains('type', $keys);
$this->assertContains('general-require_provisioned_account', $keys);
$this->assertContains('general-allow_multiple_user_back_ends', $keys);
$this->assertContains('directLoginName', $keys);
}

public function testImplementsIDelegatedSettings(): void {
$this->assertInstanceOf(\OCP\Settings\IDelegatedSettings::class, $this->admin);
$this->assertInstanceOf(\OCP\Settings\ISettings::class, $this->admin);
}
}
Loading