rest-api: clean up

starters/rest-api/migration/src/lib.rs

@@ -3,16 +3,12 @@
 pub use sea_orm_migration::prelude::*;
 
 mod m20220101_000001_users;
-mod m20231103_114510_notes;
 
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![
-            Box::new(m20220101_000001_users::Migration),
-            Box::new(m20231103_114510_notes::Migration),
-        ]
+        vec![Box::new(m20220101_000001_users::Migration)]
     }
 }

starters/rest-api/src/app.rs

@@ -14,12 +14,7 @@ use loco_rs::{
 use migration::Migrator;
 use sea_orm::DatabaseConnection;
 
-use crate::{
-    controllers,
-    models::_entities::{notes, users},
-    tasks,
-    workers::downloader::DownloadWorker,
-};
+use crate::{controllers, models::_entities::users, tasks, workers::downloader::DownloadWorker};
 
 pub struct App;
 #[async_trait]
@@ -45,9 +40,7 @@ impl Hooks for App {
     fn routes(_ctx: &AppContext) -> AppRoutes {
         AppRoutes::with_default_routes()
             .prefix("/api")
-            .add_route(controllers::notes::routes())
             .add_route(controllers::auth::routes())
-            .add_route(controllers::user::routes())
     }
 
     async fn connect_workers(ctx: &AppContext, queue: &Queue) -> Result<()> {
@@ -61,13 +54,11 @@ impl Hooks for App {
 
     async fn truncate(db: &DatabaseConnection) -> Result<()> {
         truncate_table(db, users::Entity).await?;
-        truncate_table(db, notes::Entity).await?;
         Ok(())
     }
 
     async fn seed(db: &DatabaseConnection, base: &Path) -> Result<()> {
         db::seed::<users::ActiveModel>(db, &base.join("users.yaml").display().to_string()).await?;
-        db::seed::<notes::ActiveModel>(db, &base.join("notes.yaml").display().to_string()).await?;
         Ok(())
     }
 }

starters/rest-api/src/controllers/auth.rs

@@ -8,7 +8,7 @@ use crate::{
         _entities::users,
         users::{LoginParams, RegisterParams},
     },
-    views::auth::LoginResponse,
+    views::auth::{CurrentResponse, LoginResponse},
 };
 #[derive(Debug, Deserialize, Serialize)]
 pub struct VerifyParams {
@@ -139,6 +139,12 @@ async fn login(State(ctx): State<AppContext>, Json(params): Json<LoginParams>) -
     format::json(LoginResponse::new(&user, &token))
 }
 
+#[debug_handler]
+async fn current(auth: auth::JWT, State(ctx): State<AppContext>) -> Result<Response> {
+    let user = users::Model::find_by_pid(&ctx.db, &auth.claims.pid).await?;
+    format::json(CurrentResponse::new(&user))
+}
+
 pub fn routes() -> Routes {
     Routes::new()
         .prefix("auth")
@@ -147,4 +153,5 @@ pub fn routes() -> Routes {
         .add("/login", post(login))
         .add("/forgot", post(forgot))
         .add("/reset", post(reset))
+        .add("/current", get(current))
 }

starters/rest-api/src/controllers/mod.rs

@@ -1,3 +1 @@
 pub mod auth;
-pub mod notes;
-pub mod user;

starters/rest-api/src/models/_entities/mod.rs

@@ -2,5 +2,4 @@
 
 pub mod prelude;
 
-pub mod notes;
 pub mod users;

starters/rest-api/src/models/_entities/prelude.rs

@@ -1,4 +1,3 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0
 
-pub use super::notes::Entity as Notes;
 pub use super::users::Entity as Users;

starters/rest-api/src/models/mod.rs

@@ -1,3 +1,2 @@
 pub mod _entities;
-pub mod notes;
 pub mod users;

starters/rest-api/src/views/auth.rs

@@ -21,3 +21,21 @@ impl LoginResponse {
         }
     }
 }
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct CurrentResponse {
+    pub pid: String,
+    pub name: String,
+    pub email: String,
+}
+
+impl CurrentResponse {
+    #[must_use]
+    pub fn new(user: &users::Model) -> Self {
+        Self {
+            pid: user.pid.to_string(),
+            name: user.name.clone(),
+            email: user.email.clone(),
+        }
+    }
+}

starters/rest-api/src/views/mod.rs

@@ -1,2 +1 @@
 pub mod auth;
-pub mod user;