.

gwenneg · Feb 4, 2024 · 518c243 · 518c243
1 parent aefead1
commit 518c243
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/...java/com/redhat/cloud/notifications/connector/webhook/WebhookCloudEventDataExtractor.java b/...java/com/redhat/cloud/notifications/connector/webhook/WebhookCloudEventDataExtractor.java
@@ -85,7 +85,6 @@ private void checkPayload(JsonObject cloudEventData) throws MalformedURLExceptio
     @Deprecated(forRemoval = true)
     private void extractLegacyAuthData(Exchange exchange, JsonObject endpointProperties) {
 
-
         // not blank
 
         if (endpointProperties.containsKey("secret_token")) {

diff --git a/...st/java/com/redhat/cloud/notifications/connector/webhook/AuthenticationProcessorTest.java b/...st/java/com/redhat/cloud/notifications/connector/webhook/AuthenticationProcessorTest.java
@@ -2,11 +2,8 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
-import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.support.DefaultExchange;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;

diff --git a/...rc/main/java/com/redhat/cloud/notifications/processors/webhooks/WebhookTypeProcessor.java b/...rc/main/java/com/redhat/cloud/notifications/processors/webhooks/WebhookTypeProcessor.java
@@ -108,16 +108,16 @@ private static Optional<JsonObject> getAuthentication(WebhookProperties properti
                 "type", BASIC,
                 "secretId", properties.getBasicAuthenticationSourcesId()
             ));
-        } else if (properties.getSecretTokenSourcesId() != null) {
-            return Optional.of(JsonObject.of(
-                "type", SECRET_TOKEN,
-                "secretId", properties.getSecretTokenSourcesId()
-            ));
         } else if (properties.getBearerAuthenticationSourcesId() != null) {
             return Optional.of(JsonObject.of(
                 "type", BEARER,
                 "secretId", properties.getBearerAuthenticationSourcesId()
             ));
+        } else if (properties.getSecretTokenSourcesId() != null) {
+            return Optional.of(JsonObject.of(
+                "type", SECRET_TOKEN,
+                "secretId", properties.getSecretTokenSourcesId()
+            ));
         } else {
             return Optional.empty();
         }