diff --git a/composer.json b/composer.json index 1656b71..fdef1c1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "OpenId Connect app for ownCloud", "require": { "php": ">=7.3", - "jumbojett/openid-connect-php": "^0.9.0" + "juliuspc/openid-connect-php": "^1.1" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4" diff --git a/composer.lock b/composer.lock index c9888a2..e75b9c8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8ea8858b50817c7eb6850162a6a0ed67", + "content-hash": "3296d0acc53e32420e8c631d8f987d91", "packages": [ { - "name": "jumbojett/openid-connect-php", - "version": "v0.9.2", + "name": "juliuspc/openid-connect-php", + "version": "v1.1.2", "source": { "type": "git", - "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git", - "reference": "4f95102af87f86c43e8191ec6e90d9f35ed1ce5f" + "url": "https://github.com/JuliusPC/OpenID-Connect-PHP.git", + "reference": "e28ab778c8aac17e9f4bb1cb4afdafb66b58a014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/4f95102af87f86c43e8191ec6e90d9f35ed1ce5f", - "reference": "4f95102af87f86c43e8191ec6e90d9f35ed1ce5f", + "url": "https://api.github.com/repos/JuliusPC/OpenID-Connect-PHP/zipball/e28ab778c8aac17e9f4bb1cb4afdafb66b58a014", + "reference": "e28ab778c8aac17e9f4bb1cb4afdafb66b58a014", "shasum": "" }, "require": { @@ -41,12 +41,23 @@ "license": [ "Apache-2.0" ], - "description": "Bare-bones OpenID Connect client", + "description": "OpenID Connect client", + "keywords": [ + "OpenID Connect", + "RFC7009", + "RFC7662", + "SSO", + "client", + "oauth 2", + "oidc", + "rfc6749", + "rfc7636" + ], "support": { - "issues": "https://github.com/jumbojett/OpenID-Connect-PHP/issues", - "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v0.9.2" + "issues": "https://github.com/JuliusPC/OpenID-Connect-PHP/issues", + "source": "https://github.com/JuliusPC/OpenID-Connect-PHP/tree/v1.1.2" }, - "time": "2020-11-16T14:48:22+00:00" + "time": "2021-05-16T19:41:13+00:00" }, { "name": "paragonie/random_compat", diff --git a/lib/Application.php b/lib/Application.php index bb6cc80..29456d1 100644 --- a/lib/Application.php +++ b/lib/Application.php @@ -23,7 +23,7 @@ require_once __DIR__ . '/../vendor/autoload.php'; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC; use OC\HintException; use OCP\AppFramework\App; diff --git a/lib/Client.php b/lib/Client.php index 854310b..0b3b776 100644 --- a/lib/Client.php +++ b/lib/Client.php @@ -21,8 +21,8 @@ */ namespace OCA\OpenIdConnect; -use Jumbojett\OpenIDConnectClient; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClient; +use JuliusPC\OpenIDConnectClientException; use OCP\IConfig; use OCP\ISession; use OCP\IURLGenerator; diff --git a/lib/Controller/LoginFlowController.php b/lib/Controller/LoginFlowController.php index ec3a277..7700bdb 100644 --- a/lib/Controller/LoginFlowController.php +++ b/lib/Controller/LoginFlowController.php @@ -21,7 +21,7 @@ */ namespace OCA\OpenIdConnect\Controller; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC\HintException; use OC\User\LoginException; use OC\User\Session; @@ -111,7 +111,6 @@ public function config(): JSONResponse { * @UseSession * * @throws HintException - * @throws \Jumbojett\OpenIDConnectClientException * @throws LoginException */ public function login(): RedirectResponse { diff --git a/lib/OpenIdConnectAuthModule.php b/lib/OpenIdConnectAuthModule.php index 94d5289..44158f9 100644 --- a/lib/OpenIdConnectAuthModule.php +++ b/lib/OpenIdConnectAuthModule.php @@ -21,7 +21,7 @@ */ namespace OCA\OpenIdConnect; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC\User\LoginException; use OCA\OpenIdConnect\Service\UserLookupService; use OCP\Authentication\IAuthModule; diff --git a/lib/SessionVerifier.php b/lib/SessionVerifier.php index fece30d..340ac5c 100644 --- a/lib/SessionVerifier.php +++ b/lib/SessionVerifier.php @@ -21,7 +21,7 @@ */ namespace OCA\OpenIdConnect; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC\HintException; use OCP\ICache; use OCP\ICacheFactory; diff --git a/tests/unit/Controller/LoginFlowControllerLoginTest.php b/tests/unit/Controller/LoginFlowControllerLoginTest.php index f0d0b41..d1608bc 100644 --- a/tests/unit/Controller/LoginFlowControllerLoginTest.php +++ b/tests/unit/Controller/LoginFlowControllerLoginTest.php @@ -22,7 +22,7 @@ namespace OCA\OpenIdConnect\Tests\Unit\Controller; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC\HintException; use OC\User\LoginException; use OC\User\Session; diff --git a/tests/unit/Controller/LoginFlowControllerLogoutTest.php b/tests/unit/Controller/LoginFlowControllerLogoutTest.php index 3472853..df9a10f 100644 --- a/tests/unit/Controller/LoginFlowControllerLogoutTest.php +++ b/tests/unit/Controller/LoginFlowControllerLogoutTest.php @@ -92,7 +92,7 @@ protected function setUp(): void { ); } - public function testLogouNotConfigured(): void { + public function testLogoutNotConfigured(): void { $this->logger->expects(self::once())->method('warning')->with('OpenID::logout: OpenID is not properly configured'); $this->controller->logout(); diff --git a/tests/unit/LoggerTest.php b/tests/unit/LoggerTest.php index 018834b..2229b69 100644 --- a/tests/unit/LoggerTest.php +++ b/tests/unit/LoggerTest.php @@ -22,18 +22,8 @@ namespace OCA\OpenIdConnect\Tests\Unit; -use Jumbojett\OpenIDConnectClientException; -use OC\HintException; -use OC\Memcache\ArrayCache; -use OCA\OpenIdConnect\Client; use OCA\OpenIdConnect\Logger; -use OCA\OpenIdConnect\OpenIdConnectAuthModule; -use OCA\OpenIdConnect\Service\UserLookupService; -use OCP\ICacheFactory; use OCP\ILogger; -use OCP\IRequest; -use OCP\IUser; -use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; @@ -48,7 +38,7 @@ class LoggerTest extends TestCase { */ private $logger; - public function providesMethods() { + public function providesMethods(): array { return [ ['alert'], ['critical'], diff --git a/tests/unit/OpenIdConnectAuthModuleTest.php b/tests/unit/OpenIdConnectAuthModuleTest.php index 3e1a607..50db814 100644 --- a/tests/unit/OpenIdConnectAuthModuleTest.php +++ b/tests/unit/OpenIdConnectAuthModuleTest.php @@ -22,7 +22,7 @@ namespace OCA\OpenIdConnect\Tests\Unit; -use Jumbojett\OpenIDConnectClientException; +use JuliusPC\OpenIDConnectClientException; use OC\Memcache\ArrayCache; use OC\User\LoginException; use OCA\OpenIdConnect\Client; diff --git a/tests/unit/Sabre/OpenIdSabreAuthBackendTest.php b/tests/unit/Sabre/OpenIdSabreAuthBackendTest.php index cd2eaa2..afa53ea 100644 --- a/tests/unit/Sabre/OpenIdSabreAuthBackendTest.php +++ b/tests/unit/Sabre/OpenIdSabreAuthBackendTest.php @@ -22,7 +22,6 @@ namespace OCA\OpenIdConnect\Tests\Unit\Sabre; -use OC\HintException; use OC\User\LoginException; use OC\User\Session; use OCA\OpenIdConnect\OpenIdConnectAuthModule; diff --git a/tests/unit/Service/AutoProvisioningServiceTest.php b/tests/unit/Service/AutoProvisioningServiceTest.php index 73187f2..f2f8674 100644 --- a/tests/unit/Service/AutoProvisioningServiceTest.php +++ b/tests/unit/Service/AutoProvisioningServiceTest.php @@ -22,7 +22,6 @@ namespace OCA\OpenIdConnect\Tests\Unit\Service; -use OC\Avatar; use OC\User\LoginException; use OCA\OpenIdConnect\Service\AutoProvisioningService; use OCP\Http\Client\IClient;