aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-server/src
diff options
context:
space:
mode:
authorLucas Burns <44355502+lmburns@users.noreply.github.com>2022-03-13 14:53:49 -0500
committerGitHub <noreply@github.com>2022-03-13 19:53:49 +0000
commit7f587418daf8e7ddc5e32f06f85e9724c2ecf355 (patch)
tree0b99cff50d1507a90409e2efe536da0bed8af1e4 /atuin-server/src
parentUpdate fish bindings. (#265) (diff)
downloadatuin-7f587418daf8e7ddc5e32f06f85e9724c2ecf355.zip
Fix `history list --cwd` errors (#278)
Diffstat (limited to 'atuin-server/src')
-rw-r--r--atuin-server/src/router.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/atuin-server/src/router.rs b/atuin-server/src/router.rs
index 04905a0f..f7e142a0 100644
--- a/atuin-server/src/router.rs
+++ b/atuin-server/src/router.rs
@@ -5,10 +5,11 @@ use warp::{hyper::StatusCode, Filter};
use atuin_common::api::SyncHistoryRequest;
-use super::handlers;
-use super::{database::Database, database::Postgres};
-use crate::models::User;
-use crate::settings::Settings;
+use super::{
+ database::{Database, Postgres},
+ handlers,
+};
+use crate::{models::User, settings::Settings};
fn with_settings(
settings: Settings,
@@ -32,17 +33,15 @@ fn with_user(
async move {
let header: Vec<&str> = header.split(' ').collect();
- let token;
-
- if header.len() == 2 {
+ let token = if header.len() == 2 {
if header[0] != "Token" {
return Err(warp::reject());
}
- token = header[1];
+ header[1]
} else {
return Err(warp::reject());
- }
+ };
let user = postgres
.get_session_user(token)