saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-09 04:23:55 +00:00
Code Activity

Extract client creation to a single place

Browse source
This commit is contained in:
Jake Howard 2021-04-06 21:04:37 +01:00
parent b268c3dd1c
commit 155109dea1
No known key found for this signature in database
GPG key ID: 57AFB45680EDD477
5 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/admin.rs
View file

@ -3,7 +3,7 @@ use serde::de::DeserializeOwned;
use serde_json::Value;
use std::{env, time::Duration};
use reqwest::{blocking::Client, header::USER_AGENT};
use rocket::{
http::{Cookie, Cookies, SameSite},
request::{self, FlashMessage, Form, FromRequest, Outcome, Request},
@ -19,7 +19,7 @@ use crate::{
db::{backup_database, get_sql_server_version, models::*, DbConn, DbConnType},
error::{Error, MapResult},
mail,
util::{format_naive_datetime_local, get_display_size, is_running_in_docker},
util::{format_naive_datetime_local, get_display_size, is_running_in_docker, get_reqwest_client},
CONFIG,
};
@ -469,24 +469,22 @@ struct GitCommit {
}
fn get_github_api<T: DeserializeOwned>(url: &str) -> Result<T, Error> {
let github_api = Client::builder().build()?;
let github_api = get_reqwest_client();
Ok(github_api
.get(url)
.timeout(Duration::from_secs(10))
.header(USER_AGENT, "Bitwarden_RS")
.send()?
.error_for_status()?
.json::<T>()?)
}
fn has_http_access() -> bool {
let http_access = Client::builder().build().unwrap();
let http_access = get_reqwest_client();
match http_access
.head("https://github.com/dani-garcia/bitwarden_rs")
.timeout(Duration::from_secs(10))
.header(USER_AGENT, "Bitwarden_RS")
.send()
{
Ok(r) => r.status().is_success(),