This is an automated email from the ASF dual-hosted git repository.
jeremyross pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d3889fc6854 CAMEL-18687: camel-salesforce: Support Client Credentials
d3889fc6854 is described below
commit d3889fc685498bdf83bbd942fe1fe3cc253e5594
Author: Jeremy Ross <[email protected]>
AuthorDate: Tue Jan 3 14:20:01 2023 -0600
CAMEL-18687: camel-salesforce: Support Client Credentials
Salesforce supports Client Credentials OAuth flow as of Winter '23
---
.../component/salesforce/AuthenticationType.java | 3 +-
.../salesforce/SalesforceLoginConfig.java | 8 ++++
.../salesforce/internal/SalesforceSession.java | 4 ++
...sforceClientCredentialsFlowIntegrationTest.java | 51 ++++++++++++++++++++++
.../salesforce/SalesforceLoginConfigTest.java | 11 +++++
5 files changed, 76 insertions(+), 1 deletion(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/AuthenticationType.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/AuthenticationType.java
index 8aefd1f0b97..d0b3ee685e6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/AuthenticationType.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/AuthenticationType.java
@@ -19,5 +19,6 @@ package org.apache.camel.component.salesforce;
public enum AuthenticationType {
USERNAME_PASSWORD,
REFRESH_TOKEN,
- JWT
+ JWT,
+ CLIENT_CREDENTIALS
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java
index b969aaa6d7e..cc036e43b1f 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceLoginConfig.java
@@ -164,6 +164,7 @@ public class SalesforceLoginConfig {
final boolean hasPassword = ObjectHelper.isNotEmpty(password);
final boolean hasRefreshToken = ObjectHelper.isNotEmpty(refreshToken);
final boolean hasKeystore = keystore != null &&
ObjectHelper.isNotEmpty(keystore.getResource());
+ final boolean hasClientCredentials = ObjectHelper.isNotEmpty(clientId)
&& ObjectHelper.isNotEmpty(clientSecret);
if (hasPassword && !hasRefreshToken && !hasKeystore) {
return AuthenticationType.USERNAME_PASSWORD;
@@ -177,6 +178,10 @@ public class SalesforceLoginConfig {
return AuthenticationType.JWT;
}
+ if (!hasPassword && !hasRefreshToken && !hasKeystore &&
hasClientCredentials) {
+ return AuthenticationType.CLIENT_CREDENTIALS;
+ }
+
if (hasPassword && hasRefreshToken || hasPassword && hasKeystore ||
hasRefreshToken && hasKeystore) {
throw new IllegalArgumentException(
"The provided authentication configuration can be used in
multiple ways"
@@ -253,6 +258,9 @@ public class SalesforceLoginConfig {
ObjectHelper.notNull(userName, "userName (JWT
authentication)");
ObjectHelper.notNull(keystore, "keystore (JWT
authentication)");
break;
+ case CLIENT_CREDENTIALS:
+ ObjectHelper.notNull(clientSecret, "clientSecret (Client
Credentials authentication)");
+ break;
default:
throw new IllegalArgumentException("Unknown authentication
type: " + type);
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 40728627a05..03e2b6e1dff 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -168,6 +168,10 @@ public class SalesforceSession extends ServiceSupport {
fields.put("grant_type",
"urn:ietf:params:oauth:grant-type:jwt-bearer");
fields.put("assertion", generateJwtAssertion());
break;
+ case CLIENT_CREDENTIALS:
+ fields.put("grant_type", "client_credentials");
+ fields.put("client_secret", config.getClientSecret());
+ break;
default:
throw new IllegalArgumentException("Unsupported login
configuration type: " + type);
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java
new file mode 100644
index 00000000000..3c665d1ca0f
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceClientCredentialsFlowIntegrationTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.salesforce;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.salesforce.api.dto.Limits;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class SalesforceClientCredentialsFlowIntegrationTest extends
CamelTestSupport {
+
+ @Test
+ public void shouldLoginUsingJwtBearerToken() {
+ final Limits limits = template.requestBody("salesforce:limits", null,
Limits.class);
+
+ assertNotNull(limits);
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ final CamelContext camelContext = super.createCamelContext();
+
+ final SalesforceComponent salesforce = new SalesforceComponent();
+ final SalesforceLoginConfig loginConfig =
LoginConfigHelper.getLoginConfig();
+
+ // force authentication type to Client Credentials
+ loginConfig.setType(AuthenticationType.CLIENT_CREDENTIALS);
+
+ salesforce.setLoginConfig(loginConfig);
+
+ camelContext.addComponent("salesforce", salesforce);
+
+ return camelContext;
+ }
+}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceLoginConfigTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceLoginConfigTest.java
index be328973a49..01f37ae1349 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceLoginConfigTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceLoginConfigTest.java
@@ -30,6 +30,8 @@ public class SalesforceLoginConfigTest {
final SalesforceLoginConfig usernamePassword;
+ final SalesforceLoginConfig clientCredentials;
+
public SalesforceLoginConfigTest() {
usernamePassword = new SalesforceLoginConfig();
usernamePassword.setUserName("userName");
@@ -49,6 +51,10 @@ public class SalesforceLoginConfigTest {
keystore.setResource("keystore.jks");
jwt.setKeystore(keystore);
jwt.setClientId("clientId");
+
+ clientCredentials = new SalesforceLoginConfig();
+ clientCredentials.setClientId("clientId");
+ clientCredentials.setClientSecret("clientSecret");
}
@Test
@@ -75,6 +81,11 @@ public class SalesforceLoginConfigTest {
usernamePassword.validate();
}
+ @Test
+ public void shouldValidateClientCredentials() {
+ clientCredentials.validate();
+ }
+
@Test
public void doestNotLeakPassword() {
String superSecretText = "thisShouldNotLeak";