xborder commented on code in PR #4290: URL: https://github.com/apache/arrow-adbc/pull/4290#discussion_r3201661138
########## java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/oauth/OAuthFlowType.java: ########## @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.arrow.adbc.driver.flightsql.oauth; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public enum OAuthFlowType { Review Comment: nimbus already had this in its API. Maybe we could add nimbus as a dependency and use `GrantType.CLIENT_CREDENTIALS`/`GrantType.TOKEN_EXCHANGE` instead of creating our own ########## java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java: ########## @@ -262,54 +276,91 @@ private FlightClient createInitialConnection( } } - // Build the client using the above properties. - final FlightClient client = buildClient(location); - // Add user-specified headers. ArrayList<CallOption> options = new ArrayList<>(); final FlightCallHeaders callHeaders = new FlightCallHeaders(); - for (Map.Entry<String, Object> parameter : parameters.entrySet()) { - if (parameter.getKey().startsWith(FlightSqlConnectionProperties.RPC_CALL_HEADER_PREFIX)) { - String userHeaderName = - parameter - .getKey() - .substring(FlightSqlConnectionProperties.RPC_CALL_HEADER_PREFIX.length()); - - if (parameter.getValue() instanceof String) { - callHeaders.insert(userHeaderName, (String) parameter.getValue()); - } else if (parameter.getValue() instanceof byte[]) { - callHeaders.insert(userHeaderName, (byte[]) parameter.getValue()); - } else { - throw new AdbcException( - String.format( - "Header values must be String or byte[]. The header failing was %s.", - parameter.getKey()), - null, - AdbcStatusCode.INVALID_ARGUMENT, - null, - 0); + String authorizationHeader = null; + String username = null; + String password = null; + String oauthFlow = null; + if (parameters != null) { + for (Map.Entry<String, Object> parameter : parameters.entrySet()) { + if (parameter.getKey().startsWith(FlightSqlConnectionProperties.RPC_CALL_HEADER_PREFIX)) { + String userHeaderName = + parameter + .getKey() + .substring(FlightSqlConnectionProperties.RPC_CALL_HEADER_PREFIX.length()); + + if (parameter.getValue() instanceof String) { + callHeaders.insert(userHeaderName, (String) parameter.getValue()); + } else if (parameter.getValue() instanceof byte[]) { + callHeaders.insert(userHeaderName, (byte[]) parameter.getValue()); + } else { + throw new AdbcException( + String.format( + "Header values must be String or byte[]. The header failing was %s.", + parameter.getKey()), + null, + AdbcStatusCode.INVALID_ARGUMENT, + null, + 0); + } Review Comment: Should we use [ArrowFlightSqlClientHandler.Builder](https://github.com/xborder/arrow-java/blob/main/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java#L638) to create the flight client with all the configurations? I think it would simplify the configuration, creating and managing the flight client ########## java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/oauth/OAuthTokenType.java: ########## @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.arrow.adbc.driver.flightsql.oauth; + +public enum OAuthTokenType { Review Comment: Similarly to GrantType comment, we can use nimbusds [TokenTypeURI](https://www.javadoc.io/static/com.nimbusds/oauth2-oidc-sdk/10.12/com/nimbusds/oauth2/sdk/token/TokenTypeURI.html) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
