send client credentials in grant_type=password optionally (in case they were issued and are not nulls)

s-gromov · s-gromov · commit abc4b5bc554f · 2016-05-23T19:33:34.000+03:00
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
@@ -172,11 +172,14 @@ protected <T extends AbstractRequest> T createAccessTokenPasswordGrantRequest(St
 
         request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.PASSWORD);
 
-        request.addHeader(OAuthConstants.HEADER,
-                OAuthConstants.BASIC + ' '
-                + Base64Encoder.getInstance()
-                .encode(String.format("%s:%s", config.getApiKey(), config.getApiSecret())
-                        .getBytes(Charset.forName("UTF-8"))));
+        final String apiKey = config.getApiKey();
+        final String apiSecret = config.getApiSecret();
+        if (apiKey != null && apiSecret != null) {
+            request.addHeader(OAuthConstants.HEADER,
+                    OAuthConstants.BASIC + ' '
+                    + Base64Encoder.getInstance()
+                    .encode(String.format("%s:%s", apiKey, apiSecret).getBytes(Charset.forName("UTF-8"))));
+        }
 
         return request;
     }
