CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-08-15 19:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(http): enable cookies and set origin header (#1192)

Browse Source
This commit is contained in:
Amr Bashir
2024-05-14 01:39:36 +03:00
committed by GitHub
parent 463f5971eb
commit 58330f9ec1
5 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/http/src/commands.rs
+14 -10
View File
@@ -4,19 +4,19 @@
use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc, time::Duration};
use http::{header, HeaderName, HeaderValue, Method, StatusCode};
use http::{header, HeaderName, Method, StatusCode};
use reqwest::{redirect::Policy, NoProxy};
use serde::{Deserialize, Serialize};
use tauri::{
async_runtime::Mutex,
command,
ipc::{CommandScope, GlobalScope},
Manager, ResourceId, Runtime, Webview,
Manager, ResourceId, Runtime, State, Webview,
};
use crate::{
scope::{Entry, Scope},
Error, Result,
Error, Http, Result,
};
struct ReqwestResponse(reqwest::Response);
@@ -138,6 +138,7 @@ fn attach_proxy(
#[command]
pub async fn fetch<R: Runtime>(
webview: Webview<R>,
state: State<'_, Http>,
client_config: ClientConfig,
command_scope: CommandScope<Entry>,
global_scope: GlobalScope<Entry>,
@@ -190,11 +191,15 @@ pub async fn fetch<R: Runtime>(
builder = attach_proxy(proxy_config, builder)?;
}
#[cfg(feature = "cookies")]
{
builder = builder.cookie_provider(state.cookies_jar.clone());
}
let mut request = builder.build()?.request(method.clone(), url);
for (name, value) in &headers {
let name = HeaderName::from_bytes(name.as_bytes())?;
let value = HeaderValue::from_bytes(value.as_bytes())?;
#[cfg(not(feature = "unsafe-headers"))]
if matches!(
name,
@@ -228,22 +233,21 @@ pub async fn fetch<R: Runtime>(
// POST and PUT requests should always have a 0 length content-length,
// if there is no body. https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
if data.is_none() && matches!(method, Method::POST | Method::PUT) {
request = request.header(header::CONTENT_LENGTH, HeaderValue::from(0));
request = request.header(header::CONTENT_LENGTH, 0);
}
if headers.contains_key(header::RANGE.as_str()) {
// https://fetch.spec.whatwg.org/#http-network-or-cache-fetch step 18
// If httpRequest’s header list contains `Range`, then append (`Accept-Encoding`, `identity`)
request = request.header(
header::ACCEPT_ENCODING,
HeaderValue::from_static("identity"),
);
request = request.header(header::ACCEPT_ENCODING, "identity");
}
if !headers.contains_key(header::USER_AGENT.as_str()) {
request = request.header(header::USER_AGENT, HeaderValue::from_static("tauri"));
request = request.header(header::USER_AGENT, "tauri-plugin-http");
}
request = request.header(header::ORIGIN, webview.url().as_str());
if let Some(data) = data {
request = request.body(data);
}