From 8d6fcb85cc039534b7f0adee1442e29c61b6858a Mon Sep 17 00:00:00 2001 From: smarcet Date: Tue, 2 Apr 2019 16:25:39 -0300 Subject: [PATCH] Fixed Scope Groups Update * fixed server error due a deprecated method * refactoring Change-Id: I25f193d54f0953d1e6dca19553874b0bfe69e947 --- .../Api/ApiScopeGroupController.php | 21 +++++++++---------- .../Controllers/Api/ClientApiController.php | 1 - app/Services/OAuth2/ApiScopeGroupService.php | 2 +- app/libs/OAuth2/Models/AuthorizationCode.php | 3 ++- app/libs/Utils/Http/HttpResponse.php | 1 + database/seeds/ApiSeeder.php | 7 +++---- tests/OAuth2ProtocolTest.php | 1 - 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Api/ApiScopeGroupController.php b/app/Http/Controllers/Api/ApiScopeGroupController.php index f3962800..cc83be40 100644 --- a/app/Http/Controllers/Api/ApiScopeGroupController.php +++ b/app/Http/Controllers/Api/ApiScopeGroupController.php @@ -202,25 +202,24 @@ final class ApiScopeGroupController extends AbstractRESTController implements IC $values = Input::all(); - $rules = array - ( - 'id' => 'required|integer', + $rules = [ + 'id' => 'required|integer', 'name' => 'required|text|max:512', 'active' => 'required|boolean', 'scopes' => 'required', 'users' => 'required|user_ids', - ); + ]; // Creates a Validator instance and validates the data. $validation = Validator::make($values, $rules); if ($validation->fails()) { $messages = $validation->messages()->toArray(); - return $this->error400(array('error' => 'validation', 'messages' => $messages)); + return $this->error400(['error' => 'validation', 'messages' => $messages]); } - $res = $this->service->update(intval($values['id']), $values); + $this->service->update(intval($values['id']), $values); - return $res ? $this->ok() : $this->error400(array('error' => 'operation failed')); + return $this->ok(); } catch (InvalidApiScopeGroup $ex1) { @@ -236,8 +235,8 @@ final class ApiScopeGroupController extends AbstractRESTController implements IC public function activate($id){ try { - $res = $this->service->setStatus($id, true); - return $res?$this->ok():$this->error400(array('error'=>'operation failed')); + $this->service->setStatus($id, true); + return $this->ok(); } catch (Exception $ex) { $this->log_service->error($ex); @@ -248,8 +247,8 @@ final class ApiScopeGroupController extends AbstractRESTController implements IC public function deactivate($id){ try { - $res = $this->service->setStatus($id, false); - return $res?$this->ok():$this->error400(array('error'=>'operation failed')); + $this->service->setStatus($id, false); + return $this->ok(); } catch (Exception $ex) { $this->log_service->error($ex); diff --git a/app/Http/Controllers/Api/ClientApiController.php b/app/Http/Controllers/Api/ClientApiController.php index 86653658..0e23f999 100644 --- a/app/Http/Controllers/Api/ClientApiController.php +++ b/app/Http/Controllers/Api/ClientApiController.php @@ -240,7 +240,6 @@ final class ClientApiController extends AbstractRESTController implements ICRUDC 'policy_uri' => 'sometimes|required|url', 'jwks_uri' => 'sometimes|required|url', 'default_max_age' => 'sometimes|required|integer', - 'logout_use_iframe' => 'sometimes|required|boolean', 'require_auth_time' => 'sometimes|required|boolean', 'token_endpoint_auth_method' => 'sometimes|required|token_endpoint_auth_method', 'token_endpoint_auth_signing_alg' => 'sometimes|required|signing_alg', diff --git a/app/Services/OAuth2/ApiScopeGroupService.php b/app/Services/OAuth2/ApiScopeGroupService.php index e2b68d25..26cadea7 100644 --- a/app/Services/OAuth2/ApiScopeGroupService.php +++ b/app/Services/OAuth2/ApiScopeGroupService.php @@ -112,7 +112,7 @@ final class ApiScopeGroupService implements IApiScopeGroupService } if($param === 'scopes') { - $ids = $group->scopes()->getRelatedIds()->all(); + $ids = $group->scopes()->pluck('id')->all(); $group->scopes()->detach($ids); $scopes = explode(',', $params['scopes']); foreach($scopes as $scope_id) diff --git a/app/libs/OAuth2/Models/AuthorizationCode.php b/app/libs/OAuth2/Models/AuthorizationCode.php index 0e53a91e..d75d571d 100644 --- a/app/libs/OAuth2/Models/AuthorizationCode.php +++ b/app/libs/OAuth2/Models/AuthorizationCode.php @@ -184,7 +184,8 @@ class AuthorizationCode extends Token $value, $user_id, $client_id, - $scope,$audience = '', + $scope, + $audience = '', $redirect_uri = null, $issued = null, $lifetime = 600, diff --git a/app/libs/Utils/Http/HttpResponse.php b/app/libs/Utils/Http/HttpResponse.php index 509dc576..69192d54 100644 --- a/app/libs/Utils/Http/HttpResponse.php +++ b/app/libs/Utils/Http/HttpResponse.php @@ -23,6 +23,7 @@ abstract class HttpResponse extends HttpMessage */ public function __construct($http_code, $content_type) { + parent::__construct(); $this->http_code = $http_code; $this->content_type = $content_type; } diff --git a/database/seeds/ApiSeeder.php b/database/seeds/ApiSeeder.php index d66cbaf1..c72bb5f2 100644 --- a/database/seeds/ApiSeeder.php +++ b/database/seeds/ApiSeeder.php @@ -20,10 +20,9 @@ class ApiSeeder extends Seeder { // users Api::create( array( - 'name' => 'users', - 'logo' => null, - 'active' => true, - 'Description' => 'User Info', + 'name' => 'users', + 'active' => true, + 'Description' => 'User Info', 'resource_server_id' => $resource_server->id, 'logo' => asset('/assets/img/apis/server.png') ) diff --git a/tests/OAuth2ProtocolTest.php b/tests/OAuth2ProtocolTest.php index 75917a23..e9ad115f 100644 --- a/tests/OAuth2ProtocolTest.php +++ b/tests/OAuth2ProtocolTest.php @@ -654,7 +654,6 @@ final class OAuth2ProtocolTest extends OpenStackIDBaseTest $params = array( 'refresh_token' => $refresh_token, 'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken, - 'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken, ); $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",