Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: jumbojett/openid-connect-php seems unmaintained - we move to j… #183

Merged
merged 1 commit into from
Sep 16, 2021
Merged

chore: jumbojett/openid-connect-php seems unmaintained - we move to j… #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
33 changes: 22 additions & 11 deletions composer.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion lib/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions lib/Controller/LoginFlowController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -111,7 +111,6 @@ public function config(): JSONResponse {
* @UseSession
*
* @throws HintException
* @throws \Jumbojett\OpenIDConnectClientException
* @throws LoginException
*/
public function login(): RedirectResponse {
Expand Down
2 changes: 1 addition & 1 deletion lib/OpenIdConnectAuthModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/SessionVerifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
namespace OCA\OpenIdConnect;

use Jumbojett\OpenIDConnectClientException;
use JuliusPC\OpenIDConnectClientException;
use OC\HintException;
use OCP\ICache;
use OCP\ICacheFactory;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Controller/LoginFlowControllerLoginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Controller/LoginFlowControllerLogoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 1 addition & 11 deletions tests/unit/LoggerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -48,7 +38,7 @@ class LoggerTest extends TestCase {
*/
private $logger;

public function providesMethods() {
public function providesMethods(): array {
return [
['alert'],
['critical'],
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/OpenIdConnectAuthModuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Sabre/OpenIdSabreAuthBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Service/AutoProvisioningServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down