feat: with lua

Signed-off-by: kjuulh <contact@kjuulh.io>

.cargo/config.toml

@@ -1,3 +0,0 @@
-[target.x86_64-unknown-linux-gnu]
-linker = "/usr/bin/clang"
-rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]

.drone.yml

@@ -1,3 +1,88 @@
-kind: template
+kind: pipeline
-load: drone-template.yaml
+name: default
-name: como
+type: docker
+
+steps:
+  - name: load_secret
+    image: debian:buster-slim
+    volumes:
+      - name: ssh
+        path: /root/.ssh/
+    environment:
+      SSH_KEY:
+        from_secret: gitea_id_ed25519
+    commands:
+      - mkdir -p $HOME/.ssh/
+      - echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519
+
+  - name: build
+    image: kasperhermansen/cuddle:latest
+    pull: always
+    volumes:
+      - name: ssh
+        path: /root/.ssh/
+      - name: dockersock
+        path: /var/run
+    commands:
+      - apk add bash git
+      - git remote set-url origin $DRONE_GIT_SSH_URL
+      - cuddle_cli x setup_ssh
+      - cuddle_cli x start_deployment
+      - cuddle_cli x render_templates
+      - cuddle_cli x render_como_templates
+      - cuddle_cli x build_release
+      - cuddle_cli x push_release
+      - cuddle_cli x deploy_release
+    environment:
+      DOCKER_BUILDKIT: 1
+      DOCKER_USERNAME:
+        from_secret: docker_username
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+      SSH_KEY:
+        from_secret: gitea_id_ed25519
+
+  - name: push_tags
+    image: kasperhermansen/drone-semantic-release:latest
+    pull: always
+    volumes:
+      - name: ssh
+        path: /root/.ssh/
+      - name: dockersock
+        path: /var/run
+    commands:
+      - semantic-release --no-ci
+    environment:
+      DOCKER_BUILDKIT: 1
+      SSH_KEY:
+        from_secret: gitea_id_ed25519
+    depends_on:
+      - build
+
+  - name: send telegram notification
+    image: appleboy/drone-telegram
+    settings:
+      token:
+        from_secret: telegram_token
+      to: 2129601481
+      format: markdown
+    depends_on:
+      - build
+      - push_tags
+    when:
+      status: [failure, success]
+
+services:
+- name: docker
+  image: docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+volumes:
+  - name: ssh
+    temp: {}
+  - name: dockersock
+    temp: {}
+
+

Cargo.toml

@@ -6,7 +6,6 @@ members = [
   "como_infrastructure",
   "como_gql",
   "como_api",
-  "como_auth",
 ]
 resolver = "2"
 
@@ -17,7 +16,6 @@ como_domain = { path = "./como_domain/" }
 como_infrastructure = { path = "./como_infrastructure/" }
 como_gql = { path = "./como_gql/" }
 como_api = { path = "./como_api/" }
-como_auth = { path = "./como_auth/" }
 
 async-trait = "0.1.68"
 async-graphql = { version = "5.0.9", features = ["uuid"] }
@@ -53,6 +51,3 @@ clap = { version = "4.3.0", features = ["derive", "env"] }
 
 argon2 = { version = "0.5.0" }
 rand_core = { version = "0.6.4" }
-
-pretty_assertions = "1.4.0"
-sealed_test = "1.0.0"

como_api/Cargo.toml

@@ -10,9 +10,7 @@ como_gql.workspace = true
 como_core.workspace = true
 como_domain.workspace = true
 como_infrastructure.workspace = true
-como_auth.workspace = true
 
-async-trait.workspace = true
 async-graphql.workspace = true
 async-graphql-axum.workspace = true
 axum.workspace = true

como_api/src/controllers/auth.rs

@@ -1,63 +1,43 @@
-use std::fmt::Display;
+use std::borrow::Cow;
 
 use crate::router::AppState;
+use crate::zitadel::{IntrospectionConfig, IntrospectionState};
 
+use async_sqlx_session::PostgresSessionStore;
 use axum::extract::{FromRef, FromRequestParts, Query, State};
-
 use axum::headers::authorization::Basic;
 use axum::headers::{Authorization, Cookie};
 use axum::http::request::Parts;
 use axum::http::StatusCode;
-
+use axum::http::{header::SET_COOKIE, HeaderMap};
-use axum::response::{ErrorResponse, IntoResponse, Redirect};
+use axum::response::{IntoResponse, Redirect};
 use axum::routing::get;
-use axum::{async_trait, Json, RequestPartsExt, Router, TypedHeader};
+use axum::{async_trait, RequestPartsExt, Router, TypedHeader};
-
+use axum_sessions::async_session::{Session, SessionStore};
 use como_domain::users::User;
 use como_infrastructure::register::ServiceRegister;
-
+use oauth2::basic::BasicClient;
+use oauth2::{reqwest::async_http_client, AuthorizationCode, CsrfToken, Scope, TokenResponse};
+use oauth2::{RedirectUrl, TokenIntrospectionResponse};
 use serde::Deserialize;
-use serde_json::json;
+use zitadel::oidc::introspection::introspect;
 
 #[derive(Debug, Deserialize)]
 pub struct ZitadelAuthParams {
-    #[allow(dead_code)]
     return_url: Option<String>,
 }
 
