Fix pwd for service account, delete acl

core/src/main/java/io/aiven/klaw/helpers/HandleDbRequests.java

@@ -281,7 +281,8 @@ List<Map<String, String>> getActivityLogForLastDays(
 
   String updateConnectorRequestStatus(KafkaConnectorRequest topicRequest, String approver);
 
-  String updateAclRequest(AclRequests aclRequests, String approver, String jsonParams);
+  String updateAclRequest(
+      AclRequests aclRequests, String approver, String jsonParams, boolean saveReqOnly);
 
   void updateNewUserRequest(String username, String approver, boolean isApprove);
 
@@ -385,4 +386,6 @@ List<Map<String, String>> getActivityLogForLastDays(
   List<KwProperties> getKwProperties();
 
   List<KwClusters> getClusters();
+
+  String updateJsonParams(String jsonParams, Integer req_no, int tenantId);
 }

core/src/main/java/io/aiven/klaw/helpers/db/rdbms/HandleDbRequestsJdbc.java

@@ -687,8 +687,9 @@ public String declineAclRequest(AclRequests aclReq, String approver) {
     return jdbcUpdateHelper.declineAclRequest(aclReq, approver);
   }
 
-  public String updateAclRequest(AclRequests aclReq, String approver, String jsonParams) {
-    return jdbcUpdateHelper.updateAclRequest(aclReq, approver, jsonParams);
+  public String updateAclRequest(
+      AclRequests aclReq, String approver, String jsonParams, boolean saveReqOnly) {
+    return jdbcUpdateHelper.updateAclRequest(aclReq, approver, jsonParams, saveReqOnly);
   }
 
   @Override
@@ -929,4 +930,9 @@ public List<KwProperties> getKwProperties() {
   public List<KwClusters> getClusters() {
     return jdbcSelectHelper.getClusters();
   }
+
+  @Override
+  public String updateJsonParams(String jsonParams, Integer req_no, int tenantId) {
+    return jdbcUpdateHelper.updateJsonParams(jsonParams, req_no, tenantId);
+  }
 }

core/src/main/java/io/aiven/klaw/helpers/db/rdbms/UpdateDataJdbc.java

@@ -3,6 +3,7 @@
 import static org.springframework.beans.BeanUtils.copyProperties;
 
 import io.aiven.klaw.dao.Acl;
+import io.aiven.klaw.dao.AclID;
 import io.aiven.klaw.dao.AclRequests;
 import io.aiven.klaw.dao.KafkaConnectorRequest;
 import io.aiven.klaw.dao.KwKafkaConnector;
@@ -23,6 +24,7 @@
 import io.aiven.klaw.model.enums.NewUserStatus;
 import io.aiven.klaw.model.enums.RequestOperationType;
 import io.aiven.klaw.model.enums.RequestStatus;
+import io.aiven.klaw.repository.AclRepo;
 import io.aiven.klaw.repository.AclRequestsRepo;
 import io.aiven.klaw.repository.KwKafkaConnectorRepo;
 import io.aiven.klaw.repository.KwKafkaConnectorRequestsRepo;
@@ -63,6 +65,9 @@ public class UpdateDataJdbc {
   @Autowired(required = false)
   private AclRequestsRepo aclRequestsRepo;
 
+  @Autowired(required = false)
+  private AclRepo aclRepo;
+
   @Autowired(required = false)
   private UserInfoRepo userInfoRepo;
 
@@ -249,12 +254,31 @@ private void updateConnectorSOT(List<KwKafkaConnector> topics, String topicId) {
         });
   }
 
-  public String updateAclRequest(AclRequests aclReq, String approver, String jsonParams) {
+  public String updateJsonParams(String jsonParams, int reqNo, int tenantId) {
+    AclID aclID = new AclID();
+    aclID.setReq_no(reqNo);
+    aclID.setTenantId(tenantId);
+
+    Optional<Acl> acl = aclRepo.findById(aclID);
+    acl.ifPresent(
+        value -> {
+          value.setJsonParams(jsonParams);
+          aclRepo.save(acl.get());
+        });
+
+    return ApiResultStatus.SUCCESS.value;
+  }
+
+  public String updateAclRequest(
+      AclRequests aclReq, String approver, String jsonParams, boolean saveReqOnly) {
     log.debug("updateAclRequest {} {}", aclReq.getTopicname(), approver);
     aclReq.setApprover(approver);
     aclReq.setRequestStatus(RequestStatus.APPROVED.value);
     aclReq.setApprovingtime(new Timestamp(System.currentTimeMillis()));
     aclRequestsRepo.save(aclReq);
+    if (saveReqOnly) {
+      return ApiResultStatus.SUCCESS.value;
+    }
 
     return processMultipleAcls(aclReq, jsonParams);
   }

core/src/main/java/io/aiven/klaw/service/AclControllerService.java

@@ -699,7 +699,7 @@ private String handleAclRequestClusterApiResponse(
             updateServiceAccountsForTeam(aclReq, tenantId);
           }
         }
-        updateAclReqStatus = dbHandle.updateAclRequest(aclReq, userDetails, jsonParams);
+        updateAclReqStatus = dbHandle.updateAclRequest(aclReq, userDetails, jsonParams, false);
       } else {
         updateAclReqStatus = ApiResultStatus.FAILURE.value;
       }

