wip

googleapis · Sep 16, 2024 · 9a13951 · 9a13951
1 parent db1674b
commit 9a13951
Showing 1 changed file with 39 additions and 33 deletions.
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java
@@ -183,40 +183,25 @@ public static ClientContext create(StubSettings settings) throws IOException {
               "You can not provide both ApiKey and Credentials for a client.");
     }
     if (apiKey != null) {
+      // if API key exists it becomes the default credential
       credentials = ApiKeyCredentials.create(settings.getApiKey());
-    } else {
-      // check if need to adjust credentials for Gdch audience
-      String settingsGdchApiAudience = settings.getGdchApiAudience();
-      boolean usingGDCH = credentials instanceof GdchCredentials;
-      if (usingGDCH) {
-        // Can only determine if the GDC-H is being used via the Credentials. The Credentials object
-        // is resolved in the ClientContext and must be passed to the EndpointContext. Rebuild the
-        // endpointContext only on GDC-H flows.
-        endpointContext = endpointContext.withGDCH();
-        // Resolve the new endpoint with the GDC-H flow
-        endpoint = endpointContext.resolvedEndpoint();
-        // We recompute the GdchCredentials with the audience
-        String audienceString;
-        if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
-          audienceString = settingsGdchApiAudience;
-        } else if (!Strings.isNullOrEmpty(endpoint)) {
-          audienceString = endpoint;
-        } else {
-          throw new IllegalArgumentException("Could not infer GDCH api audience from settings");
-        }
-
-        URI gdchAudienceUri;
-        try {
-          gdchAudienceUri = URI.create(audienceString);
-        } catch (IllegalArgumentException ex) { // thrown when passing a malformed uri string
-          throw new IllegalArgumentException(
-              "The GDC-H API audience string is not a valid URI", ex);
-        }
-        credentials = ((GdchCredentials) credentials).createWithGdchAudience(gdchAudienceUri);
-      } else if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
-        throw new IllegalArgumentException(
-            "GDC-H API audience can only be set when using GdchCredentials");
-      }
+    }
+
+    // check if need to adjust credentials/endpoint/endpointContext for GDC-H
+    String settingsGdchApiAudience = settings.getGdchApiAudience();
+    boolean usingGDCH = credentials instanceof GdchCredentials;
+    if (usingGDCH) {
+      // Can only determine if the GDC-H is being used via the Credentials. The Credentials object
+      // is resolved in the ClientContext and must be passed to the EndpointContext. Rebuild the
+      // endpointContext only on GDC-H flows.
+      endpointContext = endpointContext.withGDCH();
+      // Resolve the new endpoint with the GDC-H flow
+      endpoint = endpointContext.resolvedEndpoint();
+      // We recompute the GdchCredentials with the audience
+      credentials = getGdchCredentials(settingsGdchApiAudience, endpoint, credentials);
+    } else if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
+      throw new IllegalArgumentException(
+          "GDC-H API audience can only be set when using GdchCredentials");
     }
 
     if (settings.getQuotaProjectId() != null && credentials != null) {
@@ -304,6 +289,27 @@ public static ClientContext create(StubSettings settings) throws IOException {
         .build();
   }
 
+  private static Credentials getGdchCredentials(String settingsGdchApiAudience, String endpoint, Credentials credentials) throws IOException {
+    String audienceString;
+    if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
+      audienceString = settingsGdchApiAudience;
+    } else if (!Strings.isNullOrEmpty(endpoint)) {
+      audienceString = endpoint;
+    } else {
+      throw new IllegalArgumentException("Could not infer GDCH api audience from settings");
+    }
+
+    URI gdchAudienceUri;
+    try {
+      gdchAudienceUri = URI.create(audienceString);
+    } catch (IllegalArgumentException ex) { // thrown when passing a malformed uri string
+      throw new IllegalArgumentException(
+          "The GDC-H API audience string is not a valid URI", ex);
+    }
+    credentials = ((GdchCredentials) credentials).createWithGdchAudience(gdchAudienceUri);
+    return credentials;
+  }
+
   /**
    * Getting a header map from HeaderProvider and InternalHeaderProvider from settings with Quota
    * Project Id.