openinfra/openstackid
Code Issues Proposed changes

Merge "Fixed Scope Groups Update"

Browse Source
This commit is contained in:
Zuul 2019-04-09 21:42:45 +00:00 committed by Gerrit Code Review
commit e83daebda0
7 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/Api/ApiScopeGroupController.php
View File

@ -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);

1
app/Http/Controllers/Api/ClientApiController.php
View File

@ -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',

2
app/Services/OAuth2/ApiScopeGroupService.php
View File

@ -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)

3
app/libs/OAuth2/Models/AuthorizationCode.php
View File

@ -184,7 +184,8 @@ class AuthorizationCode extends Token
$value,
$user_id,
$client_id,
$scope,$audience = '',
$scope,
$audience = '',
$redirect_uri = null,
$issued = null,
$lifetime = 600,

1
app/libs/Utils/Http/HttpResponse.php
View File

@ -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;
}

7
database/seeds/ApiSeeder.php
View File

@ -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')
)

1
tests/OAuth2ProtocolTest.php
View File

@ -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",