fix(schema): only load schema when user has rights on produce screen (#…

…1600) close #1597
tchiotludo · Nov 19, 2023 · dd374c9 · dd374c9
1 parent 4d031f9
commit dd374c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -19,7 +19,7 @@ class App extends React.Component {
           window.location = uriLogin();
         }
 
-        return error;
+        return Promise.reject(error);
       } catch (e) {
         // Propagate cancel
         if (axios.isCancel(error)) {

diff --git a/client/src/containers/Topic/TopicProduce/TopicProduce.jsx b/client/src/containers/Topic/TopicProduce/TopicProduce.jsx
@@ -48,7 +48,8 @@ class TopicProduce extends Form {
     topicsSearchValue: '',
     multiMessage: false,
     tombstone: false,
-    valuePlaceholder: '{"param": "value"}'
+    valuePlaceholder: '{"param": "value"}',
+    roles: JSON.parse(sessionStorage.getItem('roles'))
   };
 
   schema = {
@@ -62,6 +63,7 @@ class TopicProduce extends Form {
 
   async componentDidMount() {
     const { clusterId, topicId } = this.props.match.params;
+    const { roles } = this.state;
 
     let response = await this.getApi(uriTopicsPartitions(clusterId, topicId));
     let partitions = response.data.map(item => {
@@ -78,7 +80,10 @@ class TopicProduce extends Form {
       }
     });
 
-    await this.getPreferredSchemaForTopic();
+    if (roles.SCHEMA && roles.SCHEMA.includes('READ')) {
+      await this.getPreferredSchemaForTopic();
+    }
+
     const topicEventData = popProduceToTopicValues();
     if (Object.keys(topicEventData).length) {
       await this.initByTopicEvent(topicEventData);
@@ -353,6 +358,8 @@ class TopicProduce extends Form {
   }
 
   renderResults = (results, searchValue, selectedValue, tag) => {
+    const { roles } = this.state;
+
     return (
       <div style={{ maxHeight: '678px', overflowY: 'auto', minHeight: '89px' }}>
         <ul
@@ -391,7 +398,9 @@ class TopicProduce extends Form {
                         } else if (tag === 'topicId') {
                           if (selectedValue !== key) {
                             this.setState({ topicId: key });
-                            this.getPreferredSchemaForTopic();
+                            if (roles.SCHEMA && roles.SCHEMA.includes('READ')) {
+                              this.getPreferredSchemaForTopic();
+                            }
                           }
                         }
                       }}

diff --git a/src/main/java/org/akhq/repositories/RecordRepository.java b/src/main/java/org/akhq/repositories/RecordRepository.java
@@ -636,7 +636,7 @@ public RecordMetadata produce(
             }
         }
 
-        if (value.isPresent() && valueSchema.isPresent()) {
+        if (value.isPresent() && valueSchema.isPresent() && StringUtils.isNotEmpty(valueSchema.get())) {
             Schema schema = schemaRegistryRepository.getLatestVersion(clusterId, valueSchema.get());
             SchemaSerializer valueSerializer = serializerFactory.createSerializer(clusterId, schema.getId());
             valueAsBytes = valueSerializer.serialize(value.get());