an attempt to fix old auth behavior

Author: KSDaemon

packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts

@@ -213,7 +213,8 @@ export class DatabricksDriver extends JDBCDriver {
       url = url.replace('jdbc:spark://', 'jdbc:databricks://');
     }
 
-    const [uid, pwd, cleanedUrl] = extractAndRemoveUidPwdFromJdbcUrl(url);
+    // eslint-disable-next-line prefer-const
+    let [uid, pwd, cleanedUrl] = extractAndRemoveUidPwdFromJdbcUrl(url);
     const passwd = conf?.token ||
           getEnv('databricksToken', { dataSource }) ||
           pwd;
@@ -236,6 +237,7 @@ export class DatabricksDriver extends JDBCDriver {
     // For magic numbers below - see Databricks docs:
     // https://docs.databricks.com/aws/en/integrations/jdbc-oss/configure#authenticate-the-driver
     if (oauthClientId) {
+      cleanedUrl = cleanedUrl.replace(/;?AuthMech=[^;]*/i, '');
       authProps = {
         OAuth2ClientID: oauthClientId,
         OAuth2Secret: oauthClientSecret,
@@ -244,9 +246,8 @@ export class DatabricksDriver extends JDBCDriver {
       };
     } else {
       authProps = {
-        user,
+        UID: user,
         PWD: passwd,
-        AuthMech: 3,
       };
     }
 

packages/cubejs-databricks-jdbc-driver/src/helpers.ts

@@ -48,8 +48,7 @@ export function extractAndRemoveUidPwdFromJdbcUrl(jdbcUrl: string): [uid: string
 
   const cleanedUrl = jdbcUrl
     .replace(/;?UID=[^;]*/i, '')
-    .replace(/;?PWD=[^;]*/i, '')
-    .replace(/;?AuthMech=[^;]*/i, '');
+    .replace(/;?PWD=[^;]*/i, '');
 
   return [uid, pwd, cleanedUrl];
 }