refactor: use same client in CouchDbSessionAuthenticator

Author: mojito317

modules/common/src/main/java/com/ibm/cloud/cloudant/internal/CloudantBaseService.java

@@ -1,5 +1,5 @@
 /**
- * © Copyright IBM Corporation 2020, 2022. All Rights Reserved.
+ * © Copyright IBM Corporation 2020, 2024. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -53,7 +53,9 @@ protected OkHttpClient configureHttpClient() {
         // If we are using a CouchDB session authenticator we need to customize the cookie jar
         customizeAuthenticator(a -> builder
                 .cookieJar(a.getCookieJar()));
-        return builder.build();
+        OkHttpClient client = builder.build();
+        this.setClient(client);
+        return this.getClient();
     }
 
     @Override
@@ -76,10 +78,16 @@ public void setServiceUrl(String serviceUrl) {
         });
     }
 
+    @Override
+    public void setClient(OkHttpClient client) {
+        super.setClient(client);
+        customizeAuthenticator(a -> a.setClient(this.getClient()));
+    }
+
     @Override
     public void configureClient(HttpConfigOptions options) {
         super.configureClient(options);
-        customizeAuthenticator(a -> a.setHttpConfigOptions(options));
+        customizeAuthenticator(a -> a.setClient(this.getClient()));
     }
 
     @Override

modules/common/src/main/java/com/ibm/cloud/cloudant/security/CouchDbSessionAuthenticator.java

@@ -14,8 +14,6 @@
 package com.ibm.cloud.cloudant.security;
 
 import com.google.gson.JsonObject;
-import com.ibm.cloud.sdk.core.http.HttpClientSingleton;
-import com.ibm.cloud.sdk.core.http.HttpConfigOptions;
 import com.ibm.cloud.sdk.core.http.RequestBuilder;
 import com.ibm.cloud.sdk.core.http.ServiceCookieJar;
 import com.ibm.cloud.sdk.core.security.AbstractToken;
@@ -42,8 +40,7 @@
  */
 public class CouchDbSessionAuthenticator
         extends TokenRequestBasedAuthenticator<CouchDbSessionAuthenticator.CouchDbSessionToken,
-        CouchDbSessionAuthenticator.CouchDbSessionToken>
-        implements Authenticator {
+        CouchDbSessionAuthenticator.CouchDbSessionToken> {
 
     public static final String AUTH_TYPE = "COUCHDB_SESSION";
 
@@ -52,7 +49,6 @@ public class CouchDbSessionAuthenticator
     private final ServiceCookieJar cookieJar;
 
     private HttpUrl sessionUrl = null;
-    private HttpConfigOptions options = null;
     private Headers headers = null;
 
     /**
@@ -91,18 +87,6 @@ public ServiceCookieJar getCookieJar() {
         return this.cookieJar;
     }
 
-    /**
-     * Setter to configure this authenticator with HttpConfigOptions. This is called
-     * internally to
-     * apply the configuration options of the
-     * service client automatically.
-     *
-     * @param options
-     */
-    public void setHttpConfigOptions(HttpConfigOptions options) {
-        this.options = options;
-    }
-
     /**
      * Setter to configure this authenticator with a new session URL derived from the supplied
      * service URL. This is called internally to apply the service URL from the
@@ -164,18 +148,6 @@ public CouchDbSessionToken requestToken() {
             }
         }
 
-        // Build the client if we need to
-        if (getClient() == null) {
-            setClient(
-                HttpClientSingleton
-                .getInstance()
-                .configureClient(options)
-                .newBuilder()
-                .cookieJar(cookieJar)
-                .build()
-            );
-        }
-
         try (Response response = getClient().newCall(postSessionbuilder.build()).execute()) {
             if (response.isSuccessful()) {
                 List<Cookie> cookies = Cookie.parseAll(sessionUrl, response.headers());

modules/common/src/test/java/com/ibm/cloud/cloudant/internal/SdkTimeoutTest.java

@@ -39,7 +39,6 @@
 // Every method tests an authenticator.
 public class SdkTimeoutTest {
     final long defaultTimeoutValue = 150L;
-    final long authenticationTimeoutValue = 90L;
     final long customTimeoutValue = 10L;
 
     // Every test case tests a timeout settings.
@@ -163,7 +162,7 @@ void testSessionAuthTimeout() throws NoSuchFieldException, IllegalAccessExceptio
 
             CouchDbSessionAuthenticator auth = (CouchDbSessionAuthenticator) myService.getAuthenticator();
             OkHttpClient c = auth.getClient();
-            assertEquals(TimeUnit.MILLISECONDS.toSeconds(c.readTimeoutMillis()), authenticationTimeoutValue);
+            assertEquals(TimeUnit.MILLISECONDS.toSeconds(c.readTimeoutMillis()), testCases[i]);
         }
     }
 

modules/common/src/test/java/com/ibm/cloud/cloudant/security/CouchDbSessionAuthenticatorTest.java

@@ -16,7 +16,6 @@
 import com.ibm.cloud.cloudant.common.SdkCommon;
 import com.ibm.cloud.cloudant.internal.CloudantBaseService;
 import com.ibm.cloud.cloudant.internal.TestCloudantService;
-import com.ibm.cloud.sdk.core.http.HttpConfigOptions;
 import com.ibm.cloud.sdk.core.http.Response;
 import com.ibm.cloud.sdk.core.security.Authenticator;
 import com.ibm.cloud.sdk.core.service.exception.ServiceResponseException;
@@ -244,21 +243,6 @@ void getCookieJar() {
 
     }
 
-    /**
-     * Test that options set on the client apply to the token request
-     */
-    @Test
-    void setHttpConfigOptions() {
-        CouchDbSessionAuthenticator a =
-                Mockito.spy(testAuthenticator);
-        TestCloudantService testCloudantService = new TestCloudantService("test", a);
-
-        HttpConfigOptions options = new HttpConfigOptions.Builder().build();
-        testCloudantService.configureClient(options);
-        // Verify the setter was called
-        Mockito.verify(a).setHttpConfigOptions(options);
-    }
-
     /**
      * Test that setting default headers for the client apply to the token request
      */