fix: use clientId from OIDC config on the server

Author: bevzzz

src/it/java/io/weaviate/integration/OIDCSupportITest.java

@@ -103,11 +103,11 @@ public void test_resourceOwnerPassword() throws Exception {
 
   @Test
   public void test_clientCredentials() throws Exception {
-    Assume.assumeTrue("OKTA_CLIENT_SECRET is not set", OKTA_CLIENT_SECRET != null && !OKTA_CLIENT_SECRET.isBlank());
+    Assume.assumeTrue("OKTA_CLIENT_SECRET is not set", OKTA_CLIENT_SECRET != null && OKTA_CLIENT_SECRET.isBlank());
     Assume.assumeTrue("no internet connection", hasInternetConnection());
 
     // Check norwal client credentials flow works.
-    var cc = Authentication.clientCredentials(OKTA_CLIENT_ID, OKTA_CLIENT_SECRET, List.of());
+    var cc = Authentication.clientCredentials(OKTA_CLIENT_SECRET, List.of());
     var auth = SpyTokenProvider.spyOn(cc);
     pingWeaviate(oktaContainer, auth);
     pingWeaviateAsync(oktaContainer, auth);

src/main/java/io/weaviate/client6/v1/api/Authentication.java

@@ -59,21 +59,20 @@ public static Authentication resourceOwnerPassword(String username, String passw
   /**
    * Authenticate using Client Credentials authorization grant.
    *
-   * @param clientId     Client ID.
    * @param clientSecret Client secret.
    * @param scopes       Client scopes.
    *
    * @return Authentication provider.
    * @throws WeaviateOAuthException if an error occurred at any point while
    *                                obtaining a new token.
    */
-  public static Authentication clientCredentials(String clientId, String clientSecret, List<String> scopes) {
+  public static Authentication clientCredentials(String clientSecret, List<String> scopes) {
     return transport -> {
       OidcConfig oidc = OidcUtils.getConfig(transport).withScopes(scopes);
       if (oidc.scopes().isEmpty() && TokenProvider.isMicrosoft(oidc)) {
-        oidc = oidc.withScopes(clientId + "/.default");
+        oidc = oidc.withScopes(oidc.clientId() + "/.default");
       }
-      return TokenProvider.clientCredentials(oidc, clientId, clientSecret);
+      return TokenProvider.clientCredentials(oidc, clientSecret);
     };
   }
 }

src/main/java/io/weaviate/client6/v1/internal/TokenProvider.java

@@ -145,15 +145,14 @@ public static TokenProvider resourceOwnerPassword(OidcConfig oidc, String userna
    * Create a TokenProvider that uses Client Credentials authorization grant.
    *
    * @param oidc         OIDC config.
-   * @param clientId     Client ID.
    * @param clientSecret Client secret.
    *
    * @return Internal TokenProvider implementation.
    * @throws WeaviateOAuthException if an error occurred at any point while
    *                                obtaining a new token.
    */
-  public static TokenProvider clientCredentials(OidcConfig oidc, String clientId, String clientSecret) {
-    final var provider = NimbusTokenProvider.clientCredentials(oidc, clientId, clientSecret);
+  public static TokenProvider clientCredentials(OidcConfig oidc, String clientSecret) {
+    final var provider = NimbusTokenProvider.clientCredentials(oidc, clientSecret);
     return reuse(null, provider, DEFAULT_EARLY_EXPIRY);
   }
 

src/main/java/io/weaviate/client6/v1/internal/oidc/nimbus/NimbusTokenProvider.java

@@ -55,15 +55,14 @@ public static NimbusTokenProvider resourceOwnerPassword(OidcConfig oidc, String
    * Create a TokenProvider that uses Client Credentials authorization grant.
    *
    * @param oidc         OIDC config.
-   * @param clientId     Client ID.
    * @param clientSecret Client secret.
    *
    * @return A new instance of NimbusTokenProvider. Instances are never cached.
    * @throws WeaviateOAuthException if an error occured at any point of the
    *                                exchange process.
    */
-  public static NimbusTokenProvider clientCredentials(OidcConfig oidc, String clientId, String clientSecret) {
-    return new NimbusTokenProvider(oidc, Flow.clientCredentials(clientId, clientSecret));
+  public static NimbusTokenProvider clientCredentials(OidcConfig oidc, String clientSecret) {
+    return new NimbusTokenProvider(oidc, Flow.clientCredentials(oidc.clientId(), clientSecret));
   }
 
   private NimbusTokenProvider(OidcConfig oidc, Flow flow) {