Skip to content

oidc: Use the correct types to compare the status codes in the oidc example #3363

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
merged 4 commits into from
Apr 30, 2024
Merged

oidc: Use the correct types to compare the status codes in the oidc example #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed8c7f1
oidc: Use the correct types to compare the status codes in the oidc e…
poljar Apr 30, 2024
8a9ff74
fixup! oidc: Use the correct types to compare the status codes in the…
poljar Apr 30, 2024
3437bcc
fixup! oidc: Use the correct types to compare the status codes in the…
poljar Apr 30, 2024
f79aaed
fixup! oidc: Use the correct types to compare the status codes in the…
poljar Apr 30, 2024
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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