Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'

updating existing shared scope not required

See merge request entgra/carbon-device-mgt!803
kernel-4.6.x
Pahansith Gunathilake 3 years ago
commit 9bba7edde8

@ -135,14 +135,6 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setRoles(apiScope.getRoles()); scope.setRoles(apiScope.getRoles());
apiProvider.addSharedScope(scope, tenantDomain); apiProvider.addSharedScope(scope, tenantDomain);
} }
} else {
// if already available as shared scope -> update
Scope scope = new Scope();
scope.setName(apiScope.getName());
scope.setDescription(apiScope.getDescription());
scope.setKey(apiScope.getKey());
scope.setRoles(apiScope.getRoles());
apiProvider.updateSharedScope(scope, tenantDomain);
} }
} }

Loading…
Cancel
Save