rm builder and format

3 years ago · 85d535278c
2 changed files with 8 additions and 14 deletions
--- a/server/src/api.rs
+++ b/server/src/api.rs
@ -12,26 +12,17 @@ use serde::Serialize;
 use parking_lot::RwLock;
 use std::sync::Arc;

-
 pub struct API {
-    user_service: Arc<RwLock<user_service::UserService>>
+    user_service: Arc<RwLock<user_service::UserService>>,
 }

 impl API {
    pub fn new() -> API {
        API {
-            user_service: Arc::new(RwLock::new(user_service::UserService::new()))
+            user_service: Arc::new(RwLock::new(user_service::UserService::new())),
        }
    }

-    fn builder<T>(s: T) -> Result<Response<T>, warp::http::Error> {
-        return Response::builder()
-            .header("Access-Control-Allow-Origin", "*")
-            .header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE")
-            .header("Access-Control-Allow-Headers", "*")
-            .body(s);
-    }
-
    fn json<T: Serialize>(t: &T) -> Response<Body> {
        let j = warp::reply::json(t);
        let mut rs = j.into_response();
--- a/server/src/api/auth.rs
+++ b/server/src/api/auth.rs
@ -18,7 +18,9 @@ struct SigninResp {
    token: user_service::AccessToken,
 }

-pub fn get_route(user_service: Arc<RwLock<user_service::UserService>>) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
+pub fn get_route(
+    user_service: Arc<RwLock<user_service::UserService>>,
+) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
    return warp::path!("api" / "auth" / "signin")
        .and(post())
        .and(warp::body::json())
@ -26,8 +28,9 @@ pub fn get_route(user_service: Arc<RwLock<user_service::UserService>>) -> impl F
            let us = user_service.write().login(&user);
            match us {
                Some(token) => api::API::json(&SigninResp { token }),
-                None => api::API::json(&SigninResp { token: "no token".to_string() })
+                None => api::API::json(&SigninResp {
+                    token: "no token".to_string(),
+                }),
            }
-            
        });
 }