Merge pull request #554 from mikotoIO/develop

Develop

.github/workflows/docker-superego.yaml

@@ -1,14 +1,14 @@
-name: Build Docker for Superego (Auth)
+name: Build Docker for Superego
 on:
   push:
     paths:
-      - apps/auth/**
+      - apps/superego/**
     branches: ['main']
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: mikotoIO/superego
-  DOCKERFILE: ./apps/auth/Dockerfile
+  DOCKERFILE: ./apps/superego/Dockerfile
 
 jobs:
   build:

.gitignore

@@ -41,7 +41,7 @@ yarn-error.log*
 .env.production.local
 
 # TODO: separate the envfiles
-/apps/auth/.env
+/apps/superego/.env
 
 # turbo
 .turbo

Cargo.toml

@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
     "apps/content-proxy",
-    "apps/auth",
+    "apps/superego",
     "packages/muonic",
     "packages/muonic/macros",
     "packages/muonic/core",

apps/auth/.env.example → apps/superego/.env.example

@@ -3,6 +3,7 @@ PORT=9503
 
 # Services
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/mikoto
+REDIS_URL=redis://localhost:6379
 
 # JWT
 SECRET=biribiribestgirl

apps/auth/Cargo.toml → apps/superego/Cargo.toml

@@ -9,7 +9,7 @@ tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
 async-trait = "0.1.81"
-time = { version = "0.3.36", features = ["serde"] }
+chrono = "0.4.38"
 uuid = { version = "1.8.0", features = ["serde", "v4"] }
 nanoid = "0.4.0"
 hex = "0.4.3"
@@ -21,10 +21,10 @@ log = "0.4.21"
 pretty_env_logger = "0.5.0"
 
 # web server
-axum = { version = "0.7.5", features = ["multipart"] }
+axum = { version = "0.7.5", features = ["ws", "macros", "multipart"] }
 axum-extra = "0.9.3"
 tower-http = { version = "0.5.2", features = ["cors"] }
-schemars = { version = "0.8.21", features = ["uuid1"] }
+schemars = { version = "0.8.21", features = ["uuid1", "chrono"] }
 aide = { version = "0.13.4", features = [
     "scalar",
     "axum",
@@ -53,6 +53,8 @@ hcaptcha = { version = "2.4.7", default-features = false, features = [
     "ext",
     "hex",
 ] }
+futures-util = "0.3.30"
+fred = "9.1.2"
 
 # database
 [dependencies.sqlx]
@@ -62,7 +64,7 @@ features = [
     "tls-rustls",
     "postgres",
     "uuid",
-    "time",
+    "chrono",
     "json",
     "migrate",
 ]

apps/auth/Dockerfile → apps/superego/Dockerfile

@@ -15,7 +15,7 @@ COPY --from=planner /mikoto/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 COPY . .
 
-WORKDIR /mikoto/apps/auth
+WORKDIR /mikoto/apps/superego
 RUN cargo build --release
 
 FROM alpine:latest

apps/auth/src/db.rs → apps/superego/src/db.rs

@@ -1,5 +1,9 @@
 use std::time::Duration;
 
+use fred::{
+    prelude::{ClientLike, RedisClient},
+    types::{Builder, RedisConfig},
+};
 use sqlx::PgPool;
 use tokio::{sync::OnceCell, time::timeout};
 
@@ -30,3 +34,23 @@ pub async fn init() -> Result<&'static PgPool, Error> {
 pub fn db() -> &'static PgPool {
     DB.get().expect("Database not initialized")
 }
+
+static REDIS: OnceCell<RedisClient> = OnceCell::const_new();
+
+pub async fn init_redis() -> Result<&'static RedisClient, Error> {
+    REDIS
+        .get_or_try_init(|| async {
+            let redis = Builder::from_config(
+                RedisConfig::from_url(&env().redis_url).expect("Invalid Redis URL"),
+            )
+            .build()
+            .unwrap();
+            redis.init().await.expect("Failed to connect to Redis");
+            Ok(redis)
+        })
+        .await
+}
+
+pub fn redis() -> &'static RedisClient {
+    REDIS.get().expect("Redis not initialized")
+}

apps/auth/src/entities/account.rs → apps/superego/src/entities/account/mod.rs

@@ -5,6 +5,12 @@ use uuid::Uuid;
 
 use crate::error::Error;
 
+pub mod refresh_token;
+pub mod verification;
+
+pub use refresh_token::*;
+pub use verification::*;
+
 #[derive(FromRow, Serialize, JsonSchema)]
 #[sqlx(rename_all = "camelCase")]
 #[schemars(example = "account_example")]

apps/auth/src/entities/refresh_token.rs → apps/superego/src/entities/account/refresh_token.rs

@@ -1,7 +1,5 @@
-use crate::{
-    error::Error,
-    functions::{primitive_now, sha3::sha3},
-};
+use crate::{error::Error, functions::sha3::sha3};
+use chrono::{NaiveDateTime, TimeDelta, Utc};
 use nanoid::nanoid;
 use sqlx::FromRow;
 use uuid::Uuid;
@@ -11,7 +9,7 @@ use uuid::Uuid;
 pub struct RefreshToken {
     pub id: Uuid,
     pub token: String,
-    pub expires_at: time::PrimitiveDateTime,
+    pub expires_at: NaiveDateTime,
     pub account_id: Uuid,
 }
 
@@ -23,7 +21,7 @@ impl RefreshToken {
                 id: Uuid::new_v4(),
                 token: sha3(&refresh_token),
                 account_id,
-                expires_at: primitive_now() + time::Duration::days(30),
+                expires_at: Utc::now().naive_utc() + TimeDelta::days(30),
             },
             refresh_token,
         )

apps/auth/src/entities/verification.rs → apps/superego/src/entities/account/verification.rs

@@ -1,8 +1,9 @@
+use chrono::{NaiveDateTime, TimeDelta, Utc};
 use nanoid::nanoid;
 use sqlx::FromRow;
 use uuid::Uuid;
 
-use crate::{error::Error, functions::primitive_now};
+use crate::error::Error;
 
 #[derive(FromRow, Serialize)]
 #[sqlx(rename_all = "camelCase")]
@@ -11,7 +12,7 @@ pub struct AccountVerification {
     pub category: String,
     pub token: String,
     pub account_id: Uuid,
-    pub expires_at: time::PrimitiveDateTime,
+    pub expires_at: NaiveDateTime,
 }
 
 impl AccountVerification {
@@ -36,7 +37,7 @@ impl AccountVerification {
             return Err(Error::NotFound);
         }
 
-        if (verification.expires_at - primitive_now()).whole_seconds() < 0 {
+        if (verification.expires_at - Utc::now().naive_utc()).num_seconds() < 0 {
             return Err(Error::NotFound);
         }
 
@@ -52,7 +53,7 @@ impl AccountVerification {
             category: "PASSWORD_RESET".to_string(),
             token: nanoid!(48),
             account_id,
-            expires_at: primitive_now() + time::Duration::hours(1),
+            expires_at: Utc::now().naive_utc() + TimeDelta::hours(1),
         };
         sqlx::query(
             r#"

apps/superego/src/entities/channel.rs

@@ -0,0 +1,33 @@
+use chrono::NaiveDateTime;
+use schemars::JsonSchema;
+use sqlx::prelude::FromRow;
+use uuid::Uuid;
+
+#[derive(sqlx::Type, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+#[sqlx(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum ChannelType {
+    Text,
+    Voice,
+    Document,
+    Application,
+    Thread,
+    Category,
+}
+
+#[derive(FromRow, Serialize, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+#[sqlx(rename_all = "camelCase")]
+pub struct Channel {
+    pub id: Uuid,
+    pub space_id: Uuid,
+
+    pub parent_id: Option<Uuid>,
+    pub order: i32,
+
+    pub name: String,
+    #[serde(rename = "type")]
+    #[sqlx(rename = "type")]
+    pub category: ChannelType,
+    pub last_updated: NaiveDateTime,
+}

apps/auth/src/entities/mod.rs → apps/superego/src/entities/mod.rs

@@ -4,15 +4,15 @@ use uuid::Uuid;
 
 mod account;
 mod bot;
-mod refresh_token;
+mod channel;
+mod space;
 mod user;
-mod verification;
 
 pub use account::*;
 pub use bot::*;
-pub use refresh_token::*;
+pub use channel::*;
+pub use space::*;
 pub use user::*;
-pub use verification::*;
 
 pub struct MultiFactor {
     pub user_id: Uuid,