core/src/main/java/io/aiven/klaw/service/AclSyncControllerService.java

@@ -216,6 +216,31 @@ private void approveSyncBackAcls(
       } else if (resultAclNullCheck.contains("Acl already exists")) {
         logUpdateSyncBackTopics.add(String.format(ACL_SYNC_ERR_103, aclFound.getTopicname()));
       } else {
+        Env env =
+            manageDatabase
+                .getHandleDbRequests()
+                .getEnvDetails(syncBackAcls.getSourceEnv(), tenantId);
+        KwClusters kwClusters =
+            manageDatabase
+                .getClusters(KafkaClustersType.of(env.getType()), tenantId)
+                .get(env.getClusterId());
+        // Update aivenaclid in klaw metadata
+        if (kwClusters.getKafkaFlavor().equals(KafkaFlavors.AIVEN_FOR_APACHE_KAFKA.value)) {
+          String jsonParams = "{}", aivenAclIdKey = "aivenaclid";
+          if (Objects.requireNonNull(responseBody).isSuccess()) {
+            Object responseData = responseBody.getData();
+            if (responseData instanceof Map) {
+              Map<String, String> dataMap = (Map<String, String>) responseData;
+              if (dataMap.containsKey(aivenAclIdKey)) {
+                jsonParams = "{\"" + aivenAclIdKey + "\":\"" + dataMap.get(aivenAclIdKey) + "\"}";
+              }
+            }
+          }
+
+          manageDatabase
+              .getHandleDbRequests()
+              .updateJsonParams(jsonParams, aclFound.getReq_no(), tenantId);
+        }
         if (!Objects.equals(syncBackAcls.getSourceEnv(), syncBackAcls.getTargetEnv())) {
           logUpdateSyncBackTopics.add(String.format(ACL_SYNC_ERR_104, aclFound.getTopicname()));
           // Create request
@@ -228,7 +253,7 @@ private void approveSyncBackAcls(
             String emptyJsonParams = "{}";
             manageDatabase
                 .getHandleDbRequests()
-                .updateAclRequest(aclReq, userName, emptyJsonParams);
+                .updateAclRequest(aclReq, userName, emptyJsonParams, true);
           }
         }
       }

core/src/main/resources/static/js/browseAcls.js

@@ -822,7 +822,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                         title: "Success: ",
                         text: "Password is displayed above !!"
                     });
