From ba38209bc651ef7411991e3cbb1ce973f07542bf Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Wed, 30 Jan 2019 10:35:33 -0300 Subject: [PATCH] Added Scope base realm the idea behind this is able to separate scope base realm from host header Change-Id: I388fbbd7fe6f8187cb15f7403023b3af9b9c6507 --- .env.example | 1 + config/app.php | 8 ++++++++ database/seeds/ApiScopesSeeder.php | 14 +++++++------- tests/ProtectedApiTest.php | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 5d7e9769..d22fd94c 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ APP_ENV=local APP_DEBUG=true APP_KEY=SomeRandomString APP_URL=http://localhost +APP_SCOPE_BASE_REALM=http://localhost APP_OAUTH_2_0_CLIENT_ID=clientid APP_OAUTH_2_0_CLIENT_SECRET=clientsecret APP_OAUTH_2_0_AUTH_SERVER_BASE_URL=http://localhost diff --git a/config/app.php b/config/app.php index b58c6e3b..5ad8c800 100644 --- a/config/app.php +++ b/config/app.php @@ -45,6 +45,14 @@ return [ 'url' => env('APP_URL', 'http://localhost'), + /* + |--------------------------------------------------------------------------- + | Application Scope Base Realm + |--------------------------------------------------------------------------- + */ + + 'scope_base_realm' => env('APP_SCOPE_BASE_REALM', 'http://localhost'), + /* |-------------------------------------------------------------------------- | Application Timezone diff --git a/database/seeds/ApiScopesSeeder.php b/database/seeds/ApiScopesSeeder.php index b9a591de..48844d02 100644 --- a/database/seeds/ApiScopesSeeder.php +++ b/database/seeds/ApiScopesSeeder.php @@ -42,7 +42,7 @@ final class ApiScopesSeeder extends Seeder private function seedSummitScopes() { - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'summits']); $scopes = [ @@ -184,7 +184,7 @@ final class ApiScopesSeeder extends Seeder } private function seedMembersScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'members']); $scopes = [ @@ -225,7 +225,7 @@ final class ApiScopesSeeder extends Seeder } private function seedTagsScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'organizations']); $scopes = [ @@ -251,7 +251,7 @@ final class ApiScopesSeeder extends Seeder } private function seedOrganizationScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'companies']); $scopes = [ @@ -282,7 +282,7 @@ final class ApiScopesSeeder extends Seeder } private function seedCompaniesScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'companies']); $scopes = [ @@ -308,7 +308,7 @@ final class ApiScopesSeeder extends Seeder } private function seedGroupsScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'groups']); $scopes = [ @@ -334,7 +334,7 @@ final class ApiScopesSeeder extends Seeder } private function seedTeamsScopes(){ - $current_realm = Config::get('app.url'); + $current_realm = Config::get('app.scope_base_realm'); $api = EntityManager::getRepository(\App\Models\ResourceServer\Api::class)->findOneBy(['name' => 'teams']); $scopes = [ diff --git a/tests/ProtectedApiTest.php b/tests/ProtectedApiTest.php index 77b22b60..f1b500b1 100644 --- a/tests/ProtectedApiTest.php +++ b/tests/ProtectedApiTest.php @@ -31,7 +31,7 @@ class AccessTokenServiceStub implements IAccessTokenService */ public function get($token_value) { - $url = Config::get('app.url'); + $url = Config::get('app.scope_base_realm'); $parts = @parse_url($url); $realm = $parts['host']; @@ -82,7 +82,7 @@ class AccessTokenServiceStub2 implements IAccessTokenService */ public function get($token_value) { - $url = Config::get('app.url'); + $url = Config::get('app.scope_base_realm'); $parts = @parse_url($url); $realm = $parts['host'];