coworkunion/chattyness
SHA256
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Silence warnings, run cargo fmt

Browse source
This commit is contained in:
Evan Carroll 2026-01-18 16:27:31 -06:00
parent fe1c1d3655
commit af1c767f5f
77 changed files with 1904 additions and 903 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/chattyness-user-ui/src/api/auth.rs
View file

@ -1,9 +1,6 @@
//! Authentication API handlers.
use axum::{
extract::State,
Json,
};
use axum::{Json, extract::State};
use sqlx::PgPool;
use tower_sessions::Session;
@ -19,11 +16,11 @@ use chattyness_db::{
use chattyness_error::AppError;
use crate::auth::{
AuthUser, OptionalAuthUser,
session::{
SESSION_CURRENT_REALM_KEY, SESSION_LOGIN_TYPE_KEY, SESSION_ORIGINAL_DEST_KEY,
SESSION_USER_ID_KEY,
},
AuthUser, OptionalAuthUser,
};
/// Get current user info.
@ -66,7 +63,9 @@ pub async fn login(
.ok_or(AppError::InvalidCredentials)?;
// Set RLS context to the authenticated user for subsequent operations
rls_conn.set_user_id(user.id).await
rls_conn
.set_user_id(user.id)
.await
.map_err(|e| AppError::Internal(format!("Failed to set RLS context: {}", e)))?;
// Check account status
@ -285,19 +284,27 @@ pub async fn signup(
});
let mut conn = rls_conn.acquire().await;
let user_id =
users::create_user_conn(&mut *conn, &req.username, email_opt, req.display_name.trim(), &req.password)
.await?;
let user_id = users::create_user_conn(
&mut *conn,
&req.username,
email_opt,
req.display_name.trim(),
&req.password,
)
.await?;
drop(conn);
// Set RLS context to the new user for membership creation
rls_conn.set_user_id(user_id).await
rls_conn
.set_user_id(user_id)
.await
.map_err(|e| AppError::Internal(format!("Failed to set RLS context: {}", e)))?;
// Create membership using RLS connection (now has user context)
let mut conn = rls_conn.acquire().await;
let membership_id =
memberships::create_membership_conn(&mut *conn, user_id, realm.id, RealmRole::Member).await?;
memberships::create_membership_conn(&mut *conn, user_id, realm.id, RealmRole::Member)
.await?;
// Set up session (user is logged in)
session
@ -421,7 +428,8 @@ pub async fn join_realm(
// Create the membership using RLS connection (policy requires user_id = current_user_id)
let mut conn = rls_conn.acquire().await;
let membership_id =
memberships::create_membership_conn(&mut *conn, user.id, realm.id, RealmRole::Member).await?;
memberships::create_membership_conn(&mut *conn, user.id, realm.id, RealmRole::Member)
.await?;
Ok(Json(JoinRealmResponse {
success: true,