Added auth to endpoints

service/src/auth/model.rs

@@ -79,9 +79,30 @@ impl InsertUser {
   }
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ResponseUser {
+  pub email: String,
+  pub role: String,
+  pub first_name: String,
+  pub last_name: String,
+}
+
+impl From<QueryUser> for ResponseUser {
+  fn from(user: QueryUser) -> Self {
+    ResponseUser {
+      email: user.email,
+      role: user.role,
+      first_name: user.first_name,
+      last_name: user.last_name,
+    }
+  }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct JwtAuth {
-  pub access_token_uuid: uuid::Uuid
+  pub access_token_uuid: uuid::Uuid,
+  pub email: String,
+  pub role: String,
 }
 
 impl FromRequest for JwtAuth {
@@ -140,8 +161,8 @@ impl FromRequest for JwtAuth {
     };
 
     match QueryUser::get_by_email(&user_email) {
-      Ok(_) => {
-        ready(Ok(JwtAuth { access_token_uuid }))
+      Ok(user) => {
+        ready(Ok(JwtAuth { access_token_uuid, email: user.email, role: user.role }))
       }
       Err(err) => return ready(Err(ActixError::from(ServiceError {
         status: 500,

service/src/auth/routes.rs

@@ -5,7 +5,7 @@ use log::error;
 use redis::AsyncCommands;
 use siren::ServiceError;
 
-use crate::{auth::{LoginRequest, RegisterUser, InsertUser, QueryUser, verify_password, generate_token, JwtAuth}, db};
+use crate::{auth::{LoginRequest, RegisterUser, InsertUser, QueryUser, verify_password, generate_token, JwtAuth, ResponseUser}, db};
 
 #[post("/register")]
 async fn register(user: web::Json<RegisterUser>) -> HttpResponse {
@@ -96,17 +96,17 @@ async fn login(request: web::Json<LoginRequest>) -> HttpResponse {
 
       let access_cookie = Cookie::build("access_token", access_token_details.token.clone().unwrap())
         .path("/")
-        .max_age(Duration::new(access_token_max_age, 0))
+        .max_age(Duration::new(access_token_max_age * 60, 0))
         .http_only(true)
         .finish();
       let refresh_cookie = Cookie::build("refresh_token", refresh_token_details.token.clone().unwrap())
         .path("/")
-        .max_age(Duration::new(refresh_token_max_age, 0))
+        .max_age(Duration::new(refresh_token_max_age * 60, 0))
         .http_only(true)
         .finish();
       let logged_in_cookie = Cookie::build("logged_in", "true")
         .path("/")
-        .max_age(Duration::new(access_token_max_age, 0))
+        .max_age(Duration::new(access_token_max_age * 60, 0))
         .http_only(false)
         .finish();
 
@@ -135,10 +135,24 @@ async fn logout(req: HttpRequest, auth: JwtAuth) -> HttpResponse {
 
 #[get("/me")]
 async fn me(auth: JwtAuth) -> HttpResponse {
-  HttpResponse::Ok().json(auth)
+  let query_user = match QueryUser::get_by_email(&auth.email) {
+    Ok(user) => user,
+    Err(err) => return ResponseError::error_response(&err)
+  };
+  let user: ResponseUser = query_user.into();
+  HttpResponse::Ok().json(user)
 }
 
 pub fn init_routes(config: &mut web::ServiceConfig) {
+  let r = RegisterUser {
+    email: "admin".to_string(),
+    password: "admin".to_string(),
+    first_name: "Admin".to_string(),
+    last_name: "Admin".to_string(),
+  };
+  let mut u = r.convert_to_insert().unwrap();
+  u.role = "admin".to_string();
+  let _ = InsertUser::insert(u);
   config.service(web::scope("auth")
     .service(register)
     .service(login)