-                    $scope.alert = "Password : " + output.data.password;
+                    $scope.alert = "Password : " + output.password;
                 }
 
             }).error(

core/src/test/java/io/aiven/klaw/helpers/db/rdbms/UpdateDataJdbcTest.java

@@ -129,15 +129,16 @@ public void updateAclRequest() {
     when(insertDataJdbcHelper.insertIntoAclsSOT(any(), eq(false)))
         .thenReturn(ApiResultStatus.SUCCESS.value);
     String result =
-        updateData.updateAclRequest(utilMethods.getAclRequestCreate("testtopic"), "uiuser2", "{}");
+        updateData.updateAclRequest(
+            utilMethods.getAclRequestCreate("testtopic"), "uiuser2", "{}", false);
     assertThat(result).isEqualTo(ApiResultStatus.SUCCESS.value);
   }
 
   @Test
   public void updateAclRequest1() {
     when(deleteDataJdbcHelper.deletePrevAclRecs(any())).thenReturn(ApiResultStatus.SUCCESS.value);
     String result =
-        updateData.updateAclRequest(utilMethods.getAclRequest("testtopic"), "uiuser2", "{}");
+        updateData.updateAclRequest(utilMethods.getAclRequest("testtopic"), "uiuser2", "{}", false);
     assertThat(result).isEqualTo(ApiResultStatus.SUCCESS.value);
   }
 

core/src/test/java/io/aiven/klaw/service/AclControllerServiceTest.java

@@ -489,7 +489,7 @@ public void approveAclRequests() throws KlawException {
         ApiResponse.builder().success(true).message(ApiResultStatus.SUCCESS.value).build();
     when(clusterApiService.approveAclRequests(any(), anyInt()))
         .thenReturn(new ResponseEntity<>(apiResponse, HttpStatus.OK));
-    when(handleDbRequests.updateAclRequest(any(), any(), anyString()))
+    when(handleDbRequests.updateAclRequest(any(), any(), anyString(), anyBoolean()))
         .thenReturn(ApiResultStatus.SUCCESS.value);
     when(commonUtilsService.getEnvsFromUserId(anyString()))
         .thenReturn(new HashSet<>(Collections.singletonList("1")));
@@ -518,7 +518,7 @@ public void approveAclRequestsWithAivenAcl() throws KlawException {
             .build();
     when(clusterApiService.approveAclRequests(any(), anyInt()))
         .thenReturn(new ResponseEntity<>(apiResponse, HttpStatus.OK));
-    when(handleDbRequests.updateAclRequest(any(), any(), anyString()))
+    when(handleDbRequests.updateAclRequest(any(), any(), anyString(), anyBoolean()))
         .thenReturn(ApiResultStatus.SUCCESS.value);
     when(commonUtilsService.getEnvsFromUserId(anyString()))
         .thenReturn(new HashSet<>(Collections.singletonList("1")));
@@ -581,7 +581,7 @@ public void approveAclRequestsFailure2() throws KlawException {
         ApiResponse.builder().success(true).message(ApiResultStatus.SUCCESS.value).build();
     when(clusterApiService.approveAclRequests(any(), anyInt()))
         .thenReturn(new ResponseEntity<>(apiResponse, HttpStatus.OK));
-    when(handleDbRequests.updateAclRequest(any(), any(), anyString()))
+    when(handleDbRequests.updateAclRequest(any(), any(), anyString(), anyBoolean()))
         .thenThrow(new RuntimeException("Error"));
 
     ApiResponse apiResp = aclControllerService.approveAclRequests(req_no);

core/src/test/java/io/aiven/klaw/service/AclSyncControllerServiceTest.java

@@ -19,12 +19,15 @@
 import io.aiven.klaw.model.AclInfo;
 import io.aiven.klaw.model.ApiResponse;
 import io.aiven.klaw.model.SyncAclUpdates;
+import io.aiven.klaw.model.SyncBackAcls;
 import io.aiven.klaw.model.enums.AclType;
 import io.aiven.klaw.model.enums.ApiResultStatus;
 import io.aiven.klaw.model.enums.KafkaClustersType;
+import io.aiven.klaw.model.enums.KafkaFlavors;
 import io.aiven.klaw.model.enums.KafkaSupportedProtocol;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +39,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -203,6 +208,56 @@ public void getAclsSyncTrue2() throws KlawException {
     assertThat(aclList).isEmpty();
   }
 
+  @Test
+  @Order(8)
+  public void updateSyncBackAcls() throws KlawException {
+    String envSelected = "1";
+    Map<String, String> aivenAclId = new HashMap<>();
+    aivenAclId.put("aivenaclid", "test1234");
+    ApiResponse apiResponse =
+        ApiResponse.builder()
+            .success(true)
+            .data(aivenAclId)
+            .message(ApiResultStatus.SUCCESS.value)
+            .build();
+    ResponseEntity<ApiResponse> apiResponseResponseEntity =
+        new ResponseEntity<>(apiResponse, HttpStatus.OK);
+    stubUserInfo();
+    when(commonUtilsService.getTenantId(anyString())).thenReturn(101);
+    when(manageDatabase.getKafkaEnvList(anyInt())).thenReturn(utilMethods.getEnvLists());
+    Env env = utilMethods.getEnvLists().get(0);
+    env.setType("kafka");
+    when(handleDbRequests.getEnvDetails(anyString(), anyInt())).thenReturn(env);
+
+    when(manageDatabase.getClusters(any(KafkaClustersType.class), anyInt()))
+        .thenReturn(clustersHashMap);
+    when(clustersHashMap.get(any())).thenReturn(kwClusters);
+    when(kwClusters.getKafkaFlavor()).thenReturn(KafkaFlavors.AIVEN_FOR_APACHE_KAFKA.value);
+    when(commonUtilsService.isNotAuthorizedUser(any(), any())).thenReturn(false);
+    when(handleDbRequests.getSyncAclsFromReqNo(anyInt(), anyInt()))
+        .thenReturn(getAclsSOT0().get(0));
+    when(clusterApiService.approveAclRequests(any(), anyInt()))
+        .thenReturn(apiResponseResponseEntity);
+    when(handleDbRequests.updateJsonParams(anyString(), anyInt(), anyInt()))
+        .thenReturn(ApiResultStatus.SUCCESS.value);
+
+    SyncBackAcls syncBackAcls = getSyncBackAcls(envSelected);
+
+    ApiResponse apiResponseActual = aclSyncControllerService.updateSyncBackAcls(syncBackAcls);
+    assertThat(apiResponseActual.isSuccess()).isTrue();
+  }
+
+  private static SyncBackAcls getSyncBackAcls(String envSelected) {
+    SyncBackAcls syncBackAcls = new SyncBackAcls();
+    String[] aclIds = new String[1];
+    aclIds[0] = "1001";
+    syncBackAcls.setAclIds(aclIds);
+    syncBackAcls.setTypeOfSync("SELECTED_ACLS");
+    syncBackAcls.setSourceEnv(envSelected);
+    syncBackAcls.setTargetEnv(envSelected);
+    return syncBackAcls;
+  }
+
   private List<Team> getAvailableTeams() {
 
     Team team1 = new Team();