added login route and renamed submit token to login token

site/src/api.rs

@@ -1,19 +1,39 @@
 use crate::config::CONFIG;
 use crate::db::*;
 use crate::routes::{id_valid, replace_newlines};
+use actix_identity::Identity;
 use actix_web::{get, http::StatusCode, post, web, web::Form, HttpResponse, Responder};
-use serde::Deserialize;
+use actix_web::{HttpMessage, HttpRequest};
 
-#[derive(Deserialize)]
+use crate::form_data::NewPostForm;
-struct NewPostForm {
+use crate::form_data::{BlogActionForm, LoginForm};
-    title: String,
+
-    body: String,
+#[get("/")]
-    token: String,
+async fn index(user: Option<Identity>) -> impl Responder {
+    if let Some(user) = user {
+        format!("Welcome! {}", user.id().unwrap())
+    } else {
+        "Welcome Anonymous!".to_owned()
+    }
 }
 
-#[derive(Deserialize)]
+#[post("/login")]
-struct BlogActionForm {
+async fn blog_login(form: Form<LoginForm>, req: HttpRequest) -> impl Responder {
-    token: String,
+    let submitted_login_token = form.login_token.clone();
+    if submitted_login_token == CONFIG.login_token {
+        // attach a verified user identity to the active session
+        Identity::login(&req.extensions(), "default_user".into()).unwrap();
+
+        HttpResponse::Ok()
+    } else {
+        HttpResponse::Unauthorized()
+    }
+}
+
+#[post("/logout")]
+async fn blog_logout(user: Identity) -> impl Responder {
+    user.logout();
+    HttpResponse::Ok()
 }
 
 #[post("/api/blog/create")]
@@ -51,12 +71,10 @@ async fn blog_edit_post(post_id: web::Path<String>, form: Form<NewPostForm>) ->
 }
 
 #[post("/api/blog/posts/delete/{post_id}")]
-async fn blog_delete_post(
+async fn blog_delete_post(post_id: web::Path<String>) -> impl Responder {
-    post_id: web::Path<String>,
-    form: Form<BlogActionForm>,
-) -> impl Responder {
     let (valid, id) = id_valid(post_id.into_inner());
-    if valid && CONFIG.submit_token == form.token {
+    // TODO
+    if valid && AUTHENTICATED {
         println!("Deleted post: {}", id);
         delete_post_by_id(id as i32);
     } else {
@@ -86,7 +104,10 @@ async fn blog_hide_post(post_id: web::Path<String>, form: Form<BlogActionForm>)
 }
 
 #[get("/api/blog/posts")]
-async fn blog_get_posts_json() -> impl Responder {
+async fn get_posts_json(user: Option<Identity>) -> impl Responder {
-    let posts = get_all_posts();
+    if let Some(user) = user {
-    HttpResponse::Ok().json(posts)
+        let posts = get_all_posts();
+        HttpResponse::Ok().json(posts)
+    }
+    return HttpResponse::new(StatusCode::UNAUTHORIZED);
 }

site/src/config.rs

@@ -4,7 +4,7 @@ use once_cell::sync::Lazy;
 pub const ENV_PREFIX: &str = "CL_";
 
 pub struct Config {
-    pub submit_token: String,
+    pub login_token: String,
     pub session_secret: String,
     pub root_path: String,
     pub username: String,
@@ -66,7 +66,7 @@ fn load_config() -> Config {
     }
 
     Config {
-        submit_token: eval_conf_var("SUBMIT_TOKEN", true, None).unwrap(),
+        login_token: eval_conf_var("SUBMIT_TOKEN", true, None).unwrap(),
         session_secret: eval_conf_var("SESSION_SECRET", true, None).unwrap(),
         root_path: eval_conf_var("ROOT_PATH", false, Some("./content")).unwrap(),
         username: eval_conf_var("USERNAME", true, None).unwrap(),

site/src/form_data.rs

@@ -0,0 +1,15 @@
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+pub struct LoginForm {
+    pub login_token: String,
+}
+
+#[derive(Deserialize)]
+pub struct NewPostForm {
+    title: String,
+    body: String,
+}
+
+#[derive(Deserialize)]
+pub struct BlogActionForm {}

site/src/main.rs

@@ -1,6 +1,7 @@
 mod api;
 mod config;
 mod db;
+mod form_data;
 mod routes;
 
 #[macro_use]
@@ -44,6 +45,7 @@ async fn main() -> std::io::Result<()> {
             .service(routes::blog_submit)
             .service(routes::blog_edit)
             .service(routes::blog_edit_by_id)
+            .service(api::blog_login)
             .service(api::blog_get_posts_json)
             .service(api::blog_create_post)
             .service(api::blog_edit_post)