maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(web/converse): Bare minimum changes to build in 2021

Browse source 
This project depends on Tokio, via actix, and both of those are bad
ideas. This wasn't as clear 3 years ago as it is now, but to
demonstrate it the project has amassed issues which required at least
this minimum of changes to be buildable in 2021 (using a modern
rustc).

Yes, this adds dozens of new dependencies again (because of a
top-level update) but don't worry: They will be gone when I'm done
here.

Change-Id: I1dde9dc0325da7bdcb6608359fab33e27692dc1d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2857
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Vincent Ambo 2021-04-05 17:22:48 +02:00 • committed by tazjin
parent 5387cc9e7d
commit a0c4b91955
7 changed files with 1936 additions and 6664 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/converse/src/oidc.rs
View file

@ -27,8 +27,6 @@ use reqwest;
use url::Url;
use url_serde;
use errors::*;
use reqwest::header::Authorization;
use hyper::header::Bearer;
/// This structure represents the contents of an OIDC discovery
/// document.
@ -130,7 +128,7 @@ impl Handler<RetrieveToken> for OidcExecutor {
let token: TokenResponse = response.json()?;
let user: Userinfo = client.get(&self.oidc_config.userinfo_endpoint)
.header(Authorization(Bearer { token: token.access_token }))
.header("Authorization", format!("Bearer {}", token.access_token ))
.send()?
.json()?;