From 32a73e155b4bea95b94cf5fb976a3e6875c01ae0 Mon Sep 17 00:00:00 2001 From: YUCLing Date: Sat, 9 Mar 2024 23:23:39 +0800 Subject: [PATCH] chore: rename namespace to avoid conflict --- composer.json | 9 +++++++++ extend.php | 8 ++++---- src/Api/Controller/CreateClientController.php | 8 ++++---- src/Api/Controller/CreateScopeController.php | 6 +++--- src/Api/Controller/DeleteClientController.php | 6 +++--- src/Api/Controller/DeleteScopeController.php | 6 +++--- src/Api/Controller/ListClientController.php | 6 +++--- src/Api/Controller/ListScopeController.php | 8 ++++---- src/Api/Controller/ShowClientController.php | 6 +++--- src/Api/Controller/UpdateClientController.php | 6 +++--- src/Api/Controller/UpdateScopeController.php | 6 +++--- src/Api/Serializer/ClientPublicSerializer.php | 4 ++-- src/Api/Serializer/ClientSerializer.php | 4 ++-- src/Api/Serializer/ScopeSerializer.php | 4 ++-- src/Api/Serializer/ScopeUserSerializer.php | 4 ++-- src/Controllers/ApiUserController.php | 4 ++-- src/Controllers/AuthorizeController.php | 4 ++-- src/Controllers/TokenController.php | 4 ++-- src/Middlewares/ResourceScopeMiddleware.php | 8 ++++---- src/Middlewares/UnsetCsrfMiddleware.php | 8 ++++---- src/Middlewares/UserCredentialsMiddleware.php | 8 ++++---- src/Models/AccessToken.php | 2 +- src/Models/AuthorizationCode.php | 2 +- src/Models/Client.php | 2 +- src/Models/Jwt.php | 2 +- src/Models/RefreshToken.php | 2 +- src/Models/Scope.php | 2 +- src/OAuth.php | 2 +- src/Storage.php | 2 +- 29 files changed, 76 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index 8467d87..aa2bc5f 100644 --- a/composer.json +++ b/composer.json @@ -66,6 +66,15 @@ "FoskyM\\OAuthCenter\\Tests\\": "tests/" } }, + "archive": { + "exclude": [ + "vendor/", + "js/node_modules/", + "tests/", + "docs/", + ".gitignore" + ] + }, "scripts": { "test": [ "@test:unit", diff --git a/extend.php b/extend.php index 0379ef1..0c6c625 100644 --- a/extend.php +++ b/extend.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -namespace FoskyM\OAuthCenter; +namespace RhodesIsland\OAuthCenter; use Flarum\Extend; use Flarum\Http\Middleware\AuthenticateWithHeader; use Flarum\Http\Middleware\CheckCsrfToken; -use FoskyM\OAuthCenter\Middlewares\ResourceScopeMiddleware; -use FoskyM\OAuthCenter\Middlewares\UnsetCsrfMiddleware; -use FoskyM\OAuthCenter\Middlewares\UserCredentialsMiddleware; +use RhodesIsland\OAuthCenter\Middlewares\ResourceScopeMiddleware; +use RhodesIsland\OAuthCenter\Middlewares\UnsetCsrfMiddleware; +use RhodesIsland\OAuthCenter\Middlewares\UserCredentialsMiddleware; return [ (new Extend\Frontend('forum')) diff --git a/src/Api/Controller/CreateClientController.php b/src/Api/Controller/CreateClientController.php index 14863c2..2f8eaea 100644 --- a/src/Api/Controller/CreateClientController.php +++ b/src/Api/Controller/CreateClientController.php @@ -1,14 +1,14 @@ getParsedBody(), 'data.attributes'); $validAttrs = [ - 'user_id' => $actor->id + 'user_id' => $actor->id ]; collect(['client_id', 'client_secret', 'redirect_uri', 'grant_types', 'scope', 'client_name', 'client_desc', 'client_icon', 'client_home']) diff --git a/src/Api/Controller/CreateScopeController.php b/src/Api/Controller/CreateScopeController.php index 014d45d..cc1fed4 100644 --- a/src/Api/Controller/CreateScopeController.php +++ b/src/Api/Controller/CreateScopeController.php @@ -1,14 +1,14 @@