Skip to content

Commit

Permalink
oidc: Use the correct types to compare the status codes in the oidc …
Browse files Browse the repository at this point in the history
…example (matrix-org#3363)
  • Loading branch information
poljar authored Apr 30, 2024
1 parent 856dd01 commit fb9982f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion examples/oidc_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ anyhow = "1"
axum = "0.7.4"
dirs = "5.0.1"
futures-util = { version = "0.3.21", default-features = false }
http = "1.1.0"
matrix-sdk-ui = { path = "../../crates/matrix-sdk-ui" }
rand = { workspace = true }
serde = { workspace = true }
Expand Down
16 changes: 9 additions & 7 deletions examples/oidc_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ use std::{
};

use anyhow::{anyhow, bail};
use axum::{response::IntoResponse, routing::any_service};
use axum::{
http::{Method, Request, StatusCode},
response::IntoResponse,
routing::any_service,
};
use futures_util::StreamExt;
use http::{Method, StatusCode};
use matrix_sdk::{
config::SyncSettings,
oidc::{
Expand Down Expand Up @@ -681,10 +684,9 @@ async fn build_client(data_dir: &Path) -> anyhow::Result<(Client, ClientSession,
));
}
Err(error) => {
if error
.as_client_api_error()
.is_some_and(|err| err.status_code == StatusCode::NOT_FOUND)
{
if error.as_client_api_error().is_some_and(|err| {
err.status_code == matrix_sdk::reqwest::StatusCode::NOT_FOUND
}) {
println!("This homeserver doesn't advertise an authentication issuer.");
} else {
println!("Error fetching the authentication issuer: {error:?}");
Expand Down Expand Up @@ -839,7 +841,7 @@ async fn spawn_local_server(
};

// Set up the server.
let router = any_service(service_fn(move |request: http::Request<_>| {
let router = any_service(service_fn(move |request: Request<_>| {
let data_tx_mutex = data_tx_mutex.clone();
async move {
// Reject methods others than HEAD or GET.
Expand Down

0 comments on commit fb9982f

Please sign in to comment.