Update OkHttp interceptor to add audience to POST body

Author: mpgxvii

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepositoryLegacy.java

@@ -36,7 +36,8 @@
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import okhttp3.Credentials;
- import okhttp3.HttpUrl;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
  import okhttp3.MediaType;
  import okhttp3.OkHttpClient;
  import okhttp3.Request;
@@ -65,6 +66,7 @@ public class ServiceUserRepositoryLegacy implements UserRepository {
    private static final Duration CONNECTION_READ_TIMEOUT = Duration.ofSeconds(90);
 
    private static final String CLIENT_AUDIENCE = "res_restAuthorizer"; 
+   private static final String CLIENT_AUDIENCE_KEY = "audience";
 
    private final OkHttpClient client;
    private final Map<String, OAuth2UserCredentials> cachedCredentials;
@@ -79,16 +81,18 @@ public class ServiceUserRepositoryLegacy implements UserRepository {
    public ServiceUserRepositoryLegacy() {
      this.client = new OkHttpClient.Builder()
           .addInterceptor(chain -> {
-            Request original = chain.request();
-            HttpUrl originalUrl = original.url();
-            HttpUrl newUrl = originalUrl.newBuilder()
-                .addQueryParameter("audience", CLIENT_AUDIENCE)  
-                .build();
-            Request newRequest = original.newBuilder()
-                .url(newUrl)
-                .build();
-            return chain.proceed(newRequest);
-        })
+            Request req = chain.request();
+            if ("POST".equalsIgnoreCase(req.method()) && req.body() instanceof FormBody) {
+                FormBody oldBody = (FormBody) req.body();
+                FormBody.Builder newBody = new FormBody.Builder();
+                for (int i = 0; i < oldBody.size(); i++) {
+                    newBody.addEncoded(oldBody.encodedName(i), oldBody.encodedValue(i));
+                }
+                newBody.add(CLIENT_AUDIENCE_KEY, CLIENT_AUDIENCE);
+                req = req.newBuilder().post(newBody.build()).build();
+            }
+            return chain.proceed(req);
+          })
          .connectTimeout(CONNECTION_TIMEOUT)
          .readTimeout(CONNECTION_READ_TIMEOUT)
          .build();

kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/user/OuraServiceUserRepositoryLegacy.java

@@ -40,7 +40,8 @@
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import okhttp3.Credentials;
- import okhttp3.HttpUrl;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
  import okhttp3.MediaType;
  import okhttp3.OkHttpClient;
  import okhttp3.Request;
@@ -79,6 +80,7 @@ public class OuraServiceUserRepositoryLegacy extends OuraUserRepository {
    private static final Duration CONNECTION_READ_TIMEOUT = Duration.ofSeconds(90);
 
    private static final String CLIENT_AUDIENCE = "res_restAuthorizer"; 
+   private static final String CLIENT_AUDIENCE_KEY = "audience";
 
    private final OkHttpClient client;
    private final Map<String, OAuth2UserCredentials> cachedCredentials;
@@ -93,16 +95,18 @@ public class OuraServiceUserRepositoryLegacy extends OuraUserRepository {
    public OuraServiceUserRepositoryLegacy() {
      this.client = new OkHttpClient.Builder()
           .addInterceptor(chain -> {
-            Request original = chain.request();
-            HttpUrl originalUrl = original.url();
-            HttpUrl newUrl = originalUrl.newBuilder()
-                .addQueryParameter("audience", CLIENT_AUDIENCE)  
-                .build();
-            Request newRequest = original.newBuilder()
-                .url(newUrl)
-                .build();
-            return chain.proceed(newRequest);
-        })
+            Request req = chain.request();
+            if ("POST".equalsIgnoreCase(req.method()) && req.body() instanceof FormBody) {
+                FormBody oldBody = (FormBody) req.body();
+                FormBody.Builder newBody = new FormBody.Builder();
+                for (int i = 0; i < oldBody.size(); i++) {
+                    newBody.addEncoded(oldBody.encodedName(i), oldBody.encodedValue(i));
+                }
+                newBody.add(CLIENT_AUDIENCE_KEY, CLIENT_AUDIENCE);
+                req = req.newBuilder().post(newBody.build()).build();
+            }
+            return chain.proceed(req);
+          })
          .connectTimeout(CONNECTION_TIMEOUT)
          .readTimeout(CONNECTION_READ_TIMEOUT)
          .build();