add support for client_credentials grant type (thanks to https://github.com/vivin)

kullfar · kullfar · commit 68919e633149 · 2017-11-03T19:23:47.000+03:00
diff --git a/changelog b/changelog
@@ -5,6 +5,7 @@
  * add PKCE (RFC 7636) support (Proof Key for Code Exchange by OAuth Public Clients) (thanks for suggesting to https://github.com/dieseldjango)
  * switch to use HTTP Basic Authorization by default in requests with need of
    (2.3.  Client Authentication) https://tools.ietf.org/html/rfc6749#section-2.3 Can be overrided in API class
+ * add support for client_credentials grant type (thanks to https://github.com/vivin)
 
 [4.2.0]
  * DELETE in JdkClient permits, but not requires payload (thanks to https://github.com/miguelD73)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteClientCredentialsGrantExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteClientCredentialsGrantExample.java
@@ -0,0 +1,37 @@
+package com.github.scribejava.apis.examples;
+
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.apis.VkontakteApi;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+public final class VkontakteClientCredentialsGrantExample {
+
+    private static final String NETWORK_NAME = "Vkontakte.ru";
+
+    private VkontakteClientCredentialsGrantExample() {
+    }
+
+    public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
+        // Replace these with your client id and secret
+        final String clientId = "your client id";
+        final String clientSecret = "your client secret";
+        final OAuth20Service service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret)
+                .scope("wall,offline") // replace with desired scope
+                .callback("http://your.site.com/callback")
+                .build(VkontakteApi.instance());
+
+        System.out.println("=== " + NETWORK_NAME + "'s OAuth Workflow ===");
+        System.out.println();
+        final OAuth2AccessToken accessToken = service.getAccessTokenClientCredentialsGrant();
+
+        System.out.println("Got the Access Token!");
+        System.out.println(accessToken);
+        System.out.println();
+
+        System.out.println("Thats it man! Go and build something awesome with ScribeJava! :)");
+    }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
@@ -220,11 +220,9 @@ public final Future<OAuth2AccessToken> getAccessTokenClientCredentialsGrant(
     protected OAuthRequest createAccessTokenClientCredentialsGrantRequest() {
         final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
         final OAuthConfig config = getConfig();
-        request.addParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
-        final String apiSecret = config.getApiSecret();
-        if (apiSecret != null) {
-            request.addParameter(OAuthConstants.CLIENT_SECRET, apiSecret);
-        }
+
+        api.getClientAuthenticationType().addClientAuthentication(request, config);
+
         final String scope = config.getScope();
         if (scope != null) {
             request.addParameter(OAuthConstants.SCOPE, scope);
