community
/
device-mgt-core
12
0
Fork 43
Code Issues Pull Requests 21 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

Fix unmodifiable list referencing issue #260

Merged
tcdlpds merged 2 commits from rajitha/device-mgt-core:admin-role-isssue into master 12 months ago
Conversation 0 Commits 2 Files Changed 1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File

11
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java
Unescape View File

@ -184,7 +184,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -259,7 +259,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -282,7 +282,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -459,10 +459,9 @@ public class APIPublisherServiceImpl implements APIPublisherService {
//todo check whether scope is available or not //todo check whether scope is available or not
ScopeMapping scopeMapping = defaultPermission.getScopeMapping(); ScopeMapping scopeMapping = defaultPermission.getScopeMapping();
String[] roles = scopeMapping.getDefaultRoles().split(","); List<String> bindings = new ArrayList<>(
List<String> bindings = Arrays.asList(roles); Arrays.asList(scopeMapping.getDefaultRoles().split(",")));
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setName(scopeMapping.getKey()); scope.setName(scopeMapping.getKey());
scope.setDescription(scopeMapping.getName()); scope.setDescription(scopeMapping.getName());
scope.setDisplayName(scopeMapping.getName()); scope.setDisplayName(scopeMapping.getName());

Write Preview
Loading…
Cancel
Save