From commits-return-68429-archive-asf-public=cust-asf.ponee.io@camel.apache.org Thu Jan 10 08:31:46 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0A64C18062A for ; Thu, 10 Jan 2019 08:31:45 +0100 (CET) Received: (qmail 56176 invoked by uid 500); 10 Jan 2019 07:31:44 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 56167 invoked by uid 99); 10 Jan 2019 07:31:44 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2019 07:31:44 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 246AF85C2B; Thu, 10 Jan 2019 07:31:44 +0000 (UTC) Date: Thu, 10 Jan 2019 07:31:44 +0000 To: "commits@camel.apache.org" Subject: [camel] branch camel-2.x updated: CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154710550387.4882.10242061159891210124@gitbox.apache.org> From: acosentino@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/camel-2.x X-Git-Reftype: branch X-Git-Oldrev: 7fd1331598848218e5d622e690ec3222456b1503 X-Git-Newrev: 4cc5e5886741040bfd47cb9593ea8efe941797d4 X-Git-Rev: 4cc5e5886741040bfd47cb9593ea8efe941797d4 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 4cc5e58 CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time 4cc5e58 is described below commit 4cc5e5886741040bfd47cb9593ea8efe941797d4 Author: Andrea Cosentino AuthorDate: Thu Jan 10 08:31:07 2019 +0100 CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time --- .../apache/camel/component/slack/SlackComponentVerifierExtension.java | 3 ++- .../camel/component/slack/SlackComponentVerifierExtensionTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java index 143c532..60cea8c 100644 --- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java +++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java @@ -106,7 +106,8 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt } catch (Exception e) { builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid webhookUrl").parameterKey("webhookUrl").build()); } - } else if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) { + } + if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) { String token = (String)parameters.get("token"); try { diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java index 2b546b3..d3e1a56 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.slack; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.camel.Component;