libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #3717 from pedroigor/KEYCLOAK-4164

Browse source 
[KEYCLOAK-4164] - Creating typed resources always result in error
This commit is contained in:
Pedro Igor 2017-01-06 17:29:47 -02:00 committed by GitHub
commit 5bc134ea7b
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java
View file

@ -2218,7 +2218,13 @@ public class RepresentationToModel {
} }
} }
if (!hasResource && !"".equals(resourceId)) { if (!hasResource && !"".equals(resourceId)) {
policy.addResource(storeFactory.getResourceStore().findById(resourceId, policy.getResourceServer().getId())); Resource resource = storeFactory.getResourceStore().findById(resourceId, policy.getResourceServer().getId());
if (resource == null) {
throw new RuntimeException("Resource [" + resourceId + "] not found.");
}
policy.addResource(resource);
} }
} }

13
themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
View file

@ -890,7 +890,12 @@ module.controller('ResourceServerPolicyResourceDetailCtrl', function($scope, $ro
}, },
onUpdate : function() { onUpdate : function() {
$scope.policy.config.resources = JSON.stringify([$scope.policy.config.resources._id]); if ($scope.policy.config.resources && $scope.policy.config.resources._id) {
$scope.policy.config.resources = JSON.stringify([$scope.policy.config.resources._id]);
} else {
delete $scope.policy.config.resources
}
var policies = []; var policies = [];
for (i = 0; i < $scope.policy.config.applyPolicies.length; i++) { for (i = 0; i < $scope.policy.config.applyPolicies.length; i++) {
@ -920,7 +925,11 @@ module.controller('ResourceServerPolicyResourceDetailCtrl', function($scope, $ro
}, },
onCreate : function() { onCreate : function() {
$scope.policy.config.resources = JSON.stringify([$scope.policy.config.resources._id]); if ($scope.policy.config.resources && $scope.policy.config.resources._id) {
$scope.policy.config.resources = JSON.stringify([$scope.policy.config.resources._id]);
} else {
delete $scope.policy.config.resources
}
var policies = []; var policies = [];