Skip to content

fix(auth-core): Improve auth-core quality #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Jun 16, 2026
+1,896 −214
Merged

fix(auth-core): Improve auth-core quality #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions openstack_sdk/src/openstack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ impl OpenStack {
&client,
self.get_service_endpoint(&ServiceType::Identity, Some(&ApiVersion::from((3, 0))))?
.url(),
HashMap::from([("token".into(), auth.token.clone())]),
&HashMap::from([("token".into(), auth.token.clone())]),
Some(scope),
None,
),
Expand Down Expand Up @@ -394,7 +394,7 @@ impl OpenStack {
Some(&ApiVersion::from(authenticator.api_version())),
)?
.url(),
auth_data,
&auth_data,
Some(&requested_scope),
auth_hints.as_ref(),
),
Expand Down Expand Up @@ -424,7 +424,7 @@ impl OpenStack {
Some(&ApiVersion::from(authenticator.api_version())),
)?
.url(),
auth_data,
&auth_data,
Some(&requested_scope),
Some(&auth_hints),
),
Expand Down Expand Up @@ -766,7 +766,7 @@ mod tests {
};

let token_info = openstack_sdk_auth_core::types::AuthResponse {
token: openstack_sdk_auth_core::types::AuthToken {
token: openstack_sdk_auth_core::types::TokenInfo {
expires_at: Utc::now() + chrono::TimeDelta::hours(1),
project: Some(openstack_sdk_auth_core::types::Project {
id: Some("test-project".into()),
Expand Down
10 changes: 5 additions & 5 deletions openstack_sdk/src/openstack_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ impl AsyncOpenStack {
self.get_service_endpoint(&ServiceType::Identity, Some(&ApiVersion::from((3, 0))))
.await?
.url(),
HashMap::from([("token".into(), auth.token.clone())]),
&HashMap::from([("token".into(), auth.token.clone())]),
Some(scope),
None,
)
Expand Down Expand Up @@ -579,7 +579,7 @@ impl AsyncOpenStack {
)
.await?
.url(),
gather_auth_data(
&gather_auth_data(
&authenticator.requirements(auth_hints.as_ref())?,
&self.config,
auth_helper,
Expand Down Expand Up @@ -608,7 +608,7 @@ impl AsyncOpenStack {
)
.await?
.url(),
gather_auth_data(
&gather_auth_data(
&token_receipt::PLUGIN.requirements(Some(&auth_hints))?,
&self.config,
auth_helper,
Expand Down Expand Up @@ -680,7 +680,7 @@ impl AsyncOpenStack {
}
}
} else {
return Err(AuthError::AuthTokenNotInResponse)?;
return Err(OpenStackError::NoAuth)?;
}

{
Expand Down Expand Up @@ -1045,7 +1045,7 @@ mod tests {
};

let token_info = AuthResponse {
token: openstack_sdk_auth_core::types::AuthToken {
token: openstack_sdk_auth_core::types::TokenInfo {
expires_at: Utc::now() + chrono::TimeDelta::hours(1),
project: Some(openstack_sdk_auth_core::types::Project {
id: Some("test-project".into()),
Expand Down
2 changes: 1 addition & 1 deletion openstack_tui/src/action.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub enum Action {
/// Request rescoping current connection
CloudChangeScope(openstack_sdk::auth::authtoken::AuthTokenScope),
/// New cloud connection established
ConnectedToCloud(Box<openstack_sdk::types::identity::v3::AuthToken>),
ConnectedToCloud(Box<openstack_sdk::types::identity::v3::TokenInfo>),
/// Perform API request
PerformApiRequest(cloud_types::ApiRequest),
/// Propagate single resource data to components
Expand Down
6 changes: 3 additions & 3 deletions sdk/auth-application-credential/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ impl OpenStackAuthType for AppilcationCredentialAuthenticator {
&self,
http_client: &reqwest::Client,
identity_url: &url::Url,
values: std::collections::HashMap<String, SecretString>,
values: &std::collections::HashMap<String, SecretString>,
_scope: Option<&AuthTokenScope>,
_hints: Option<&serde_json::Value>,
) -> Result<Auth, AuthError> {
Expand Down Expand Up @@ -253,7 +253,7 @@ mod tests {
.auth(
&http_client,
&base_url,
HashMap::from([
&HashMap::from([
(
"application_credential_id".into(),
SecretString::from("app_cred_id"),
Expand Down Expand Up @@ -282,7 +282,7 @@ mod tests {
.auth(
&http_client,
&base_url,
HashMap::from([(
&HashMap::from([(
"application_credential_secret".into(),
SecretString::from("secret"),
)]),
Expand Down
Loading
Loading