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
56 changes: 30 additions & 26 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions lib/Command/DeleteProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
use Exception;
use OC\Core\Command\Base;
use OCA\UserOIDC\Db\ProviderMapper;

use OCA\UserOIDC\Service\ProviderService;
use OCP\AppFramework\Db\DoesNotExistException;

use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand Down
1 change: 0 additions & 1 deletion lib/Controller/Id4meController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
use OCP\IUserSession;
use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;

use OCP\Util;
use Psr\Log\LoggerInterface;

Expand Down
1 change: 0 additions & 1 deletion lib/Controller/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ public function login(int $providerId, ?string $redirectUrl = null) {
$data['code_challenge_method'] = 'S256';
}


$authorizationUrl = $this->discoveryService->buildAuthorizationUrl($discovery['authorization_endpoint'], $data);

$this->logger->debug('Redirecting user to: ' . $authorizationUrl);
Expand Down
1 change: 0 additions & 1 deletion lib/Db/SessionMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\Exception;
use OCP\DB\QueryBuilder\IQueryBuilder;

use OCP\IDBConnection;
use OCP\Security\ICrypto;

Expand Down
1 change: 0 additions & 1 deletion lib/Event/AttributeMappedEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


namespace OCA\UserOIDC\Event;

use OCP\EventDispatcher\Event;
Expand Down
1 change: 0 additions & 1 deletion lib/Helper/HttpClientHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

use OCA\UserOIDC\Vendor\Id4me\RP\HttpClient;
use OCP\Http\Client\IClientService;

use OCP\IConfig;

class HttpClientHelper implements HttpClient {
Expand Down
1 change: 0 additions & 1 deletion lib/Service/ProviderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


namespace OCA\UserOIDC\Service;

use OCA\UserOIDC\AppInfo\Application;
Expand Down
1 change: 0 additions & 1 deletion lib/Service/ProvisioningService.php
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,6 @@ public function provisionUserGroups(IUser $user, int $providerId, object $idToke
return $syncGroups;
}


public function getGroupWhitelistRegex(int $providerId): string {
$regex = $this->providerService->getSetting($providerId, ProviderService::SETTING_GROUP_WHITELIST_REGEX, '');

Expand Down
1 change: 0 additions & 1 deletion lib/Service/SettingsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


namespace OCA\UserOIDC\Service;

use OCA\UserOIDC\AppInfo\Application;
Expand Down
1 change: 0 additions & 1 deletion tests/integration/Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ private function cleanupUser(string $userId): void {
}
}


public function testAlternativeLogins() {
$alternativeLogins = OC_App::getAlternativeLogIns();
self::assertCount(1, $alternativeLogins);
Expand Down
1 change: 1 addition & 0 deletions tests/stubs/ocp_imapperexception.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

// IMapperException didn't extend Throwable until 27
// so we need this to test against stable25 and stable26

namespace OCP\AppFramework\Db {
interface IMapperException extends \Throwable {
}
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/Db/UserMapperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


use OCA\UserOIDC\Db\UserMapper;
use OCA\UserOIDC\Service\LocalIdService;
use OCP\AppFramework\Db\DoesNotExistException;
Expand Down Expand Up @@ -44,7 +43,6 @@ public function setUp(): void {
->getMock();
}


public static function dataCreate(): array {
return [
// unique uid
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Service/DiscoveryServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


use OCA\UserOIDC\Helper\HttpClientHelper;
use OCA\UserOIDC\Service\DiscoveryService;
use OCA\UserOIDC\Service\ProviderService;
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Service/ProviderServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

declare(strict_types=1);


use OCA\UserOIDC\AppInfo\Application;
use OCA\UserOIDC\Db\ProviderMapper;
use OCA\UserOIDC\Service\ProviderService;
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Service/ProvisioningServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ public function testProvisionUserInvalidProperties(): void {
->with('twitter')
->willReturn($property);


$this->accountManager->expects(self::once())
->method('getAccount')
->with($user)
Expand Down
Loading