From 7f587418daf8e7ddc5e32f06f85e9724c2ecf355 Mon Sep 17 00:00:00 2001 From: Lucas Burns <44355502+lmburns@users.noreply.github.com> Date: Sun, 13 Mar 2022 14:53:49 -0500 Subject: Fix `history list --cwd` errors (#278) --- atuin-server/src/router.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'atuin-server/src/router.rs') 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) -- cgit v1.3.1