start account system

Author: char-ptr

.dockerignore

@@ -7,7 +7,7 @@
 **/.DS_Store
 **/.classpath
 **/.dockerignore
-**/.env
+# **/.env
 **/.git
 **/.gitignore
 **/.project

.gitignore

@@ -15,3 +15,5 @@ Cargo.lock
 .env
 # password for db
 db
+.sqlx
+rustc-ice*

Cargo.lock

@@ -18,6 +18,11 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 dotenvy = "0.15"
 thiserror = "1"
 clap = { version = "4", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+uuid = { version = "1", features = ["v4", "serde"] }
+chrono = { version = "0.4", features = ["serde"] }
+
 
 [features]
 postgres = ["sqlx/postgres", "sqlx/uuid"]

Cargo.toml

@@ -22,12 +22,13 @@ WORKDIR /app
 # source code into the container. Once built, copy the executable to an
 # output directory before the cache mounted /app/target is unmounted.
 RUN --mount=type=bind,source=src,target=src \
-    --mount=type=bind,source=migrations,target=migrations \
-    --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
-    --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
-    --mount=type=cache,target=/app/target/ \
-    --mount=type=cache,target=/usr/local/cargo/registry/ \
-    <<EOF
+  --mount=type=bind,source=migrations,target=migrations \
+  --mount=type=bind,source=./.env,target=/app/.env \
+  --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
+  --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
+  --mount=type=cache,target=/app/target/ \
+  --mount=type=cache,target=/usr/local/cargo/registry/ \
+  <<EOF
 set -e
 cargo build --locked --release
 cp ./target/release/$APP_NAME /bin/server
@@ -50,13 +51,13 @@ FROM debian:bullseye-slim AS final
 # See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user
 ARG UID=10001
 RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/nonexistent" \
-    --shell "/sbin/nologin" \
-    --no-create-home \
-    --uid "${UID}" \
-    appuser
+  --disabled-password \
+  --gecos "" \
+  --home "/nonexistent" \
+  --shell "/sbin/nologin" \
+  --no-create-home \
+  --uid "${UID}" \
+  appuser
 USER appuser
 
 # Copy the executable from the "build" stage.

Dockerfile

@@ -13,6 +13,7 @@ services:
       - db-password
     build:
       context: .
+      network: host
       target: final
     command: /bin/server -z db -u postgres --db-pw /run/secrets/db-password -p 5432
     develop:

compose.yaml

@@ -1,5 +1,7 @@
+pub mod user;
 use sqlx::{postgres::PgConnectOptions, PgPool};
 
+//test
 pub async fn init_db(database_opts: PgConnectOptions) -> Result<PgPool, sqlx::Error> {
     let pool = PgPool::connect_with(database_opts).await?;
 

src/db/mod.rs

@@ -70,7 +70,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let app_router = construct_router(db_pool);
     let listener = tokio::net::TcpListener::bind("0.0.0.0:6087").await.unwrap();
-    println!("Server running on port 6087 so true fr");
+    println!("Server running on port 6087");
     axum::serve(listener, app_router).await.unwrap();
     Ok(())
 }

src/main.rs

@@ -0,0 +1,22 @@
+use axum::{extract::State, Json};
+use serde::Deserialize;
+use sqlx::PgPool;
+
+use crate::db::user::User;
+
+#[derive(Deserialize, Debug)]
+pub struct RegisterData {
+    username: String,
+    password: String,
+    first_name: Option<String>,
+    content_key: String,
+}
+
+pub async fn register(State(db): State<PgPool>, Json(reg_data): Json<RegisterData>) {
+    let new_user = User::new(
+        reg_data.username,
+        reg_data.password,
+        reg_data.content_key,
+        reg_data.first_name,
+    );
+}

src/routes/account.rs

@@ -1,12 +1,20 @@
-use axum::{handler::Handler, routing::get, Router};
+pub mod account;
+use axum::{
+    handler::Handler,
+    routing::{get, post},
+    Router,
+};
 use sqlx::PgPool;
 
+use self::account::register;
+
 pub async fn test_route() -> &'static str {
     "server works"
 }
 
 pub fn construct_router(db: PgPool) -> Router {
-    let router = Router::new().route("/test", get(test_route)).with_state(db);
-
-    router
+    Router::new()
+        .route("/account/register", post(register))
+        .route("/test", get(test_route))
+        .with_state(db)
 }