update

Author: Amit-CloudSufi

src/main/java/io/cdap/plugin/http/common/BaseHttpConfig.java

@@ -468,5 +468,6 @@ private void validateOAuth2Fields(FailureCollector failureCollector) {
                     reasonOauth2GrantType, failureCollector);
             }
         }
+        failureCollector.getOrThrowException();
     }
 }

src/main/java/io/cdap/plugin/http/common/OAuthGrantType.java

@@ -34,7 +34,7 @@ public enum OAuthGrantType implements EnumWithValue {
   }
 
   public static OAuthGrantType getGrantType(String oauth2GrantType) {
-    if (Objects.equals(oauth2GrantType, REFRESH_TOKEN.getLabel())) {
+    if (oauth2GrantType == null || Objects.equals(oauth2GrantType, REFRESH_TOKEN.getLabel())) {
       return REFRESH_TOKEN;
     } else {
       return CLIENT_CREDENTIALS;

src/main/java/io/cdap/plugin/http/common/http/HttpClient.java

@@ -136,9 +136,9 @@ public CloseableHttpClient createHttpClient(String pageUriStr) throws IOExceptio
     ArrayList<Header> clientHeaders = new ArrayList<>();
     // oAuth2
     if (config.getOauth2Enabled()) {
+      AccessToken oauthAccessToken = OAuthUtil.getAccessToken(HttpClients.createDefault(), config);
       clientHeaders.add(new BasicHeader("Authorization",
-          "Bearer " + OAuthUtil.getAccessToken(HttpClients.createDefault(), config)
-              .getTokenValue()));
+          String.format("Bearer %s", oauthAccessToken.getTokenValue())));
     }
     httpClientBuilder.setDefaultHeaders(clientHeaders);
     return httpClientBuilder.build();

src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.JsonElement;
 import io.cdap.plugin.http.common.BaseHttpConfig;
+import io.cdap.plugin.http.common.OAuthClientAuthentication;
 import io.cdap.plugin.http.common.OAuthGrantType;
 import io.cdap.plugin.http.common.pagination.page.JSONUtil;
 import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
@@ -30,7 +31,6 @@
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
@@ -41,11 +41,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.annotation.Nullable;
 
 /**
@@ -101,32 +102,30 @@ private static AccessToken getAccessTokenByClientCredentials(CloseableHttpClient
       String tokenUrl, String clientId, String clientSecret, String scope,
       String clientAuthentication) throws IOException {
     URI uri;
+    HttpPost httppost;
     try {
-      uri = new URIBuilder(tokenUrl).build();
+      if (Objects.equals(clientAuthentication, OAuthClientAuthentication.BODY.getValue())) {
+        uri = new URIBuilder(tokenUrl).build();
+        List<BasicNameValuePair> nameValuePairs = new ArrayList<>();
+        nameValuePairs.add(new BasicNameValuePair("scope", scope));
+        nameValuePairs.add(
+            new BasicNameValuePair("grant_type", OAuthGrantType.CLIENT_CREDENTIALS.getValue()));
+        nameValuePairs.add(new BasicNameValuePair("client_id", clientId));
+        nameValuePairs.add(new BasicNameValuePair("client_secret", clientSecret));
+        httppost = new HttpPost(uri);
+        httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+      } else {
+        uri = new URIBuilder(tokenUrl).setParameter("client_id", clientId)
+            .setParameter("client_secret", clientSecret)
+            .setParameter("grant_type", OAuthGrantType.CLIENT_CREDENTIALS.getValue()).build();
+        httppost = new HttpPost(uri);
+      }
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException(
           "Failed to build access token URI for OAuth2 with grant type = "
               + OAuthGrantType.CLIENT_CREDENTIALS.getValue(), e);
-    } catch (NullPointerException e) {
-      throw new IllegalArgumentException(
-          "One or more required OAuth2 parameters (Client ID, Client Secret, "
-              + "or Token URL) are missing.", e);
     }
 
-    HttpPost httppost = new HttpPost(uri);
-    List<BasicNameValuePair> nameValuePairs = new ArrayList<>();
-    nameValuePairs.add(new BasicNameValuePair("scope", scope));
-    nameValuePairs.add(
-        new BasicNameValuePair("grant_type", OAuthGrantType.CLIENT_CREDENTIALS.getValue()));
-    nameValuePairs.add(new BasicNameValuePair("client_authentication", clientAuthentication));
-
-    httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
-
-    String authorizationKey =
-        "Basic " + Base64.getEncoder().encodeToString((clientId + ":" + clientSecret).getBytes());
-
-    httppost.addHeader(new BasicHeader("Authorization", authorizationKey));
-
     CloseableHttpResponse response = httpclient.execute(httppost);
     String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
 
@@ -139,9 +138,12 @@ private static AccessToken getAccessTokenByClientCredentials(CloseableHttpClient
     JsonElement expiresInElement = JSONUtil.toJsonObject(responseString).get("expires_in");
     Date expiresInDate = null;
     if (expiresInElement != null) {
-      long expiresAtMilliseconds =
-          System.currentTimeMillis() + (long) (expiresInElement.getAsInt() * 1000) - 60000L;
-      expiresInDate = new Date(expiresAtMilliseconds);
+      Instant now = Instant.now();
+      Duration expiresIn = Duration.ofSeconds(expiresInElement.getAsInt());
+      Duration buffer = Duration.ofMinutes(1);
+
+      Instant expiresAt = now.plus(expiresIn).minus(buffer);
+      expiresInDate = Date.from(expiresAt);
     }
 
     return new AccessToken(accessTokenElement.getAsString(), expiresInDate);
@@ -188,10 +190,6 @@ public static AccessToken getAccessTokenByRefreshToken(CloseableHttpClient httpc
               .build();
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException("Failed to build token URI for OAuth2", e);
-    } catch (NullPointerException e) {
-      throw new IllegalArgumentException(
-          "One or more required OAuth2 parameters (Auth URL, Token URL, Client ID, Client Secret, "
-              + "or Refresh Token) are missing.", e);
     }
 
     HttpPost httppost = new HttpPost(uri);
@@ -206,9 +204,12 @@ public static AccessToken getAccessTokenByRefreshToken(CloseableHttpClient httpc
     JsonElement expiresInElement = JSONUtil.toJsonObject(responseString).get("expires_in");
     Date expiresInDate = null;
     if (expiresInElement != null) {
-      long expiresAtMilliseconds = System.currentTimeMillis()
-              + (long) (expiresInElement.getAsInt() * 1000) - 60000L;
-      expiresInDate = new Date(expiresAtMilliseconds);
+      Instant now = Instant.now();
+      Duration expiresIn = Duration.ofSeconds(expiresInElement.getAsInt());
+      Duration buffer = Duration.ofMinutes(1);
+
+      Instant expiresAt = now.plus(expiresIn).minus(buffer);
+      expiresInDate = Date.from(expiresAt);
     }
 
     return new AccessToken(accessTokenElement.getAsString(), expiresInDate);