openinfra/openstackid
Code Issues Proposed changes

Fix on duplicated scopes on OAUTH2 client

Browse Source 
Change-Id: I805762eb4878efd95e0b3b391aee3c4b84786ab8
This commit is contained in:
Sebastian Marcet 2017-02-14 16:51:37 -03:00
parent e3d54eec1d
commit 727e201376
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/AdminController.php
View File

@ -195,8 +195,23 @@ class AdminController extends Controller {
array_push($aux_scopes, $scope->id);
}
$scopes = $this->scope_service->getAvailableScopes();
$group_scopes = $user->getGroupScopes();
// scope pre processing
$scopes = $this->scope_service->getAvailableScopes();
$group_scopes = $user->getGroupScopes();
$merged_scopes = array_merge($scopes, $group_scopes);
$final_scopes = [];
$processed_scopes = [];
foreach($merged_scopes as $test_scope){
if(isset($processed_scopes[$test_scope->id])) continue;
$processed_scopes[$test_scope->id] = $test_scope->id;
$final_scopes[] = $test_scope;
}
usort($final_scopes, function($elem1, $elem2){
return $elem1->api_id > $elem2->api_id;
});
// scope pre processing
$access_tokens = $this->access_token_repository->getAllValidByClientIdentifier($client->getId(), 1 , self::TokenPageSize);
@ -216,7 +231,7 @@ class AdminController extends Controller {
[
'client' => $client,
'selected_scopes' => $aux_scopes,
'scopes' => array_merge($scopes, $group_scopes),
'scopes' => $final_scopes,
'access_tokens' => $access_tokens->items(),
'access_tokens_pages' => $access_tokens->total() > 0 ? intval(ceil($access_tokens->total() / self::TokenPageSize)) : 0,
"is_oauth2_admin" => $user->isOAuth2ServerAdmin(),

9
app/Models/OAuth2/ApiScope.php
View File

@ -93,14 +93,7 @@ class ApiScope extends BaseModelEloquent implements IApiScope
* @return IApi
*/
public function getApi(){
return Cache::remember
(
'api_'.$this->api_id,
Config::get("cache_regions.region_api_lifetime", 1140),
function() {
return $this->api()->first();
}
);
return $this->api()->first();
}
public function getApiName()

2
resources/views/oauth2/profile/edit-client-scopes.blade.php
View File

@ -5,7 +5,7 @@
@foreach ($scopes as $scope)
<?php $current_api = $scope->getApiName(); ?>
<?php $current_api_logo = $scope->getApiLogo(); ?>
@if($last_api!=$current_api && !empty($current_api))
@if($last_api != $current_api && !empty($current_api))
@if(!empty($last_api))
</li></ul>
@endif