Service/Attributes bug on Handling new account put rest request

Signed-off-by: Sam <[email protected]>
samuelcostae · Sep 22, 2023 · d887b40 · d887b40
1 parent 34a90dd
commit d887b40
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/security/dlic/rest/api/InternalUsersApiAction.java b/src/main/java/org/opensearch/security/dlic/rest/api/InternalUsersApiAction.java
@@ -208,8 +208,8 @@ ValidationResult<SecurityConfiguration> createOrUpdateAccount(
         try {
             final var username = securityConfiguration.entityName();
             final var content = (ObjectNode) securityConfiguration.requestContent();
-            if (request.hasParam("service")) {
-                content.put("service", request.param("service"));
+            if (request.hasParam("attributes")) {
+                content.put("attributes", request.param("attributes"));
             }
             if (request.hasParam("enabled")) {
                 content.put("enabled", request.param("enabled"));

diff --git a/src/test/java/org/opensearch/security/UserServiceUnitTests.java b/src/test/java/org/opensearch/security/UserServiceUnitTests.java
@@ -32,7 +32,7 @@
 
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-public class UserServiceUnitTests<T> {
+public class UserServiceUnitTests {
     SecurityDynamicConfiguration<?> config;
     @Mock
     ClusterService clusterService;

diff --git a/src/test/java/org/opensearch/security/dlic/rest/api/UserApiTest.java b/src/test/java/org/opensearch/security/dlic/rest/api/UserApiTest.java
@@ -58,8 +58,7 @@ protected String getEndpointPrefix() {
 
     private static final String ENABLED_SERVICE_ACCOUNT_BODY = "{"
         + " \"attributes\": { \"service\": \"true\", "
-        + " \"enabled   \": \"true\"},"
-        + " \"service\": \"true\" "
+        + " \"enabled   \": \"true\"}"
         + " }\n";
 
     private static final String DISABLED_SERVICE_ACCOUNT_BODY = "{"