foosinn/mac4nick
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Stefan Schwarz 2020-08-21 20:02:44 +02:00
parent c4d44c68a0
commit c67fcc6fa3
7 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/routes.rs
View file

@ -1,8 +1,8 @@
use crate::db;
use crate::forms::ChangeForm;
use crate::middleware::ForwardAuthInfo;
use crate::session::Session;
use crate::templates::IndexTemplate;
use crate::USER;
use tide::Redirect;
pub async fn healthz(_request: crate::Request) -> tide::Result {
@ -10,16 +10,16 @@ pub async fn healthz(_request: crate::Request) -> tide::Result {
}
pub async fn index(mut request: crate::Request) -> tide::Result {
let my = db::Device::for_user(USER)
let forward_auth: &ForwardAuthInfo = request.ext().unwrap();
let nickname = forward_auth.nickname.clone();
let my = db::Device::for_user(&nickname)
.fetch_all(&request.state().pool)
.await
.map_err(|err| dbg!(err))?;
.await?;
let unassinged = db::AliveDevice::unassinged()
.fetch_all(&request.state().pool)
.await
.map_err(|err| dbg!(err))?;
.await?;
let messages = Session::from(&mut request).pop_messages();
Ok(IndexTemplate::new(my, unassinged, messages).into())
Ok(IndexTemplate::new(nickname, my, unassinged, messages).into())
}
pub async fn change(mut request: crate::Request) -> tide::Result {