OAuthClient as ACL SID

- updated permission editor

src/main/java/org/genesys2/server/servlet/controller/JspHelper.java

@@ -25,6 +25,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.RandomUtils;
+import org.genesys.blocks.oauth.model.OAuthClient;
+import org.genesys.blocks.oauth.service.OAuthClientDetailsService;
+import org.genesys.blocks.security.UserException;
 import org.genesys2.server.model.impl.Country;
 import org.genesys2.server.model.impl.Crop;
 import org.genesys2.server.model.impl.User;
@@ -57,6 +60,9 @@ public class JspHelper {
 	@Autowired
 	private HtmlConverter htmlConverter;
 
+	@Autowired
+	private OAuthClientDetailsService clientDetailsService;
+
 	public String userFullName(Long userId) {
 		if (userId == null) {
 			return null;
@@ -77,6 +83,13 @@ public class JspHelper {
 		return userService.getUserByUuid(uuid);
 	}
 
+	public OAuthClient getByClientId(final String clientId) {
+		if (clientId == null) {
+			return null;
+		}
+		return clientDetailsService.getClient(clientId);
+	}
+
 	public Country getCountry(String iso3) {
 		return geoService.getCountry(iso3);
 	}

src/main/java/org/genesys2/server/servlet/controller/rest/PermissionController.java

@@ -17,9 +17,12 @@
 package org.genesys2.server.servlet.controller.rest;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.genesys.blocks.oauth.model.OAuthClient;
+import org.genesys.blocks.oauth.service.OAuthClientDetailsService;
 import org.genesys.blocks.security.model.AclObjectIdentity;
 import org.genesys.blocks.security.service.CustomAclService;
 import org.genesys2.server.model.impl.User;
@@ -47,20 +50,16 @@ public class PermissionController extends RestController {
 	@Autowired
 	private UserService userService;
 
+    @Autowired
+    private OAuthClientDetailsService clientDetailsService;
+
 	@RequestMapping(value = "/add", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	public @ResponseBody Object addPermission(@RequestBody PermissionJson permissionJson) {
 		LOG.info("Adding permission {}", permissionJson);
 
 		final Map<Integer, Boolean> permissionMap = PermissionJsonUtil.createPermissionsMap(permissionJson);
-		if (permissionJson.isPrincipal()) {
-			final User user = userService.getUserByEmail(permissionJson.getUuid());
-			aclService.addPermissions(permissionJson.getOid(), permissionJson.getClazz(), user.getUuid(), permissionJson.isPrincipal(), permissionMap);
-			return JSON_OK;
-		} else {
-			aclService.addPermissions(permissionJson.getOid(), permissionJson.getClazz(), permissionJson.getUuid(), permissionJson.isPrincipal(),
-					permissionMap);
-			return JSON_OK;
-		}
+		aclService.addPermissions(permissionJson.getOid(), permissionJson.getClazz(), permissionJson.getUuid(), permissionJson.isPrincipal(), permissionMap);
+		return JSON_OK;
 	}
 
 	@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -81,4 +80,13 @@ public class PermissionController extends RestController {
 		}
 		return userEmails;
 	}
+
+    @RequestMapping(value = "/autocomplete-oauth-client", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public @ResponseBody Map<String, String> acOauthClient(@RequestParam("term") String title) {
+        final Map<String, String> oauthMap = new HashMap<>();
+        for (final OAuthClient client : clientDetailsService.autocompleteClients(title)) {
+            oauthMap.put(client.getTitle(), client.getClientId());
+        }
+        return oauthMap;
+    }
 }