Add the permission check and also use an enum to get the topics with …

…producers or consumer acls you have setup. Signed-off-by: Aindriu Lavelle <[email protected]>
Aiven-Open · Jan 19, 2024 · c9cc883 · c9cc883
1 parent 14b0a04
commit c9cc883
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/core/src/main/java/io/aiven/klaw/controller/TopicController.java b/core/src/main/java/io/aiven/klaw/controller/TopicController.java
@@ -4,10 +4,7 @@
 import io.aiven.klaw.error.KlawNotAuthorizedException;
 import io.aiven.klaw.model.ApiResponse;
 import io.aiven.klaw.model.TopicInfo;
-import io.aiven.klaw.model.enums.AclPatternType;
-import io.aiven.klaw.model.enums.Order;
-import io.aiven.klaw.model.enums.RequestOperationType;
-import io.aiven.klaw.model.enums.RequestStatus;
+import io.aiven.klaw.model.enums.*;
 import io.aiven.klaw.model.requests.TopicClaimRequestModel;
 import io.aiven.klaw.model.requests.TopicCreateRequestModel;
 import io.aiven.klaw.model.requests.TopicDeleteRequestModel;
@@ -233,11 +230,16 @@ public ResponseEntity<List<List<TopicInfo>>> getTopics(
       @RequestParam(value = "currentPage", defaultValue = "") String currentPage,
       @RequestParam(value = "topicnamesearch", required = false) String topicNameSearch,
       @RequestParam(value = "teamId", required = false) Integer teamId,
-      @RequestParam(value = "topicType", required = false) String topicType) {
+      @RequestParam(value = "topicType", required = false) AclType topicType) throws KlawNotAuthorizedException {
 
     return new ResponseEntity<>(
         topicControllerService.getTopics(
-            envId, pageNo, currentPage, topicNameSearch, teamId, topicType),
+            envId,
+            pageNo,
+            currentPage,
+            topicNameSearch,
+            teamId,
+            topicType != null ? topicType.value : null),
         HttpStatus.OK);
   }
 

diff --git a/core/src/main/java/io/aiven/klaw/service/TopicControllerService.java b/core/src/main/java/io/aiven/klaw/service/TopicControllerService.java
@@ -1080,9 +1080,10 @@ public List<List<TopicInfo>> getTopics(
       String currentPage,
       String topicNameSearch,
       Integer teamId,
-      String topicType) {
+      String topicType) throws KlawNotAuthorizedException {
     log.debug("getTopics {}", topicNameSearch);
     String userName = getUserName();
+    checkIsAuthorized(PermissionType.VIEW_TOPICS);
     List<TopicInfo> topicListUpdated =
         getTopicsPaginated(
             env,

diff --git a/core/src/main/resources/static/js/browseTopics.js b/core/src/main/resources/static/js/browseTopics.js
@@ -259,11 +259,11 @@ app.controller("browseTopicsCtrl", function($scope, $http, $location, $window) {
                         }
                         else if (sParameterName[0] === "producer")
                         {
-                            topicType = 'Producer';
+                            topicType = 'PRODUCER';
                         }
                         else if (sParameterName[0] === "consumer")
                         {
-                            topicType = 'Consumer';
+                            topicType = 'CONSUMER';
                         }
                     }
         }

diff --git a/core/src/test/java/io/aiven/klaw/controller/TopicControllerTest.java b/core/src/test/java/io/aiven/klaw/controller/TopicControllerTest.java
@@ -248,7 +248,6 @@ public void getTopics() throws Exception {
                 .param("pageNo", "1")
                 .param("topicnamesearch", "testtopic")
                 .param("teamId", "1001")
-                .param("topicType", "")
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().isOk())

diff --git a/openapi.yaml b/openapi.yaml
@@ -2822,7 +2822,8 @@
           "in" : "query",
           "required" : false,
           "schema" : {
-            "type" : "string"
+            "type" : "string",
+            "enum" : [ "PRODUCER", "CONSUMER" ]
           }
         } ],
         "responses" : {