From b9b3347dc25a744be8e32410d691dfe1941a7a03 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Wed, 28 Oct 2020 13:28:21 -0400 Subject: [PATCH] formatting --- src/gitea.rs | 3 +-- src/jwt.rs | 7 +++---- src/models.rs | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gitea.rs b/src/gitea.rs index 87702c5..0b2ca59 100644 --- a/src/gitea.rs +++ b/src/gitea.rs @@ -16,8 +16,7 @@ pub struct User { } pub fn user(token: String) -> std::io::Result { - let resp = - ureq::get("https://tulpa.dev/api/v1/user") + let resp = ureq::get("https://tulpa.dev/api/v1/user") .set("Authorization", &format!("bearer {}", token)) .call(); if !resp.ok() { diff --git a/src/jwt.rs b/src/jwt.rs index af8ccfb..b30f251 100644 --- a/src/jwt.rs +++ b/src/jwt.rs @@ -1,13 +1,13 @@ -use crate::{MainDatabase, models, schema}; +use crate::{models, schema, MainDatabase}; use color_eyre::eyre::{eyre, Result}; use diesel::prelude::*; +use hmac::{Hmac, NewMac}; use jwt::{SignWithKey, VerifyWithKey}; use lazy_static::lazy_static; -use std::env; -use hmac::{Hmac, NewMac}; use sha2::Sha256; use std::collections::BTreeMap; +use std::env; lazy_static! { pub static ref SECRET: String = env::var("JWT_SECRET") @@ -15,7 +15,6 @@ lazy_static! { .to_string(); } - #[tracing::instrument] pub fn make(user_id: uuid::Uuid, token_id: uuid::Uuid) -> Result { let key: Hmac = Hmac::new_varkey(&*SECRET.as_bytes()).unwrap(); diff --git a/src/models.rs b/src/models.rs index da3a86e..f34effe 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,4 +1,4 @@ -use crate::schema::{gitea_tokens, users, tokens}; +use crate::schema::{gitea_tokens, tokens, users}; use chrono::NaiveDateTime; use serde::Serialize; use uuid::Uuid; @@ -26,7 +26,7 @@ pub struct User { } #[derive(Insertable)] -#[table_name="gitea_tokens"] +#[table_name = "gitea_tokens"] pub struct NewGiteaToken { pub user_id: Uuid, pub access_token: String, @@ -44,7 +44,7 @@ pub struct GiteaToken { } #[derive(Insertable)] -#[table_name="tokens"] +#[table_name = "tokens"] pub struct NewToken { pub user_id: Uuid, }