Merge branch 'issue-793-client-credentials-support' of https://github.com/vivin/scribejava into vivin-issue-793-client-credentials-support

kullfar · kullfar · commit 665092d61961 · 2017-11-03T19:14:50.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java
@@ -32,6 +32,7 @@ public interface OAuthConstants {
     String REFRESH_TOKEN = "refresh_token";
     String GRANT_TYPE = "grant_type";
     String AUTHORIZATION_CODE = "authorization_code";
+    String CLIENT_CREDENTIALS = "client_credentials";
     String STATE = "state";
     String USERNAME = "username";
     String PASSWORD = "password";
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
@@ -192,6 +192,47 @@ protected OAuthRequest createAccessTokenPasswordGrantRequest(String username, St
         return request;
     }
 
+    public final Future<OAuth2AccessToken> getAccessTokenClientCredentialsGrantAsync() {
+        return getAccessTokenClientCredentialsGrant(null);
+    }
+
+    public final OAuth2AccessToken getAccessTokenClientCredentialsGrant()
+            throws IOException, InterruptedException, ExecutionException {
+        final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest();
+
+        return sendAccessTokenRequestSync(request);
+    }
+
+    /**
+     * Start the request to retrieve the access token using client-credentials grant. The optionally provided callback
+     * will be called with the Token when it is available.
+     *
+     * @param callback optional callback
+     * @return Future
+     */
+    public final Future<OAuth2AccessToken> getAccessTokenClientCredentialsGrant(
+            OAuthAsyncRequestCallback<OAuth2AccessToken> callback) {
+        final OAuthRequest request = createAccessTokenClientCredentialsGrantRequest();
+
+        return sendAccessTokenRequestAsync(request, callback);
+    }
+
+    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);
+        }
+        final String scope = config.getScope();
+        if (scope != null) {
+            request.addParameter(OAuthConstants.SCOPE, scope);
+        }
+        request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.CLIENT_CREDENTIALS);
+        return request;
+    }
+
     /**
      * {@inheritDoc}
      */