-trait AnyhowExtensions<T, E>
+pub async fn zitadel_auth(State(client): State<BasicClient>) -> impl IntoResponse {
-where
+    let (auth_url, _csrf_token) = client
-    E: Display,
+        .authorize_url(CsrfToken::new_random)
-{
+        .add_scope(Scope::new("identify".to_string()))
-    fn into_response(self) -> Result<T, ErrorResponse>;
+        .add_scope(Scope::new("openid".to_string()))
-}
+        .url();
-impl<T, E> AnyhowExtensions<T, E> for anyhow::Result<T, E>
+
-where
+    Redirect::to(auth_url.as_ref())
-    E: Display,
-{
-    fn into_response(self) -> Result<T, ErrorResponse> {
-        match self {
-            Ok(o) => Ok(o),
-            Err(e) => {
-                tracing::error!("failed with anyhow error: {}", e);
-                Err(ErrorResponse::from((
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    Json(json!({
-                        "status": "something",
-                    })),
-                )))
-            }
-        }
-    }
 }
 
-pub async fn zitadel_auth(
+pub static COOKIE_NAME: &str = "SESSION";
-    State(services): State<ServiceRegister>,
-) -> Result<impl IntoResponse, ErrorResponse> {
-    let url = services.auth_service.login().await.into_response()?;
-
-    Ok(Redirect::to(&url.to_string()))
-}
 
 #[derive(Debug, Deserialize)]
 #[allow(dead_code)]
@@ -68,15 +48,45 @@ pub struct AuthRequest {
 
 pub async fn login_authorized(
     Query(query): Query<AuthRequest>,
-    State(services): State<ServiceRegister>,
+    State(store): State<PostgresSessionStore>,
-) -> Result<impl IntoResponse, ErrorResponse> {
+    State(oauth_client): State<BasicClient>,
-    let (headers, url) = services
+    State(introspection_state): State<IntrospectionState>,
-        .auth_service
+) -> impl IntoResponse {
-        .login_authorized(&query.code, &query.state)
+    let token = oauth_client
+        .exchange_code(AuthorizationCode::new(query.code.clone()))
+        .request_async(async_http_client)
         .await
-        .into_response()?;
+        .unwrap();
 
-    Ok((headers, Redirect::to(url.as_str())))
+    let config = IntrospectionConfig::from_ref(&introspection_state);
+
+    let res = introspect(
+        &config.introspection_uri,
+        &config.authority,
+        &config.authentication,
+        token.access_token().secret(),
+    )
+    .await
+    .unwrap();
+
+    let mut session = Session::new();
+    session
+        .insert(
+            "user",
+            User {
+                id: res.sub().unwrap().into(),
+            },
+        )
+        .unwrap();
+
+    let cookie = store.store_session(session).await.unwrap().unwrap();
+
+    let cookie = format!("{}={}; SameSite=Lax; Path=/", COOKIE_NAME, cookie);
+
+    let mut headers = HeaderMap::new();
+    headers.insert(SET_COOKIE, cookie.parse().unwrap());
+
+    (headers, Redirect::to("http://localhost:3000/dash/home"))
 }
 
 pub struct AuthController;
@@ -97,64 +107,80 @@ pub struct UserFromSession {
     pub user: User,
 }
 
-pub static COOKIE_NAME: &str = "SESSION";
-
 #[async_trait]
 impl<S> FromRequestParts<S> for UserFromSession
 where
-    ServiceRegister: FromRef<S>,
+    PostgresSessionStore: FromRef<S>,
+    BasicClient: FromRef<S>,
+    IntrospectionState: FromRef<S>,
     S: Send + Sync,
 {
     type Rejection = (StatusCode, &'static str);
 
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        let services = ServiceRegister::from_ref(state);
+        let store = PostgresSessionStore::from_ref(state);
 
         let cookie: Option<TypedHeader<Cookie>> = parts.extract().await.unwrap();
+
         let session_cookie = cookie.as_ref().and_then(|cookie| cookie.get(COOKIE_NAME));
         if let None = session_cookie {
+            let introspection_state = IntrospectionState::from_ref(state);
+
             let basic: Option<TypedHeader<Authorization<Basic>>> = parts.extract().await.unwrap();
 
             if let Some(basic) = basic {
-                let token = services
+                let config = IntrospectionConfig::from_ref(&introspection_state);
-                    .auth_service
+
-                    .login_token(basic.username(), basic.password())
+                let res = introspect(
-                    .await
+                    &config.introspection_uri,
-                    .into_response()
+                    &config.authority,
-                    .map_err(|_| {
+                    &config.authentication,
-                        (
+                    basic.password(),
-                            StatusCode::INTERNAL_SERVER_ERROR,
+                )
-                            "could not get token from basic",
+                .await
-                        )
+                .unwrap();
-                    })?;
 
                 return Ok(UserFromSession {
-                    user: User { id: token },
+                    user: User {
+                        id: res.sub().unwrap().into(),
+                    },
                 });
             }
 
-            return Err(anyhow::anyhow!("No session was found"))
+            return Err((StatusCode::UNAUTHORIZED, "No session was found"));
-                .into_response()
-                .map_err(|_| (StatusCode::INTERNAL_SERVER_ERROR, "did not find a cookie"))?;
         }
 
         let session_cookie = session_cookie.unwrap();
 
+        tracing::debug!(
+            "UserFromSession: got session cookie from user agent, {}={}",
+            COOKIE_NAME,
+            session_cookie
+        );
         // continue to decode the session cookie
-        let user = services
+        let user =
-            .auth_service
+            if let Some(session) = store.load_session(session_cookie.to_owned()).await.unwrap() {
-            .get_user_from_session(session_cookie)
+                if let Some(user) = session.get::<User>("user") {
-            .await
+                    tracing::debug!(
-            .into_response()
+                        "UserFromSession: session decoded success, user_id={:?}",
-            .map_err(|_| {
+                        user.id
-                (
+                    );
-                    StatusCode::INTERNAL_SERVER_ERROR,
+                    user
-                    "failed to decode session cookie",
+                } else {
-                )
+                    return Err((
-            })?;
+                        StatusCode::INTERNAL_SERVER_ERROR,
+                        "No `user_id` found in session",
+                    ));
+                }
+            } else {
+                tracing::debug!(
+                    "UserIdFromSession: err session not exists in store, {}={}",
+                    COOKIE_NAME,
+                    session_cookie
+                );
+                return Err((StatusCode::BAD_REQUEST, "No session found for cookie"));
+            };
 
-        Ok(UserFromSession {
+        Ok(UserFromSession { user })
-            user: User { id: user.id },
-        })
     }
 }

como_api/src/router.rs

@@ -1,15 +1,19 @@
 use std::env;
 
 use anyhow::Context;
+use async_sqlx_session::PostgresSessionStore;
 use axum::extract::FromRef;
 use axum::http::{HeaderValue, Method};
 use axum::Router;
 use como_infrastructure::register::ServiceRegister;
+use oauth2::basic::BasicClient;
 use tower::ServiceBuilder;
 use tower_http::{cors::CorsLayer, trace::TraceLayer};
 
 use crate::controllers::auth::AuthController;
 use crate::controllers::graphql::GraphQLController;
+use crate::zitadel::client::oauth_client;
+use crate::zitadel::{IntrospectionState, IntrospectionStateBuilder};
 
 pub struct Api;
 
@@ -19,8 +23,20 @@ impl Api {
         cors_origin: &str,
         service_register: ServiceRegister,
     ) -> anyhow::Result<()> {
+        let client_id = env::var("CLIENT_ID").expect("Missing CLIENT_ID!");
+        let client_secret = env::var("CLIENT_SECRET").expect("Missing CLIENT_SECRET!");
+        let zitadel_url = env::var("ZITADEL_URL").expect("missing ZITADEL_URL");
+
+        let is = IntrospectionStateBuilder::new(&zitadel_url)
+            .with_basic_auth(&client_id, &client_secret)
+            .build()
+            .await?;
+
+        let oauth_client = oauth_client();
         let app_state = AppState {
-            service_register: service_register.clone(),
+            oauth_client,
+            store: service_register.session_store.clone(),
+            introspection_state: is,
         };
 
         let router = Router::new()
@@ -63,11 +79,25 @@ impl Api {
 
 #[derive(Clone)]
 pub struct AppState {
-    service_register: ServiceRegister,
+    oauth_client: BasicClient,
+    introspection_state: IntrospectionState,
+    store: PostgresSessionStore,
 }
 
-impl FromRef<AppState> for ServiceRegister {
+impl FromRef<AppState> for BasicClient {
-    fn from_ref(input: &AppState) -> Self {
+    fn from_ref(state: &AppState) -> Self {
-        input.service_register.clone()
+        state.oauth_client.clone()
+    }
+}
+
+impl FromRef<AppState> for PostgresSessionStore {
+    fn from_ref(state: &AppState) -> Self {
+        state.store.clone()
+    }
+}
+
+impl FromRef<AppState> for IntrospectionState {
+    fn from_ref(input: &AppState) -> Self {
+        input.introspection_state.clone()
     }
 }

como_api/src/zitadel/client.rs

@@ -1,54 +1,7 @@
-use async_trait::async_trait;
 use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
-use std::{env, ops::Deref, sync::Arc};
+use std::env;
 
-#[async_trait]
+pub fn oauth_client() -> BasicClient {
-pub trait OAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()>;
-}
-
-pub struct OAuth(Arc<dyn OAuthClient + Send + Sync + 'static>);
-
-impl OAuth {
-    pub fn new_zitadel() -> Self {
-        Self(Arc::new(ZitadelOAuthClient {
-            client: oauth_client(),
-        }))
-    }
-    pub fn new_noop() -> Self {
-        Self(Arc::new(NoopOAuthClient {}))
-    }
-}
-
-impl Deref for OAuth {
-    type Target = Arc<dyn OAuthClient + Send + Sync + 'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub struct NoopOAuthClient;
-
-#[async_trait]
-impl OAuthClient for NoopOAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()> {
-        Ok(())
-    }
-}
-
-pub struct ZitadelOAuthClient {
-    client: BasicClient,
-}
-
-#[async_trait]
-impl OAuthClient for ZitadelOAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()> {
-        Ok(())
-    }
-}
-
-fn oauth_client() -> BasicClient {
     let client_id = env::var("CLIENT_ID").expect("Missing CLIENT_ID!");
     let client_secret = env::var("CLIENT_SECRET").expect("Missing CLIENT_SECRET!");
     let redirect_url = env::var("REDIRECT_URL").expect("missing REDIRECT_URL");

como_api/src/zitadel/mod.rs

@@ -1 +1,90 @@
+pub mod client;
 
+use axum::extract::FromRef;
+use openidconnect::IntrospectionUrl;
+use zitadel::{
+    axum::introspection::IntrospectionStateBuilderError,
+    credentials::Application,
+    oidc::{discovery::discover, introspection::AuthorityAuthentication},
+};
+
+#[derive(Clone, Debug)]
+pub struct IntrospectionState {
+    pub(crate) config: IntrospectionConfig,
+}
+
+/// Configuration that must be inject into the axum application state. Used by the
+/// [IntrospectionStateBuilder](super::IntrospectionStateBuilder). This struct is also used to create the [IntrospectionState](IntrospectionState)
+#[derive(Debug, Clone)]
+pub struct IntrospectionConfig {
+    pub(crate) authority: String,
+    pub(crate) authentication: AuthorityAuthentication,
+    pub(crate) introspection_uri: IntrospectionUrl,
+}
+
+impl FromRef<IntrospectionState> for IntrospectionConfig {
+    fn from_ref(input: &IntrospectionState) -> Self {
+        input.config.clone()
+    }
+}
+
+pub struct IntrospectionStateBuilder {
+    authority: String,
+    authentication: Option<AuthorityAuthentication>,
+}
+
+/// Builder for [IntrospectionConfig]
+impl IntrospectionStateBuilder {
+    pub fn new(authority: &str) -> Self {
+        Self {
+            authority: authority.to_string(),
+            authentication: None,
+        }
+    }
+
+    pub fn with_basic_auth(
+        &mut self,
+        client_id: &str,
+        client_secret: &str,
+    ) -> &mut IntrospectionStateBuilder {
+        self.authentication = Some(AuthorityAuthentication::Basic {
+            client_id: client_id.to_string(),
+            client_secret: client_secret.to_string(),
+        });
+
+        self
+    }
+
+    pub fn with_jwt_profile(&mut self, application: Application) -> &mut IntrospectionStateBuilder {
+        self.authentication = Some(AuthorityAuthentication::JWTProfile { application });
+
+        self
+    }
+
+    pub async fn build(&mut self) -> Result<IntrospectionState, IntrospectionStateBuilderError> {
+        if self.authentication.is_none() {
+            return Err(IntrospectionStateBuilderError::NoAuthSchema);
+        }
+
+        let metadata = discover(&self.authority)
+            .await
+            .map_err(|source| IntrospectionStateBuilderError::Discovery { source })?;
+
+        let introspection_uri = metadata
+            .additional_metadata()
+            .introspection_endpoint
+            .clone();
+
+        if introspection_uri.is_none() {
+            return Err(IntrospectionStateBuilderError::NoIntrospectionUrl);
+        }
+
+        Ok(IntrospectionState {
+            config: IntrospectionConfig {
+                authority: self.authority.clone(),
+                introspection_uri: introspection_uri.unwrap(),
+                authentication: self.authentication.as_ref().unwrap().clone(),
+            },
+        })
+    }
+}

como_auth/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "como_auth"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap.workspace = true
-async-trait.workspace = true
-axum.workspace = true
-axum-extra.workspace = true
-axum-sessions.workspace = true
-serde.workspace = true
-uuid.workspace = true
-sqlx.workspace = true
-anyhow.workspace = true
-tracing.workspace = true
-async-sqlx-session.workspace = true
-
-zitadel = { version = "3.3.1", features = ["axum"] }
-tower = "0.4.13"
-tower-http = { version = "0.4.0", features = ["cors", "trace"] }
-oauth2 = "4.4.0"
-openidconnect = "3.0.0"
-
-[dev-dependencies]
-tokio.workspace = true
-pretty_assertions.workspace = true
-sealed_test.workspace = true

como_auth/src/auth.rs

@@ -1,128 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use anyhow::Context;
-use async_trait::async_trait;
-use axum::http::{header::SET_COOKIE, HeaderMap};
-use oauth2::url::Url;
-
-use crate::{
-    introspection::IntrospectionService,
-    oauth::{OAuth, ZitadelConfig},
-    session::{SessionService, User},
-    AuthClap, AuthEngine,
-};
-
-#[async_trait]
-pub trait Auth {
-    async fn login(&self) -> anyhow::Result<Url>;
-    async fn login_token(&self, user: &str, password: &str) -> anyhow::Result<String>;
-    async fn login_authorized(&self, code: &str, state: &str) -> anyhow::Result<(HeaderMap, Url)>;
-    async fn get_user_from_session(&self, cookie: &str) -> anyhow::Result<User>;
-}
-
-#[derive(Clone)]
-pub struct AuthService(Arc<dyn Auth + Send + Sync + 'static>);
-
-impl AuthService {
-    pub async fn new(config: &AuthClap, session: SessionService) -> anyhow::Result<Self> {
-        match config.engine {
-            AuthEngine::Noop => Ok(Self::new_noop()),
-            AuthEngine::Zitadel => {
-                let oauth: OAuth = ZitadelConfig::try_from(config.zitadel.clone())?.into();
-                let introspection: IntrospectionService =
-                    IntrospectionService::new_zitadel(config).await?;
-
-                Ok(Self::new_zitadel(oauth, introspection, session))
-            }
-        }
-    }
-
-    pub fn new_zitadel(
-        oauth: OAuth,
-        introspection: IntrospectionService,
-        session: SessionService,
-    ) -> Self {
-        Self(Arc::new(ZitadelAuthService {
-            oauth,
-            introspection,
-            session,
-        }))
-    }
-
-    pub fn new_noop() -> Self {
-        Self(Arc::new(NoopAuthService {}))
-    }
-}
-
-impl Deref for AuthService {
-    type Target = Arc<dyn Auth + Send + Sync + 'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub struct ZitadelAuthService {
-    oauth: OAuth,
-    introspection: IntrospectionService,
-    session: SessionService,
-}
-pub static COOKIE_NAME: &str = "SESSION";
-
-#[async_trait]
-impl Auth for ZitadelAuthService {
-    async fn login(&self) -> anyhow::Result<Url> {
-        let authorize_url = self.oauth.authorize_url().await?;
-
-        Ok(authorize_url)
-    }
-    async fn login_authorized(&self, code: &str, _state: &str) -> anyhow::Result<(HeaderMap, Url)> {
-        let token = self.oauth.exchange(code).await?;
-        let user_id = self.introspection.get_id_token(token.as_str()).await?;
-        let cookie_value = self.session.insert_user("user", user_id.as_str()).await?;
-
-        let cookie = format!("{}={}; SameSite=Lax; Path=/", COOKIE_NAME, cookie_value);
-
-        let mut headers = HeaderMap::new();
-        headers.insert(SET_COOKIE, cookie.parse().unwrap());
-
-        Ok((
-            headers,
-            Url::parse("http://localhost:3000/dash/home")
-                .context("failed to parse login_authorized zitadel return url")?,
-        ))
-    }
-    async fn login_token(&self, _user: &str, password: &str) -> anyhow::Result<String> {
-        self.introspection.get_id_token(password).await
-    }
-    async fn get_user_from_session(&self, cookie: &str) -> anyhow::Result<User> {
-        match self.session.get_user(cookie).await? {
-            Some(u) => Ok(User { id: u }),
-            None => Err(anyhow::anyhow!("failed to find user")),
-        }
-    }
-}
-
-pub struct NoopAuthService {}
-
-#[async_trait]
-impl Auth for NoopAuthService {
-    async fn login(&self) -> anyhow::Result<Url> {
-        todo!()
-    }
-    async fn login_authorized(
-        &self,
-        _code: &str,
-        _state: &str,
-    ) -> anyhow::Result<(HeaderMap, Url)> {
-        todo!()
-    }
-
-    async fn login_token(&self, _user: &str, _password: &str) -> anyhow::Result<String> {
-        todo!()
-    }
-
-    async fn get_user_from_session(&self, _cookie: &str) -> anyhow::Result<User> {
-        todo!()
-    }
-}

como_auth/src/introspection.rs

@@ -1,159 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use async_trait::async_trait;
-use axum::extract::FromRef;
-use oauth2::TokenIntrospectionResponse;
-use openidconnect::IntrospectionUrl;
-use zitadel::{
-    axum::introspection::IntrospectionStateBuilderError,
-    credentials::Application,
-    oidc::{
-        discovery::discover,
-        introspection::{introspect, AuthorityAuthentication},
-    },
-};
-
-use crate::AuthClap;
-
-#[async_trait]
-pub trait Introspection {
-    async fn get_user(&self) -> anyhow::Result<()>;
-    async fn get_id_token(&self, token: &str) -> anyhow::Result<String>;
-}
-
-pub struct IntrospectionService(Arc<dyn Introspection + Send + Sync + 'static>);
-impl IntrospectionService {
-    pub async fn new_zitadel(config: &AuthClap) -> anyhow::Result<Self> {
-        let res = IntrospectionStateBuilder::new(&config.zitadel.authority_url.clone().unwrap())
-            .with_basic_auth(
-                &config.zitadel.client_id.clone().unwrap(),
-                &config.zitadel.client_secret.clone().unwrap(),
-            )
-            .build()
-            .await?;
-
-        Ok(IntrospectionService(Arc::new(ZitadelIntrospection::new(
-            res,
-        ))))
-    }
-}
-
-impl Deref for IntrospectionService {
-    type Target = Arc<dyn Introspection + Send + Sync + 'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub struct ZitadelIntrospection {
-    state: IntrospectionState,
-}
-
-impl ZitadelIntrospection {
-    pub fn new(state: IntrospectionState) -> Self {
-        Self { state }
-    }
-}
-
-#[async_trait]
-impl Introspection for ZitadelIntrospection {
-    async fn get_user(&self) -> anyhow::Result<()> {
-        Ok(())
-    }
-    async fn get_id_token(&self, token: &str) -> anyhow::Result<String> {
-        let config = &self.state.config;
-        let res = introspect(
-            &config.introspection_uri,
-            &config.authority,
-            &config.authentication,
-            token,
-        )
-        .await?;
-
-        Ok(res
-            .sub()
-            .ok_or(anyhow::anyhow!("could not find a userid (sub) in token"))?
-            .to_string())
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct IntrospectionState {
-    pub(crate) config: IntrospectionConfig,
-}
-
-/// Configuration that must be inject into the axum application state. Used by the
-/// [IntrospectionStateBuilder](super::IntrospectionStateBuilder). This struct is also used to create the [IntrospectionState](IntrospectionState)
-#[derive(Debug, Clone)]
-pub struct IntrospectionConfig {
-    pub authority: String,
-    pub authentication: AuthorityAuthentication,
-    pub introspection_uri: IntrospectionUrl,
-}
-
-impl FromRef<IntrospectionState> for IntrospectionConfig {
-    fn from_ref(input: &IntrospectionState) -> Self {
-        input.config.clone()
-    }
-}
-
-pub struct IntrospectionStateBuilder {
-    authority: String,
-    authentication: Option<AuthorityAuthentication>,
-}
-
-/// Builder for [IntrospectionConfig]
-impl IntrospectionStateBuilder {
-    pub fn new(authority: &str) -> Self {
-        Self {
-            authority: authority.to_string(),
-            authentication: None,
-        }
-    }
-
-    pub fn with_basic_auth(
-        &mut self,
-        client_id: &str,
-        client_secret: &str,
-    ) -> &mut IntrospectionStateBuilder {
-        self.authentication = Some(AuthorityAuthentication::Basic {
-            client_id: client_id.to_string(),
-            client_secret: client_secret.to_string(),
-        });
-
-        self
-    }
-
-    #[allow(dead_code)]
-    pub fn with_jwt_profile(&mut self, application: Application) -> &mut IntrospectionStateBuilder {
-        self.authentication = Some(AuthorityAuthentication::JWTProfile { application });
-
-        self
-    }
-
-    pub async fn build(&mut self) -> Result<IntrospectionState, IntrospectionStateBuilderError> {
-        let authentication = self
-            .authentication
-            .clone()
-            .ok_or(IntrospectionStateBuilderError::NoAuthSchema)?;
-
-        let metadata = discover(&self.authority)
-            .await
-            .map_err(|source| IntrospectionStateBuilderError::Discovery { source })?;
-
-        let introspection_uri = metadata
-            .additional_metadata()
-            .introspection_endpoint
-            .clone()
-            .ok_or(IntrospectionStateBuilderError::NoIntrospectionUrl)?;
-
-        Ok(IntrospectionState {
-            config: IntrospectionConfig {
-                authority: self.authority.clone(),
-                introspection_uri: introspection_uri,
-                authentication: authentication,
-            },
-        })
-    }
-}

como_auth/src/lib.rs

@@ -1,242 +0,0 @@
-use oauth::{OAuth, ZitadelConfig};
-use serde::{Deserialize, Serialize};
-
-mod auth;
-mod introspection;
-mod oauth;
-mod session;
-
-pub use auth::{Auth, AuthService};
-use session::SessionClap;
-pub use session::SessionService;
-
-#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug)]
-pub enum AuthEngine {
-    Noop,
-    Zitadel,
-}
-
-#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug)]
-pub enum SessionBackend {
-    InMemory,
-    Postgresql,
-}
-
-#[derive(clap::Args, Clone, PartialEq, Eq, Debug)]
-pub struct AuthClap {
-    #[arg(
-        env = "AUTH_ENGINE",
-         long = "auth-engine",
-         requires_ifs = [
-        ( "zitadel", "ZitadelClap" )
-       ],
-        default_value = "noop" )
-    ]
-    pub engine: AuthEngine,
-
-    #[arg(
-        env = "SESSION_BACKEND",
-         long = "session-backend",
-         requires_ifs = [
-        ( "postgresql", "PostgresqlSessionClap" )
-       ],
-        default_value = "in-memory" )
-    ]
-    pub session_backend: SessionBackend,
-
-    #[clap(flatten)]
-    pub zitadel: ZitadelClap,
-
-    #[clap(flatten)]
-    pub session: SessionClap,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AuthConfigFile {
-    zitadel: Option<ZitadelClap>,
-}
-
-#[derive(clap::Args, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[group(requires_all = ["auth_url", "client_id", "client_secret", "redirect_url", "token_url", "authority_url"])]
-pub struct ZitadelClap {
-    #[arg(env = "ZITADEL_AUTH_URL", long = "zitadel-auth-url")]
-    pub auth_url: Option<String>,
-
-    #[arg(env = "ZITADEL_CLIENT_ID", long = "zitadel-client-id")]
-    pub client_id: Option<String>,
-
-    #[arg(env = "ZITADEL_CLIENT_SECRET", long = "zitadel-client-secret")]
-    pub client_secret: Option<String>,
-
-    #[arg(env = "ZITADEL_REDIRECT_URL", long = "zitadel-redirect-url")]
-    pub redirect_url: Option<String>,
-
-    #[arg(env = "ZITADEL_AUTHORITY_URL", long = "zitadel-authority-url")]
-    pub authority_url: Option<String>,
-
-    #[arg(env = "ZITADEL_TOKEN_URL", long = "zitadel-token-url")]
-    pub token_url: Option<String>,
-}
-
-impl TryFrom<AuthClap> for OAuth {
-    type Error = anyhow::Error;
-
-    fn try_from(value: AuthClap) -> Result<Self, Self::Error> {
-        match value.engine {
-            AuthEngine::Noop => Ok(OAuth::new_noop()),
-            AuthEngine::Zitadel => Ok(OAuth::from(ZitadelConfig::try_from(value.zitadel)?)),
-        }
-    }
-}
-
-impl AuthClap {
-    pub fn merge(&mut self, config: AuthConfigFile) -> &mut Self {
-        if let Some(zitadel) = config.zitadel {
-            if let Some(auth_url) = zitadel.auth_url {
-                if let Some(_) = self.zitadel.auth_url {
-                    _ = self.zitadel.auth_url.replace(auth_url);
-                }
-            }
-            if let Some(client_id) = zitadel.client_id {
-                if let Some(_) = self.zitadel.client_id {
-                    _ = self.zitadel.client_id.replace(client_id);
-                }
-            }
-            if let Some(client_secret) = zitadel.client_secret {
-                if let Some(_) = self.zitadel.client_secret {
-                    _ = self.zitadel.client_secret.replace(client_secret);
-                }
-            }
-            if let Some(redirect_url) = zitadel.redirect_url {
-                if let Some(_) = self.zitadel.redirect_url {
-                    _ = self.zitadel.redirect_url.replace(redirect_url);
-                }
-            }
-            if let Some(authority_url) = zitadel.authority_url {
-                if let Some(_) = self.zitadel.authority_url {
-                    _ = self.zitadel.authority_url.replace(authority_url);
-                }
-            }
-            if let Some(token_url) = zitadel.token_url {
-                if let Some(_) = self.zitadel.token_url {
-                    _ = self.zitadel.token_url.replace(token_url);
-                }
-            }
-        }
-
-        self
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        session::{PostgresqlSessionClap, SessionClap},
-        AuthClap, AuthEngine, SessionBackend, ZitadelClap,
-    };
-    use clap::Parser;
-    use pretty_assertions::assert_eq;
-
-    #[derive(Parser)]
-    #[command(author, version, about, long_about = None)]
-    pub struct Cli {
-        #[command(subcommand)]
-        command: Commands,
-    }
-
-    #[derive(clap::Subcommand, Clone, Debug, Eq, PartialEq)]
-    pub enum Commands {
-        One {
-            #[clap(flatten)]
-            options: AuthClap,
-        },
-    }
-
-    #[test]
-    fn test_command_parse_as_default_noop() {
-        let cli: Cli = Cli::parse_from(&["base", "one"]);
-
-        assert_eq!(
-            cli.command,
-            Commands::One {
-                options: AuthClap {
-                    engine: AuthEngine::Noop,
-                    zitadel: ZitadelClap {
-                        auth_url: None,
-                        client_id: None,
-                        client_secret: None,
-                        redirect_url: None,
-                        token_url: None,
-                        authority_url: None,
-                    },
-                    session_backend: SessionBackend::InMemory,
-                    session: SessionClap {
-                        postgresql: PostgresqlSessionClap { conn: None }
-                    }
-                }
-            }
-        );
-    }
-
-    #[test]
-    fn test_command_parse_as_noop() {
-        let cli: Cli = Cli::parse_from(&["base", "one", "--auth-engine", "noop"]);
-
-        assert_eq!(
-            cli.command,
-            Commands::One {
-                options: AuthClap {
-                    engine: AuthEngine::Noop,
-                    zitadel: ZitadelClap {
-                        auth_url: None,
-                        client_id: None,
-                        client_secret: None,
-                        redirect_url: None,
-                        token_url: None,
-                        authority_url: None,
-                    },
-                    session_backend: crate::SessionBackend::InMemory,
-                    session: crate::SessionClap {
-                        postgresql: PostgresqlSessionClap { conn: None }
-                    }
-                }
-            }
-        );
-    }
-
-    #[test]
-    fn test_command_parse_as_zitadel() {
-        let cli: Cli = Cli::parse_from(&[
-            "base",
-            "one",
-            "--auth-engine=zitadel",
-            "--zitadel-client-id=something",
-            "--zitadel-client-secret=something",
-            "--zitadel-auth-url=https://something",
-            "--zitadel-redirect-url=https://something",
-            "--zitadel-token-url=https://something",
-            "--zitadel-authority-url=https://something",
-        ]);
-
-        assert_eq!(
-            cli.command,
-            Commands::One {
-                options: AuthClap {
-                    engine: AuthEngine::Zitadel,
-                    zitadel: ZitadelClap {
-                        auth_url: Some("https://something".into()),
-                        client_id: Some("something".into()),
-                        client_secret: Some("something".into()),
-                        redirect_url: Some("https://something".into()),
-                        token_url: Some("https://something".into()),
-                        authority_url: Some("https://something".into()),
-                    },
-                    session_backend: crate::SessionBackend::InMemory,
-                    session: crate::SessionClap {
-                        postgresql: PostgresqlSessionClap { conn: None }
-                    }
-                },
-            }
-        );
-    }
-}

como_auth/src/oauth.rs

@@ -1,288 +0,0 @@
-use async_trait::async_trait;
-use oauth2::reqwest::async_http_client;
-use oauth2::url::Url;
-use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
-use oauth2::{AuthorizationCode, CsrfToken, Scope, TokenResponse};
-use std::ops::Deref;
-use std::sync::Arc;
-
-use crate::ZitadelClap;
-
-#[async_trait]
-pub trait OAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()>;
-    async fn authorize_url(&self) -> anyhow::Result<Url>;
-    async fn exchange(&self, code: &str) -> anyhow::Result<String>;
-}
-
-pub struct OAuth(Arc<dyn OAuthClient + Send + Sync + 'static>);
-
-impl OAuth {
-    pub fn new_zitadel(config: ZitadelConfig) -> Self {
-        Self(Arc::new(ZitadelOAuthClient::from(config)))
-    }
-    pub fn new_noop() -> Self {
-        Self(Arc::new(NoopOAuthClient {}))
-    }
-}
-
-impl Deref for OAuth {
-    type Target = Arc<dyn OAuthClient + Send + Sync + 'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<ZitadelConfig> for OAuth {
-    fn from(value: ZitadelConfig) -> Self {
-        Self::new_zitadel(value)
-    }
-}
-
-// -- Noop
-#[derive(clap::Args, Clone)]
-pub struct NoopOAuthClient;
-#[async_trait]
-impl OAuthClient for NoopOAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()> {
-        Ok(())
-    }
-    async fn authorize_url(&self) -> anyhow::Result<Url> {
-        Ok(Url::parse("http://localhost:3000/auth/zitadel").unwrap())
-    }
-
-    async fn exchange(&self, _code: &str) -> anyhow::Result<String> {
-        Ok(String::new())
-    }
-}
-
-// -- Zitadel
-
-#[derive(Clone)]
-pub struct ZitadelConfig {
-    auth_url: String,
-    client_id: String,
-    client_secret: String,
-    redirect_url: String,
-    token_url: String,
-    authority_url: String,
-}
-
-pub struct ZitadelOAuthClient {
-    client: BasicClient,
-}
-
-impl ZitadelOAuthClient {
-    pub fn new(
-        client_id: impl Into<String>,
-        client_secret: impl Into<String>,
-        redirect_url: impl Into<String>,
-        auth_url: impl Into<String>,
-        token_url: impl Into<String>,
-        authority_url: impl Into<String>,
-    ) -> Self {
-        Self {
-            client: Self::oauth_client(ZitadelConfig {
-                client_id: client_id.into(),
-                client_secret: client_secret.into(),
-                redirect_url: redirect_url.into(),
-                auth_url: auth_url.into(),
-                token_url: token_url.into(),
-                authority_url: authority_url.into(),
-            }),
-        }
-    }
-
-    fn oauth_client(config: ZitadelConfig) -> BasicClient {
-        BasicClient::new(
-            ClientId::new(config.client_id),
-            Some(ClientSecret::new(config.client_secret)),
-            AuthUrl::new(config.auth_url).unwrap(),
-            Some(TokenUrl::new(config.token_url).unwrap()),
-        )
-        .set_redirect_uri(RedirectUrl::new(config.redirect_url).unwrap())
-    }
-}
-
-impl From<ZitadelConfig> for ZitadelOAuthClient {
-    fn from(value: ZitadelConfig) -> Self {
-        Self::new(
-            value.client_id,
-            value.client_secret,
-            value.redirect_url,
-            value.auth_url,
-            value.token_url,
-            value.authority_url,
-        )
-    }
-}
-
-impl TryFrom<ZitadelClap> for ZitadelConfig {
-    type Error = anyhow::Error;
-
-    fn try_from(value: ZitadelClap) -> Result<Self, Self::Error> {
-        Ok(Self {
-            auth_url: value
-                .auth_url
-                .ok_or(anyhow::anyhow!("auth_url was not set"))?,
-            client_id: value
-                .client_id
-                .ok_or(anyhow::anyhow!("client_id was not set"))?,
-            client_secret: value
-                .client_secret
-                .ok_or(anyhow::anyhow!("client_secret was not set"))?,
-            redirect_url: value
-                .redirect_url
-                .ok_or(anyhow::anyhow!("redirect_url was not set"))?,
-            token_url: value
-                .token_url
-                .ok_or(anyhow::anyhow!("token_url was not set"))?,
-            authority_url: value
-                .authority_url
-                .ok_or(anyhow::anyhow!("authority_url was not set"))?,
-        })
-    }
-}
-
-#[async_trait]
-impl OAuthClient for ZitadelOAuthClient {
-    async fn get_token(&self) -> anyhow::Result<()> {
-        Ok(())
-    }
-    async fn authorize_url(&self) -> anyhow::Result<Url> {
-        let (auth_url, _csrf_token) = self
-            .client
-            .authorize_url(CsrfToken::new_random)
-            .add_scope(Scope::new("identify".to_string()))
-            .add_scope(Scope::new("openid".to_string()))
-            .url();
-
-        Ok(auth_url)
-    }
-
-    async fn exchange(&self, code: &str) -> anyhow::Result<String> {
-        let token = self
-            .client
-            .exchange_code(AuthorizationCode::new(code.to_string()))
-            .request_async(async_http_client)
-            .await?;
-
-        Ok(token.access_token().secret().clone())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::ZitadelClap;
-    use clap::Parser;
-    use sealed_test::prelude::*;
-
-    #[derive(Parser)]
-    #[command(author, version, about, long_about = None)]
-    pub struct Cli {
-        #[clap(flatten)]
-        options: ZitadelClap,
-    }
-
-    #[derive(Parser, Debug)]
-    #[command(author, version, about, long_about = None)]
-    pub struct CliSubCommand {
-        #[command(subcommand)]
-        command: Commands,
-    }
-
-    #[derive(clap::Subcommand, Clone, Debug, Eq, PartialEq)]
-    pub enum Commands {
-        One {
-            #[clap(flatten)]
-            options: ZitadelClap,
-        },
-    }
-
-    #[tokio::test]
-    async fn test_parse_clap_zitadel() {
-        let cli: Cli = Cli::parse_from(&[
-            "base",
-            "--zitadel-client-id=something",
-            "--zitadel-client-secret=something",
-            "--zitadel-auth-url=https://something",
-            "--zitadel-redirect-url=https://something",
-            "--zitadel-token-url=https://something",
-            "--zitadel-authority-url=https://something",
-        ]);
-        println!("{:?}", cli.options);
-
-        pretty_assertions::assert_eq!(
-            cli.options,
-            ZitadelClap {
-                auth_url: Some("https://something".into()),
-                client_id: Some("something".into()),
-                client_secret: Some("something".into()),
-                redirect_url: Some("https://something".into()),
-                token_url: Some("https://something".into()),
-                authority_url: Some("https://something".into()),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_clap_zitadel_fails_require_all() {
-        let cli = CliSubCommand::try_parse_from(&[
-            "base",
-            "one",
-            // "--zitadel-client-id=something", // We want to trigger missing variable
-            "--zitadel-client-secret=something",
-            "--zitadel-auth-url=https://something",
-            "--zitadel-redirect-url=https://something",
-            "--zitadel-token-url=https://something",
-            "--zitadel-authority-url=https://something",
-        ]);
-
-        pretty_assertions::assert_eq!(cli.is_err(), true);
-    }
-
-    #[sealed_test]
-    fn test_parse_clap_env_zitadel() {
-        std::env::set_var("ZITADEL_CLIENT_ID", "something");
-        std::env::set_var("ZITADEL_CLIENT_SECRET", "something");
-        std::env::set_var("ZITADEL_AUTH_URL", "https://something");
-        std::env::set_var("ZITADEL_REDIRECT_URL", "https://something");
-        std::env::set_var("ZITADEL_TOKEN_URL", "https://something");
-        std::env::set_var("ZITADEL_AUTHORITY_URL", "https://something");
-
-        let cli = CliSubCommand::parse_from(&["base", "one"]);
-
-        pretty_assertions::assert_eq!(
-            cli.command,
-            Commands::One {
-                options: ZitadelClap {
-                    auth_url: Some("https://something".into()),
-                    client_id: Some("something".into()),
-                    client_secret: Some("something".into()),
-                    redirect_url: Some("https://something".into()),
-                    token_url: Some("https://something".into()),
-                    authority_url: Some("https://something".into()),
-                }
-            }
-        );
-    }
-    #[test]
-    fn test_parse_clap_defaults_to_noop() {
-        let cli = CliSubCommand::parse_from(&["base", "one"]);
-
-        pretty_assertions::assert_eq!(
-            cli.command,
-            Commands::One {
-                options: ZitadelClap {
-                    auth_url: None,
-                    client_id: None,
-                    client_secret: None,
-                    redirect_url: None,
-                    token_url: None,
-                    authority_url: None,
-                },
-            }
-        );
-    }
-}

como_auth/src/session.rs

@@ -1,120 +0,0 @@
-use std::{ops::Deref, sync::Arc};
-
-use async_sqlx_session::PostgresSessionStore;
-use async_trait::async_trait;
-use axum_sessions::async_session::{Session as AxumSession, SessionStore as AxumSessionStore};
-use serde::{Deserialize, Serialize};
-
-use crate::{AuthClap, SessionBackend};
-
-#[derive(clap::Args, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SessionClap {
-    #[clap(flatten)]
-    pub postgresql: PostgresqlSessionClap,
-}
-
-#[derive(clap::Args, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PostgresqlSessionClap {
-    #[arg(env = "SESSION_POSTGRES_CONN", long = "session-postgres-conn")]
-    pub conn: Option<String>,
-}
-
-#[async_trait]
-pub trait Session {
-    async fn insert_user(&self, id: &str, user_id: &str) -> anyhow::Result<String>;
-    async fn get_user(&self, cookie: &str) -> anyhow::Result<Option<String>>;
-}
-
-pub struct SessionService(Arc<dyn Session + Send + Sync + 'static>);
-impl SessionService {
-    pub async fn new(config: &AuthClap) -> anyhow::Result<Self> {
-        match config.session_backend {
-            SessionBackend::InMemory => Ok(Self(Arc::new(InMemorySessionService {}))),
-            SessionBackend::Postgresql => {
-                let postgres_session = PostgresSessionStore::new(
-                    config
-                        .session
-                        .postgresql
-                        .conn
-                        .as_ref()
-                        .expect("SESSION_POSTGRES_CONN to be set"),
-                )
-                .await?;
-
-                Ok(Self(Arc::new(PostgresSessionService {
-                    store: postgres_session,
-                })))
-            }
-        }
-    }
-}
-
-impl Deref for SessionService {
-    type Target = Arc<dyn Session + Send + Sync + 'static>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub struct PostgresSessionService {
-    store: PostgresSessionStore,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct User {
-    pub id: String,
-}
-
-#[async_trait]
-impl Session for PostgresSessionService {
-    async fn insert_user(&self, _id: &str, user_id: &str) -> anyhow::Result<String> {
-        let mut session = AxumSession::new();
-        session.insert(
-            "user",
-            User {
-                id: user_id.to_string(),
-            },
-        )?;
-
-        let cookie = self
-            .store
-            .store_session(session)
-            .await?
-            .ok_or(anyhow::anyhow!("failed to store session"))?;
-
-        Ok(cookie)
-    }
-    async fn get_user(&self, cookie: &str) -> anyhow::Result<Option<String>> {
-        if let Some(session) = self.store.load_session(cookie.to_string()).await.unwrap() {
-            if let Some(user) = session.get::<User>("user") {
-                tracing::debug!(
-                    "UserFromSession: session decoded success, user_id={:?}",
-                    user.id
-                );
-                Ok(Some(user.id))
-            } else {
-                Ok(None)
-            }
-        } else {
-            tracing::debug!(
-                "UserIdFromSession: err session not exists in store, {}",
-                cookie
-            );
-            Err(anyhow::anyhow!("No session found for cookie"))
-        }
-    }
-}
-
-pub struct InMemorySessionService {}
-
-#[async_trait]
-impl Session for InMemorySessionService {
-    async fn insert_user(&self, _id: &str, _user_id: &str) -> anyhow::Result<String> {
-        todo!()
-    }
-
-    async fn get_user(&self, _cookie: &str) -> anyhow::Result<Option<String>> {
-        todo!()
-    }
-}

como_bin/src/error.rs

@@ -1,7 +1,6 @@
 use axum::{http::StatusCode, response::IntoResponse, Json};
 use serde_json::json;
 
-#[allow(dead_code)]
 #[derive(Debug)]
 pub enum AppError {
     WrongCredentials,

como_infrastructure/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 como_core.workspace = true
 como_domain.workspace = true
-como_auth.workspace = true
+
 
 axum.workspace = true
 async-trait.workspace = true

como_infrastructure/src/configs/mod.rs

@@ -1,5 +1,4 @@
 use clap::ValueEnum;
-use como_auth::AuthClap;
 
 #[derive(clap::Parser)]
 pub struct AppConfig {
@@ -9,6 +8,8 @@ pub struct AppConfig {
     pub database_type: DatabaseType,
     #[clap(long, env)]
     pub rust_log: String,
+    #[clap(long, env)]
+    pub token_secret: String,
     #[clap(long, env, default_value = "3001")]
     pub api_port: u32,
     #[clap(long, env, default_value = "true")]
@@ -17,9 +18,6 @@ pub struct AppConfig {
     pub seed: bool,
     #[clap(long, env)]
     pub cors_origin: String,
-
-    #[clap(flatten)]
-    pub auth: AuthClap,
 }
 
 #[derive(Clone, Debug, ValueEnum)]

como_infrastructure/src/register.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use async_sqlx_session::PostgresSessionStore;
-use como_auth::{AuthService, SessionService};
 use como_core::{items::DynItemService, projects::DynProjectService, users::DynUserService};
 use tracing::log::info;
 
@@ -21,16 +20,12 @@ pub struct ServiceRegister {
     pub project_service: DynProjectService,
     pub user_service: DynUserService,
     pub session_store: PostgresSessionStore,
-    pub auth_service: AuthService,
 }
 
 impl ServiceRegister {
     pub async fn new(pool: ConnectionPool, config: Arc<AppConfig>) -> anyhow::Result<Self> {
         info!("creating services");
 
-        let session = SessionService::new(&config.auth).await?;
-        let auth = AuthService::new(&config.auth, session).await?;
-
         let s = match config.database_type {
             DatabaseType::Postgres => {
                 let item_service =
@@ -47,7 +42,6 @@ impl ServiceRegister {
                     user_service,
                     project_service,
                     session_store: store,
-                    auth_service: auth,
                 }
             }
             DatabaseType::InMemory => {
@@ -63,7 +57,6 @@ impl ServiceRegister {
                     user_service,
                     project_service,
                     session_store: store,
-                    auth_service: auth,
                 }
             }
         };

como_infrastructure/src/services/item_service.rs

@@ -211,11 +211,7 @@ impl ItemService for MemoryItemService {
         todo!()
     }
 
-    async fn update_item(
+    async fn update_item(&self, _context: &Context, _item: UpdateItemDto) -> anyhow::Result<ItemDto> {
-        &self,
-        _context: &Context,
-        _item: UpdateItemDto,
-    ) -> anyhow::Result<ItemDto> {
         todo!()
     }
 }

cuddle.yaml

@@ -8,8 +8,6 @@ vars:
   bin_name: como_bin
 
 scripts:
-  ci:
-    type: shell
   render_como_templates:
     type: shell
   local_up:
@@ -22,12 +20,18 @@ scripts:
     type: shell
   new_migration:
     type: shell
+    description: "creates a new migration in `como_infrastructure` with the given name prefixed with a date"
     args:
       name:
-        type: "env"
+        type: "flag"
-        key: "name"
+        name: "name"
+        description: "the name of the migration"
+        required: true
   "sqlx:prepare":
     type: shell
 
   "deploy":
     type: shell
+
+  "test":
+    type: lua

renovate.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}

scripts/ci.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "setting up ssh"
-cuddle x setup_ssh
-
-cuddle x start_deployment
-cuddle x render_templates
-cuddle x render_como_templates
-cuddle x build_release
-cuddle x push_release
-cuddle x deploy_release

scripts/lua/commands/init.lua

@@ -0,0 +1,11 @@
+M = {}
+
+function M.something()
+  local io = require("io")
+  local output = io.popen("ls"):read("a*")
+  print(output)
+
+  print("hello-world!")
+end
+
+return M

scripts/new_migration.sh

@@ -2,4 +2,4 @@
 
 export $(cat .env | xargs)
 
-cargo sqlx migrate add --source como_infrastructure/migrations $name
+cargo sqlx migrate add --source como_infrastructure/migrations $NAME

scripts/test.lua

@@ -0,0 +1,5 @@
+print("from test")
+
+local init = require("commands")
+
+init.something()