From eb7b6966fdb9cfc62023ba0b7aeb4765780098cd Mon Sep 17 00:00:00 2001 From: Austin Liu Date: Sun, 20 Oct 2024 11:30:38 +0800 Subject: [PATCH] Remove PKCE scopes Signed-off-by: Austin Liu --- flyteidl/src/auth.rs | 6 ++++-- flyteidl/src/lib.rs | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/flyteidl/src/auth.rs b/flyteidl/src/auth.rs index 6232b81e69..23202fec01 100644 --- a/flyteidl/src/auth.rs +++ b/flyteidl/src/auth.rs @@ -326,8 +326,10 @@ pub mod auth { .oauth_client .authorize_url(CsrfToken::new_random) // Set the desired scopes. - .add_scope(Scope::new("all".to_string())) - .add_scope(Scope::new("offline".to_string())) + // .add_scope(Scope::new("offline_access".to_string())) + // .add_scope(Scope::new("offline".to_string())) + // .add_scope(Scope::new("all".to_string())) + // .add_scope(Scope::new("openid".to_string())) // Set the PKCE code challenge. .set_pkce_challenge(pkce_challenge) .url(); diff --git a/flyteidl/src/lib.rs b/flyteidl/src/lib.rs index b91fa7bc50..b891541d4a 100644 --- a/flyteidl/src/lib.rs +++ b/flyteidl/src/lib.rs @@ -977,22 +977,22 @@ pub mod _flyteidl_rust { let mut access_token: String = "".to_string(); if !insecure { let cert: Certificate = auth::auth::bootstrap_creds_from_server(&endpoint_uri); - let tls: ClientTlsConfig = ClientTlsConfig::new() - .ca_certificate(cert) - .domain_name((*endpoint).to_string()); - - let channel = match rt.block_on( - Channel::builder(endpoint_uri.clone()) - .tls_config(tls) - .unwrap() - .connect(), - ) { - Ok(ch) => ch, - Err(error) => panic!( - "Failed at connecting to endpoint when constructing secured channel: {:?}", - error - ), - }; + // let tls: ClientTlsConfig = ClientTlsConfig::new() + // .ca_certificate(cert) + // .domain_name((*endpoint).to_string()); + + // let channel = match rt.block_on( + // Channel::builder(endpoint_uri.clone()) + // .tls_config(tls) + // .unwrap() + // .connect(), + // ) { + // Ok(ch) => ch, + // Err(error) => panic!( + // "Failed at connecting to endpoint when constructing secured channel: {:?}", + // error + // ), + // }; let mut oauth_client: auth::auth::OAuthClient = auth::auth::OAuthClient::new( endpoint,