Don't include domain when authenticating users with an IdP.

Author: Yaytay

query-engine/docs/query-engine-compose.yml

@@ -50,7 +50,7 @@ services:
     - 16686:16686
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.64-2-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.65-main
     ports:
     - 2000:8080
     volumes:

query-engine/src/main/java/uk/co/spudsoft/query/exec/conditions/RequestContextBuilder.java

@@ -270,7 +270,12 @@ private Future<RequestContext> buildRequestContextWithoutCookie(HttpServerReques
       String username = credentials.substring(0, colon);
       String password = credentials.substring(colon + 1);
       int at = username.indexOf("@");
-      String domain = at > 0 ? username.substring(at + 1) : null;
+      String domain = null;
+      String usernameWithoutDomain = username;
+      if (at > 0) {
+        domain = username.substring(at + 1);
+        usernameWithoutDomain = username.substring(0, at);
+      }
       request.pause();
 
       Future<String> tokenFuture = null;
@@ -298,9 +303,9 @@ private Future<RequestContext> buildRequestContextWithoutCookie(HttpServerReques
           return Future.failedFuture(ex);
         }
         if (basicAuthConfig.getGrantType() == BasicAuthGrantType.clientCredentials) {
-          tokenFuture = performClientCredentialsGrant(authEndpoint.getUrl(), username, password);
+          tokenFuture = performClientCredentialsGrant(authEndpoint.getUrl(), usernameWithoutDomain, password);
         } else {
-          tokenFuture = performResourceOwnerPasswordCredentials(authEndpoint, username, password);
+          tokenFuture = performResourceOwnerPasswordCredentials(authEndpoint, usernameWithoutDomain, password);
         }
       }
 
@@ -452,7 +457,7 @@ private Future<String> performResourceOwnerPasswordCredentials(Endpoint authEndp
                 logger.trace("ROPC request to {} returned: {} {}", authEndpoint, response.statusCode(), response.bodyAsString());
                 JsonObject body = response.bodyAsJsonObject();
                 String token = body.getString("access_token");
-                logger.debug("Client {}@{} got token {}", username, authEndpoint, token);
+                logger.debug("User {}@{} got token {}", username, authEndpoint, token);
                 return Future.succeededFuture(token);
               } catch (Throwable ex) {
                 logger.warn("Failed to process client credentials grant for {}@{}: ", username, authEndpoint, ex);

query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java

@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.64-2-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.65-main";
 
   private Version() {
   }