about summary refs log tree commit diff
path: root/web/converse/src/oidc.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-04-05T15·22+0200
committertazjin <mail@tazj.in>2021-04-05T19·19+0000
commita0c4b91955662297ec5bd9249a9488ea6d52defc (patch)
treeda1423cb0b9552ed2215628e449928b3dcc159bf /web/converse/src/oidc.rs
parent5387cc9e7d7ef5ca9ecaeea46132510298902769 (diff)
fix(web/converse): Bare minimum changes to build in 2021 r/2443
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>
Diffstat (limited to 'web/converse/src/oidc.rs')
-rw-r--r--web/converse/src/oidc.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/web/converse/src/oidc.rs b/web/converse/src/oidc.rs
index 970aeb92aa47..849143596895 100644
--- a/web/converse/src/oidc.rs
+++ b/web/converse/src/oidc.rs
@@ -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()?;