From 4cf5a2fcf70808e7b8563986b50fbcc3991b6e98 Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:07:16 +0530 Subject: [PATCH 01/21] Update provides.json --- provides.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/provides.json b/provides.json index 565ce539..4cada878 100644 --- a/provides.json +++ b/provides.json @@ -1,15 +1,15 @@ { "providers": [ - "LucaDegasperi\\OAuth2Server\\OAuth2ServerServiceProvider" + "Tikamsah\\OAuth2Server\\OAuth2ServerServiceProvider" ], "aliases": [ { "alias": "AuthorizationServer", - "facade": "LucaDegasperi\\OAuth2Server\\Facades\\AuthorizationServerFacade" + "facade": "Tikamsah\\OAuth2Server\\Facades\\AuthorizationServerFacade" }, { "alias": "ResourceServer", - "facade": "LucaDegasperi\\OAuth2Server\\Facades\\ResourceServerFacade" + "facade": "Tikamsah\\OAuth2Server\\Facades\\ResourceServerFacade" } ] -} \ No newline at end of file +} From b6124b739be41c3e8640b3a60c21f5f741e62b92 Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:08:29 +0530 Subject: [PATCH 02/21] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index bfcc7db4..f7ee49b5 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "lucadegasperi/oauth2-server-laravel", + "name": "tikamsah/oauth2-server-laravel", "description": "A Laravel 4 wrapper for the popular OAuth 2.0 Server package league/oauth2-server", "keywords": [ "laravel", @@ -11,7 +11,7 @@ "authors": [ { "name": "Luca Degasperi", - "email": "packages@lucadegasperi.com" + "email": "packages@tikamsah.com" } ], "require": { @@ -30,9 +30,9 @@ "tests/TestCase.php" ], "psr-0": { - "LucaDegasperi\\OAuth2Server": "src/" + "Tikamsah\\OAuth2Server": "src/" } }, "minimum-stability": "dev", "license": "MIT" -} \ No newline at end of file +} From 4cd63249ed4425ae6ee2219cf08c0721be6d9c7b Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:09:11 +0530 Subject: [PATCH 03/21] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f7ee49b5..05330034 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=8.1", "league/oauth2-server": "2.1.x" }, "require-dev": { From 2eff8ae87d358f5f5bca66b1670b47e807ec127d Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:10:07 +0530 Subject: [PATCH 04/21] Update TestCase.php --- tests/TestCase.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 999c280b..35bf95a5 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -4,15 +4,15 @@ class TestCase extends Orchestra\Testbench\TestCase { protected function getPackageProviders() { - return array('LucaDegasperi\OAuth2Server\OAuth2ServerServiceProvider'); + return array('Tikamsah\OAuth2Server\OAuth2ServerServiceProvider'); } protected function getPackageAliases() { return array( - 'AuthorizationServer' => 'LucaDegasperi\OAuth2Server\Facades\AuthorizationServerFacade', - 'ResourceServer' => 'LucaDegasperi\OAuth2Server\Facades\ResourceServerFacade', + 'AuthorizationServer' => 'Tikamsah\OAuth2Server\Facades\AuthorizationServerFacade', + 'ResourceServer' => 'Tikamsah\OAuth2Server\Facades\ResourceServerFacade', ); } -} \ No newline at end of file +} From f7921b7fb4bf4e7637a5c7876a07d12c4c11a171 Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:10:31 +0530 Subject: [PATCH 05/21] Update OAuthOwnerFilterTest.php --- tests/OAuthOwnerFilterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/OAuthOwnerFilterTest.php b/tests/OAuthOwnerFilterTest.php index c88c21de..5aae959e 100644 --- a/tests/OAuthOwnerFilterTest.php +++ b/tests/OAuthOwnerFilterTest.php @@ -6,7 +6,7 @@ class OAuthOwnerFilterTest extends TestCase { public function getFilter() { - return new LucaDegasperi\OAuth2Server\Filters\OAuthOwnerFilter; + return new Tikamsah\OAuth2Server\Filters\OAuthOwnerFilter; } public function test_with_existing_owner_type() @@ -30,4 +30,4 @@ public function tearDown() { m::close(); } -} \ No newline at end of file +} From 297cb6a1679662b41a7862530c82f04803827cfc Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:10:56 +0530 Subject: [PATCH 06/21] Update OAuthFilterTest.php --- tests/OAuthFilterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/OAuthFilterTest.php b/tests/OAuthFilterTest.php index eb8c7958..10b6022d 100644 --- a/tests/OAuthFilterTest.php +++ b/tests/OAuthFilterTest.php @@ -6,7 +6,7 @@ class OAuthFilterTest extends TestCase { public function getFilter() { - return new LucaDegasperi\OAuth2Server\Filters\OAuthFilter; + return new Tikamsah\OAuth2Server\Filters\OAuthFilter; } public function test_valid_filter_with_no_scope() @@ -53,4 +53,4 @@ public function tearDown() { m::close(); } -} \ No newline at end of file +} From afdab944e434ebd5da256d457227cf8e55f8fffa Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:11:23 +0530 Subject: [PATCH 07/21] Update ExpiredTokensCommandTest.php --- tests/ExpiredTokensCommandTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ExpiredTokensCommandTest.php b/tests/ExpiredTokensCommandTest.php index 8afa7945..829c208e 100644 --- a/tests/ExpiredTokensCommandTest.php +++ b/tests/ExpiredTokensCommandTest.php @@ -1,14 +1,14 @@ Date: Fri, 18 Aug 2023 13:12:14 +0530 Subject: [PATCH 08/21] Update CheckAuthorizationParamsFilterTest.php --- tests/CheckAuthorizationParamsFilterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CheckAuthorizationParamsFilterTest.php b/tests/CheckAuthorizationParamsFilterTest.php index 12cf5e90..2830c91a 100644 --- a/tests/CheckAuthorizationParamsFilterTest.php +++ b/tests/CheckAuthorizationParamsFilterTest.php @@ -6,7 +6,7 @@ class CheckAuthorizationParamsFilterTest extends TestCase { public function getFilter() { - return new LucaDegasperi\OAuth2Server\Filters\CheckAuthorizationParamsFilter; + return new Tikamsah\OAuth2Server\Filters\CheckAuthorizationParamsFilter; } public function getStub() @@ -66,4 +66,4 @@ public function tearDown() { m::close(); } -} \ No newline at end of file +} From d6d220c1efb9478415e1862194cd383cb9d9f86c Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:12:43 +0530 Subject: [PATCH 09/21] Update AuthorizationServerProxyTest.php --- tests/AuthorizationServerProxyTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/AuthorizationServerProxyTest.php b/tests/AuthorizationServerProxyTest.php index 241e38ea..29980fa7 100644 --- a/tests/AuthorizationServerProxyTest.php +++ b/tests/AuthorizationServerProxyTest.php @@ -1,7 +1,7 @@ Date: Fri, 18 Aug 2023 13:19:09 +0530 Subject: [PATCH 10/21] Update OAuth2ServerServiceProvider.php --- .../OAuth2ServerServiceProvider.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/LucaDegasperi/OAuth2Server/OAuth2ServerServiceProvider.php b/src/LucaDegasperi/OAuth2Server/OAuth2ServerServiceProvider.php index 09db6f5f..97aee40e 100644 --- a/src/LucaDegasperi/OAuth2Server/OAuth2ServerServiceProvider.php +++ b/src/LucaDegasperi/OAuth2Server/OAuth2ServerServiceProvider.php @@ -1,7 +1,7 @@ -package('lucadegasperi/oauth2-server-laravel', 'lucadegasperi/oauth2-server-laravel'); + $this->package('tikamsah/oauth2-server-laravel', 'tikamsah/oauth2-server-laravel'); /** @var \Illuminate\Routing\Router $router */ $router = $this->app['router']; // Bind a filter to check if the auth code grant type params are provided - $router->filter('check-authorization-params', 'LucaDegasperi\OAuth2Server\Filters\CheckAuthorizationParamsFilter'); + $router->filter('check-authorization-params', 'Tikamsah\OAuth2Server\Filters\CheckAuthorizationParamsFilter'); // Bind a filter to make sure that an endpoint is accessible only by authorized members eventually with specific scopes - $router->filter('oauth', 'LucaDegasperi\OAuth2Server\Filters\OAuthFilter'); + $router->filter('oauth', 'Tikamsah\OAuth2Server\Filters\OAuthFilter'); // Bind a filter to make sure that an endpoint is accessible only by a specific owner - $router->filter('oauth-owner', 'LucaDegasperi\OAuth2Server\Filters\OAuthOwnerFilter'); + $router->filter('oauth-owner', 'Tikamsah\OAuth2Server\Filters\OAuthOwnerFilter'); } /** @@ -45,16 +45,16 @@ public function register() // let's bind the interfaces to the implementations $app = $this->app; - $app->bind('League\OAuth2\Server\Storage\ClientInterface', 'LucaDegasperi\OAuth2Server\Repositories\FluentClient'); - $app->bind('League\OAuth2\Server\Storage\ScopeInterface', 'LucaDegasperi\OAuth2Server\Repositories\FluentScope'); - $app->bind('League\OAuth2\Server\Storage\SessionInterface', 'LucaDegasperi\OAuth2Server\Repositories\FluentSession'); - $app->bind('LucaDegasperi\OAuth2Server\Repositories\SessionManagementInterface', 'LucaDegasperi\OAuth2Server\Repositories\FluentSession'); + $app->bind('League\OAuth2\Server\Storage\ClientInterface', 'Tikamsah\OAuth2Server\Repositories\FluentClient'); + $app->bind('League\OAuth2\Server\Storage\ScopeInterface', 'Tikamsah\OAuth2Server\Repositories\FluentScope'); + $app->bind('League\OAuth2\Server\Storage\SessionInterface', 'Tikamsah\OAuth2Server\Repositories\FluentSession'); + $app->bind('Tikamsah\OAuth2Server\Repositories\SessionManagementInterface', 'Tikamsah\OAuth2Server\Repositories\FluentSession'); $app['oauth2.authorization-server'] = $app->share(function ($app) { $server = $app->make('League\OAuth2\Server\Authorization'); - $config = $app['config']->get('lucadegasperi/oauth2-server-laravel::oauth2'); + $config = $app['config']->get('tikamsah/oauth2-server-laravel::oauth2'); // add the supported grant types to the authorization server foreach ($config['grant_types'] as $grantKey => $grantValue) { @@ -99,7 +99,7 @@ public function register() }); $app['oauth2.expired-tokens-command'] = $app->share(function ($app) { - return $app->make('LucaDegasperi\OAuth2Server\Commands\ExpiredTokensCommand'); + return $app->make('Tikamsah\OAuth2Server\Commands\ExpiredTokensCommand'); }); $this->commands('oauth2.expired-tokens-command'); From b1eeb4d0021d4db956b1ca204b6611603c1e044a Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:19:42 +0530 Subject: [PATCH 11/21] Update SessionManagementInterface.php --- .../OAuth2Server/Repositories/SessionManagementInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/SessionManagementInterface.php b/src/LucaDegasperi/OAuth2Server/Repositories/SessionManagementInterface.php index 3133b260..c8ee23c9 100644 --- a/src/LucaDegasperi/OAuth2Server/Repositories/SessionManagementInterface.php +++ b/src/LucaDegasperi/OAuth2Server/Repositories/SessionManagementInterface.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:20:09 +0530 Subject: [PATCH 12/21] Update FluentSession.php --- src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php index 4fd80caa..d289f793 100644 --- a/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php +++ b/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:20:45 +0530 Subject: [PATCH 13/21] Update FluentScope.php --- src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php index 7d604ea6..8fce14a6 100644 --- a/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php +++ b/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php @@ -1,4 +1,4 @@ -select('oauth_scopes.id as id', 'oauth_scopes.scope as scope', 'oauth_scopes.name as name', 'oauth_scopes.description as description') ->where('oauth_scopes.scope', $scope); - if (Config::get('lucadegasperi/oauth2-server-laravel::oauth2.limit_clients_to_scopes') === true and ! is_null($clientId)) { + if (Config::get('tikamsah/oauth2-server-laravel::oauth2.limit_clients_to_scopes') === true and ! is_null($clientId)) { $query = $query->join('oauth_client_scopes', 'oauth_scopes.id', '=', 'oauth_client_scopes.scope_id') ->where('oauth_client_scopes.client_id', $clientId); } - if (Config::get('lucadegasperi/oauth2-server-laravel::oauth2.limit_scopes_to_grants') === true and ! is_null($grantType)) { + if (Config::get('tikamsah/oauth2-server-laravel::oauth2.limit_scopes_to_grants') === true and ! is_null($grantType)) { $query = $query->join('oauth_grant_scopes', 'oauth_scopes.id', '=', 'oauth_grant_scopes.scope_id') ->join('oauth_grants', 'oauth_grants.id', '=', 'oauth_grant_scopes.grant_id') ->where('oauth_grants.grant', $grantType); From 6b01e64208103058e33c5920a362e9d7a18f734a Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:21:21 +0530 Subject: [PATCH 14/21] Update FluentClient.php --- src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php index a212a065..1f21c94e 100644 --- a/src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php +++ b/src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php @@ -1,4 +1,4 @@ -where('oauth_client_endpoints.redirect_uri', $redirectUri); } - if (Config::get('lucadegasperi/oauth2-server-laravel::oauth2.limit_clients_to_grants') === true and ! is_null($grantType)) { + if (Config::get('tikamsah/oauth2-server-laravel::oauth2.limit_clients_to_grants') === true and ! is_null($grantType)) { $query = $query->join('oauth_client_grants', 'oauth_clients.id', '=', 'oauth_client_grants.client_id') ->join('oauth_grants', 'oauth_grants.id', '=', 'oauth_client_grants.grant_id') ->where('oauth_grants.grant', $grantType); From 8dafbfc89d10dbb0407e8e3d1a8a90cb9e048074 Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:21:48 +0530 Subject: [PATCH 15/21] Update AuthorizationServerProxy.php --- .../OAuth2Server/Proxies/AuthorizationServerProxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Proxies/AuthorizationServerProxy.php b/src/LucaDegasperi/OAuth2Server/Proxies/AuthorizationServerProxy.php index d9911adf..e88945f9 100644 --- a/src/LucaDegasperi/OAuth2Server/Proxies/AuthorizationServerProxy.php +++ b/src/LucaDegasperi/OAuth2Server/Proxies/AuthorizationServerProxy.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:22:16 +0530 Subject: [PATCH 16/21] Update OAuthOwnerFilter.php --- src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php b/src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php index 14aef306..cb53e847 100644 --- a/src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php +++ b/src/LucaDegasperi/OAuth2Server/Filters/OAuthOwnerFilter.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:22:49 +0530 Subject: [PATCH 17/21] Update OAuthFilter.php --- src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php b/src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php index dcee9df9..24112fbf 100644 --- a/src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php +++ b/src/LucaDegasperi/OAuth2Server/Filters/OAuthFilter.php @@ -1,4 +1,4 @@ - 401, From 1e59b26070db4d9618c26b666e95eb64ea3bb28e Mon Sep 17 00:00:00 2001 From: Tikam Date: Fri, 18 Aug 2023 13:27:13 +0530 Subject: [PATCH 18/21] Update CheckAuthorizationParamsFilter.php --- .../OAuth2Server/Filters/CheckAuthorizationParamsFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Filters/CheckAuthorizationParamsFilter.php b/src/LucaDegasperi/OAuth2Server/Filters/CheckAuthorizationParamsFilter.php index 5db0b064..7c750188 100644 --- a/src/LucaDegasperi/OAuth2Server/Filters/CheckAuthorizationParamsFilter.php +++ b/src/LucaDegasperi/OAuth2Server/Filters/CheckAuthorizationParamsFilter.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:43:25 +0530 Subject: [PATCH 19/21] Update AuthorizationServerFacade.php --- .../OAuth2Server/Facades/AuthorizationServerFacade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Facades/AuthorizationServerFacade.php b/src/LucaDegasperi/OAuth2Server/Facades/AuthorizationServerFacade.php index 9d212bfd..f9d967e8 100644 --- a/src/LucaDegasperi/OAuth2Server/Facades/AuthorizationServerFacade.php +++ b/src/LucaDegasperi/OAuth2Server/Facades/AuthorizationServerFacade.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:43:49 +0530 Subject: [PATCH 20/21] Update ResourceServerFacade.php --- src/LucaDegasperi/OAuth2Server/Facades/ResourceServerFacade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LucaDegasperi/OAuth2Server/Facades/ResourceServerFacade.php b/src/LucaDegasperi/OAuth2Server/Facades/ResourceServerFacade.php index 936c34c3..6b91a7a1 100644 --- a/src/LucaDegasperi/OAuth2Server/Facades/ResourceServerFacade.php +++ b/src/LucaDegasperi/OAuth2Server/Facades/ResourceServerFacade.php @@ -1,4 +1,4 @@ - Date: Fri, 18 Aug 2023 13:44:20 +0530 Subject: [PATCH 21/21] Update ExpiredTokensCommand.php --- .../OAuth2Server/Commands/ExpiredTokensCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php b/src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php index a130f2ef..3a2832bf 100644 --- a/src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php +++ b/src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php @@ -1,9 +1,9 @@ -