Project properly compiles now

src/auth/mod.rs

@@ -1,68 +1,11 @@
-use rocket::{serde::json::Json, State};
 use serde::Deserialize;
 
-use self::{
-    jwt::{generate_jwt_token, JWTResponse},
-    pass::verify_user,
-};
-use crate::{errors::RbResult, guards::User, RbConfig, RbDbConn};
-
 pub mod jwt;
 pub mod pass;
 
 #[derive(Deserialize)]
 pub struct Credentials
 {
-    username: String,
-    password: String,
-}
-
-#[post("/login")]
-pub async fn already_logged_in(_user: User) -> String
-{
-    String::from("You're already logged in!")
-}
-
-#[post("/login", data = "<credentials>", rank = 2)]
-pub async fn login(
-    conn: RbDbConn,
-    conf: &State<RbConfig>,
-    credentials: Json<Credentials>,
-) -> RbResult<Json<JWTResponse>>
-{
-    let credentials = credentials.into_inner();
-    let jwt = conf.jwt.clone();
-
-    // Get the user, if credentials are valid
-    let user = conn
-        .run(move |c| verify_user(c, &credentials.username, &credentials.password))
-        .await?;
-
-    Ok(Json(
-        conn.run(move |c| generate_jwt_token(c, &jwt, &user))
-            .await?,
-    ))
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RefreshTokenRequest
-{
-    pub refresh_token: String,
-}
-
-#[post("/refresh", data = "<refresh_token_request>")]
-pub async fn refresh_token(
-    conn: RbDbConn,
-    conf: &State<RbConfig>,
-    refresh_token_request: Json<RefreshTokenRequest>,
-) -> RbResult<Json<JWTResponse>>
-{
-    let refresh_token = refresh_token_request.into_inner().refresh_token;
-    let jwt = conf.jwt.clone();
-
-    Ok(Json(
-        conn.run(move |c| crate::auth::jwt::refresh_token(c, &jwt, &refresh_token))
-            .await?,
-    ))
+    pub username: String,
+    pub password: String,
 }

src/auth/pass.rs

@@ -1,11 +1,8 @@
 use argon2::verify_encoded;
 use diesel::PgConnection;
 use rand::{thread_rng, Rng};
-
-use crate::{
-    db,
-    errors::{RbError, RbResult},
-};
+use rb::errors::{RbError, RbResult};
+use rb_gw::db;
 
 pub fn verify_user(conn: &PgConnection, username: &str, password: &str) -> RbResult<db::User>
 {

src/main.rs

@@ -9,6 +9,7 @@ use figment::{
     providers::{Env, Format, Yaml},
     Figment,
 };
+use rb::auth::JwtConf;
 use rocket::{
     fairing::AdHoc,
     http::Status,
@@ -19,10 +20,7 @@ use rocket_sync_db_pools::database;
 use serde::{Deserialize, Serialize};
 
 pub mod auth;
-// pub mod db;
-// pub mod errors;
-// pub mod guards;
-pub(crate) mod schema;
+pub mod v1;
 
 #[database("postgres_rb")]
 pub struct RbDbConn(diesel::PgConnection);
@@ -47,35 +45,27 @@ async fn run_db_migrations(rocket: Rocket<Build>) -> Result<Rocket<Build>, Rocke
     .await
 }
 
-async fn create_admin_user<'a>(rocket: &'a Rocket<Orbit>)
-{
-    let config = rocket.state::<RbConfig>().expect("RbConfig instance");
-    let admin_user = config.admin_user.clone();
-    let admin_pass = config.admin_pass.clone();
+// async fn create_admin_user<'a>(rocket: &'a Rocket<Orbit>)
+// {
+//     let config = rocket.state::<RbConfig>().expect("RbConfig instance");
+//     let admin_user = config.admin_user.clone();
+//     let admin_pass = config.admin_pass.clone();
 
-    let conn = RbDbConn::get_one(&rocket)
-        .await
-        .expect("database connection");
-    conn.run(move |c| {
-        admin::create_admin_user(c, &admin_user, &admin_pass).expect("failed to create admin user")
-    })
-    .await;
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct RbJwtConf
-{
-    key: String,
-    refresh_token_size: usize,
-    refresh_token_expire: i64,
-}
+//     let conn = RbDbConn::get_one(&rocket)
+//         .await
+//         .expect("database connection");
+//     conn.run(move |c| {
+//         admin::create_admin_user(c, &admin_user, &admin_pass).expect("failed to create admin user")
+//     })
+//     .await;
+// }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct RbConfig
 {
     admin_user: String,
     admin_pass: String,
-    jwt: RbJwtConf,
+    jwt: JwtConf,
 }
 
 #[launch]
@@ -95,7 +85,11 @@ fn rocket() -> _
         .attach(AdHoc::config::<RbConfig>())
         .register("/", catchers![default_catcher])
         .mount(
-            "/api/auth",
-            routes![auth::already_logged_in, auth::login, auth::refresh_token,],
+            "/v1/auth",
+            routes![
+                v1::auth::already_logged_in,
+                v1::auth::login,
+                v1::auth::refresh_token,
+            ],
         )
 }

src/v1/auth.rs

@@ -0,0 +1,62 @@
+use rb::{errors::RbResult, guards::User};
+use rocket::{serde::json::Json, State};
+use serde::Deserialize;
+
+use crate::{
+    auth::{
+        jwt::{generate_jwt_token, JWTResponse},
+        pass::verify_user,
+        Credentials,
+    },
+    RbConfig, RbDbConn,
+};
+
+#[post("/login")]
+pub async fn already_logged_in(_user: User) -> String
+{
+    String::from("You're already logged in!")
+}
+
+#[post("/login", data = "<credentials>", rank = 2)]
+pub async fn login(
+    conn: RbDbConn,
+    conf: &State<RbConfig>,
+    credentials: Json<Credentials>,
+) -> RbResult<Json<JWTResponse>>
+{
+    let credentials = credentials.into_inner();
+    let jwt = conf.jwt.clone();
+
+    // Get the user, if credentials are valid
+    let user = conn
+        .run(move |c| verify_user(c, &credentials.username, &credentials.password))
+        .await?;
+
+    Ok(Json(
+        conn.run(move |c| generate_jwt_token(c, &jwt, &user))
+            .await?,
+    ))
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RefreshTokenRequest
+{
+    pub refresh_token: String,
+}
+
+#[post("/refresh", data = "<refresh_token_request>")]
+pub async fn refresh_token(
+    conn: RbDbConn,
+    conf: &State<RbConfig>,
+    refresh_token_request: Json<RefreshTokenRequest>,
+) -> RbResult<Json<JWTResponse>>
+{
+    let refresh_token = refresh_token_request.into_inner().refresh_token;
+    let jwt = conf.jwt.clone();
+
+    Ok(Json(
+        conn.run(move |c| crate::auth::jwt::refresh_token(c, &jwt, &refresh_token))
+            .await?,
+    ))
+}

src/v1/mod.rs

@@ -0,0 +1 @@
+pub mod auth;