Compare commits

..
Author SHA1 Message Date
phoenix 453538582b tsk-14: bump: soaricarus_auth
soaricarus_auth Build / Rustfmt (pull_request) Successful in 30s
soaricarus_auth Build / Clippy (pull_request) Failing after 1m55s
soaricarus_auth Build / build (pull_request) Successful in 2m6s
soaricarus_auth Build / Check (pull_request) Successful in 2m37s
soaricarus_auth Build / Test Suite (pull_request) Successful in 2m46s
2026-11-10 21:45:05 -05:00
phoenix aa4b7d34db tsk-14: cargo fmt 2026-11-10 21:44:40 -05:00
phoenix 70c64cdaf7 tsk-14: Adding test 2026-11-10 21:44:23 -05:00
phoenix 5b9b852c8d tsk-14: Reorganized some things 2026-11-10 21:31:40 -05:00
phoenix 587405c995 tsk-14: Got it working
soaricarus_auth Build / Rustfmt (pull_request) Failing after 22s
soaricarus_auth Build / Check (pull_request) Successful in 27s
soaricarus_auth Build / Clippy (pull_request) Successful in 1m48s
soaricarus_auth Build / build (pull_request) Successful in 2m0s
soaricarus_auth Build / Test Suite (pull_request) Successful in 2m33s
2026-11-10 21:17:13 -05:00
phoenix 14259c6c38 Update soaricarus dependencies (#13)
Release Tagging / release (push) Successful in 26s
soaricarus_auth Build / Check (push) Successful in 32s
soaricarus_auth Build / Rustfmt (push) Successful in 32s
soaricarus_auth Build / Clippy (push) Successful in 33s
soaricarus_auth Build / Test Suite (push) Successful in 37s
soaricarus_auth Build / build (push) Successful in 2m15s
soaricarus_auth Build / Clippy (pull_request) Failing after 37s
soaricarus_auth Build / Rustfmt (pull_request) Failing after 40s
soaricarus_auth Build / Test Suite (pull_request) Successful in 1m53s
soaricarus_auth Build / Check (pull_request) Successful in 4m3s
soaricarus_auth Build / build (pull_request) Successful in 4m41s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/13
2026-11-05 16:20:59 -05:00
phoenix 778be1f4a2 Bump argon2 (#12)
Release Tagging / release (push) Successful in 25s
soaricarus_auth Build / Check (push) Successful in 28s
soaricarus_auth Build / Rustfmt (push) Successful in 21s
soaricarus_auth Build / Test Suite (push) Successful in 43s
soaricarus_auth Build / Clippy (push) Successful in 48s
soaricarus_auth Build / build (push) Successful in 2m6s
soaricarus_auth Build / Rustfmt (pull_request) Successful in 21s
soaricarus_auth Build / Clippy (pull_request) Successful in 28s
soaricarus_auth Build / build (pull_request) Successful in 47s
soaricarus_auth Build / Check (pull_request) Successful in 2m22s
soaricarus_auth Build / Test Suite (pull_request) Successful in 2m42s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/12
2026-11-01 19:18:31 -05:00
phoenix de4c698836 bump: uuid (#11)
soaricarus_auth Build / Check (push) Successful in 20s
Release Tagging / release (push) Successful in 26s
soaricarus_auth Build / Test Suite (push) Successful in 37s
soaricarus_auth Build / Rustfmt (push) Successful in 18s
soaricarus_auth Build / Clippy (push) Successful in 1m40s
soaricarus_auth Build / build (push) Successful in 1m53s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/11
2026-11-01 10:52:10 -05:00
phoenix db9d6f164e Update deps (#10)
soaricarus_auth Build / Rustfmt (push) Successful in 21s
Release Tagging / release (push) Successful in 26s
soaricarus_auth Build / Check (push) Successful in 30s
soaricarus_auth Build / Clippy (push) Successful in 2m29s
soaricarus_auth Build / build (push) Successful in 2m19s
soaricarus_auth Build / Test Suite (push) Successful in 2m41s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/10
2026-10-30 18:12:18 -04:00
phoenix 647bb6a379 Add missing test (#9)
Release Tagging / release (push) Successful in 1m2s
soaricarus_auth Build / Rustfmt (push) Successful in 1m2s
soaricarus_auth Build / Test Suite (push) Successful in 1m4s
soaricarus_auth Build / Check (push) Successful in 1m8s
soaricarus_auth Build / build (push) Successful in 1m5s
soaricarus_auth Build / Clippy (push) Successful in 1m7s
soaricarus_auth Build / Rustfmt (pull_request) Successful in 46s
soaricarus_auth Build / Check (pull_request) Successful in 2m58s
soaricarus_auth Build / Test Suite (pull_request) Successful in 3m31s
soaricarus_auth Build / Clippy (pull_request) Successful in 3m41s
soaricarus_auth Build / build (pull_request) Successful in 3m54s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/9
2026-10-09 13:30:14 -04:00
phoenix 0c0e1bdde3 Get user profile (#7)
soaricarus_auth Build / Check (push) Successful in 58s
soaricarus_auth Build / Rustfmt (push) Successful in 1m1s
Release Tagging / release (push) Successful in 1m2s
soaricarus_auth Build / Clippy (push) Successful in 1m7s
soaricarus_auth Build / build (push) Successful in 1m9s
soaricarus_auth Build / Test Suite (push) Successful in 1m20s
soaricarus_auth Build / Check (pull_request) Successful in 36s
soaricarus_auth Build / Test Suite (pull_request) Successful in 49s
soaricarus_auth Build / Rustfmt (pull_request) Successful in 41s
soaricarus_auth Build / Clippy (pull_request) Successful in 47s
soaricarus_auth Build / build (pull_request) Successful in 37s
Reviewed-on: http://git.kundeng.us/phoenix/soaricarus_auth/pulls/7
2026-10-08 17:17:36 -04:00
13 changed files with 978 additions and 532 deletions

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
components: cargo
- uses: Swatinem/rust-cache@v2
+6 -6
View File
@@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
- uses: Swatinem/rust-cache@v2
- run: |
mkdir -p ~/.ssh
@@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-24.04
services:
postgres:
image: postgres:18.4-alpine
image: postgres:18.6-alpine
env:
POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
@@ -49,7 +49,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
- uses: Swatinem/rust-cache@v2
- name: Verify Docker Environment
run: |
@@ -88,7 +88,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
- uses: Swatinem/rust-cache@v2
- run: rustup component add rustfmt
- run: |
@@ -108,7 +108,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
- uses: Swatinem/rust-cache@v2
- run: rustup component add clippy
- run: |
@@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.97
toolchain: 1.99
- uses: Swatinem/rust-cache@v2
- run: |
mkdir -p ~/.ssh
Generated
+254 -324
View File
File diff suppressed because it is too large. Load diff
+12 -11
View File
@@ -1,6 +1,6 @@
[package]
name = "soaricarus_auth"
version = "0.8.3"
version = "0.8.9"
edition = "2024"
rust-version = "1.95"
license = "MIT"
@@ -8,22 +8,23 @@ description = "Auth API for soaricarus"
[dependencies]
axum = { version = "0.8.9" }
openssl = { version = "0.10.81", features = ["vendored"] }
openssl = { version = "0.10.82", features = ["vendored"] }
serde = { version = "1.0.229", features = ["derive"] }
serde_json = { version = "1.0.151" }
tokio = { version = "1.53.1", features = ["rt-multi-thread"] }
serde_json = { version = "1.0.154" }
tokio = { version = "1.54.1", features = ["rt-multi-thread"] }
tracing-subscriber = { version = "0.3.23" }
tower = { version = "0.5.3", features = ["full"] }
tower-http = { version = "0.7.0", features = ["cors"] }
tower-http = { version = "0.7.1", features = ["cors"] }
sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
uuid = { version = "1.24.1", features = ["v4", "serde"] }
argon2 = { version = "0.5.3", features = ["std"] }
uuid = { version = "1.29.0", features = ["v4", "serde"] }
argon2 = { version = "0.6.0", features = ["alloc", "getrandom", "rand_core"] }
time = { version = "0.3.55", features = ["macros", "serde"] }
josekit = { version = "0.10.3" }
utoipa = { version = "5.5.0", features = ["axum_extras"] }
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.6" }
sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.1" }
utoipa = { version = "6.0.0", features = ["axum_extras", "uuid", "time"] }
utoipa-swagger-ui = { version = "10.0.2", features = ["axum"] }
rand = { version = "0.10.3" }
simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.9", features = ["auth"] }
sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.3" }
[dev-dependencies]
http-body-util = { version = "0.1.5" }
+1 -1
View File
@@ -1,4 +1,4 @@
FROM rust:1.97 as builder
FROM rust:1.99 as builder
# Set the working directory inside the container
WORKDIR /usr/src/app
+1 -3
View File
@@ -1,5 +1,3 @@
version: '3.8' # Use a recent version
services:
auth_api:
build:
@@ -16,7 +14,7 @@ services:
restart: unless-stopped
auth_db:
image: postgres:18.4-alpine
image: postgres:18.6-alpine
container_name: soaricarus_auth_db
environment:
POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op}
+159 -4
View File
@@ -43,6 +43,23 @@ pub mod request {
}
}
}
pub mod update_user_profile {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, utoipa::ToSchema)]
pub struct UpdateUserProfileRequest {
pub user_id: uuid::Uuid,
pub firstname: String,
pub lastname: String,
}
impl UpdateUserProfileRequest {
pub fn is_valid(&self) -> bool {
!self.user_id.is_nil() && !self.firstname.is_empty() && !self.lastname.is_empty()
}
}
}
}
pub mod response {
@@ -79,6 +96,26 @@ pub mod response {
pub data: Vec<uuid::Uuid>,
}
}
pub mod get_user_profile {
use serde::{Deserialize, Serialize};
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
pub struct GetUserProfileResponse {
pub message: String,
pub data: Vec<simodels::user::UserProfile>,
}
}
pub mod update_user_profile {
use serde::{Deserialize, Serialize};
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
pub struct UpdateUserProfileResponse {
pub message: String,
pub data: Vec<simodels::user::UserProfile>,
}
}
}
/// Module for login endpoints
@@ -141,7 +178,7 @@ pub mod endpoint {
id: user.id,
username: user.username.clone(),
token: token_literal,
token_type: String::from(simodels::token::TOKEN_TYPE),
token_type: simodels::constants::token::TOKEN_TYPE.to_string(),
expiration: duration,
}],
}),
@@ -193,7 +230,7 @@ pub mod endpoint {
id,
username,
token: token_literal,
token_type: String::from(simodels::token::TOKEN_TYPE),
token_type: simodels::constants::token::TOKEN_TYPE.to_string(),
expiration: duration,
};
@@ -252,7 +289,8 @@ pub mod endpoint {
id,
token: access_token,
expiration: exp_dur,
token_type: String::from(simodels::token::TOKEN_TYPE),
token_type: simodels::constants::token::TOKEN_TYPE
.to_string(),
username,
};
response.message = String::from("Successful");
@@ -334,7 +372,7 @@ pub mod endpoint {
Ok(salt) => {
let updated_salt_string = hashing::generate_salt().unwrap();
let updated_salt = simodels::user::salt::Salt {
salt: updated_salt_string.to_string(),
salt: updated_salt_string.to_string().clone(),
id: salt.id,
};
let updated_hashed_password = hashing::hash_password(
@@ -388,4 +426,121 @@ pub mod endpoint {
}
}
}
/// Endpoint to get user profile
#[utoipa::path(
get,
path = super::super::endpoints::GET_USER_PROFILE,
params(("id" = uuid::Uuid, Path, description = "Get user profile")),
responses(
(status = 200, description = "User profile found", body = super::response::get_user_profile::GetUserProfileResponse),
(status = 404, description = "Song not found", body = super::response::get_user_profile::GetUserProfileResponse),
(status = 400, description = "Error downloading song", body = super::response::get_user_profile::GetUserProfileResponse),
)
)]
pub async fn get_user_profile(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
) -> (
axum::http::StatusCode,
axum::Json<super::response::get_user_profile::GetUserProfileResponse>,
) {
let mut response = super::response::get_user_profile::GetUserProfileResponse::default();
if id.is_nil() {
response.message = "Invalid request".to_string();
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
} else {
match repo::user::get_with_id(&pool, &id).await {
Ok(user) => {
let user_profile = simodels::user::UserProfile {
firstname: user.firstname,
lastname: user.lastname,
username: user.username,
email: user.email,
};
response.message = "SUCCESSFUL".to_string();
response.data.push(user_profile);
(axum::http::StatusCode::OK, axum::Json(response))
}
Err(err) => {
response.message = err.to_string();
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
)
}
}
}
}
#[utoipa::path(
put,
path = super::super::endpoints::UPDATE_USER_PROFILE,
request_body(
content = super::request::update_user_profile::UpdateUserProfileRequest,
description = "Update user profile",
content_type = "application/json"
),
responses(
(status = 200, description = "User profile updated successfully", body = super::response::update_user_profile::UpdateUserProfileResponse),
(status = 400, description = "Invalid", body = super::response::update_user_profile::UpdateUserProfileResponse),
(status = 500, description = "Failure", body = super::response::update_user_profile::UpdateUserProfileResponse)
)
)]
pub async fn update_user_profile(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::Json(payload): axum::Json<
super::request::update_user_profile::UpdateUserProfileRequest,
>,
) -> (
axum::http::StatusCode,
axum::Json<super::response::update_user_profile::UpdateUserProfileResponse>,
) {
let mut response =
super::response::update_user_profile::UpdateUserProfileResponse::default();
if !payload.is_valid() {
response.message = "Invalid".to_string();
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
} else {
let user_id = payload.user_id;
match repo::user::get_with_id(&pool, &user_id).await {
Ok(user) => {
let firstname = payload.firstname;
let lastname = payload.lastname;
match repo::user::update_user_profile(&pool, &user_id, &firstname, &lastname)
.await
{
Ok(_) => {
let user_profile = simodels::user::UserProfile {
firstname,
lastname,
username: user.username,
email: user.email,
};
response.message = "SUCCESSFUL".to_string();
response.data.push(user_profile);
(axum::http::StatusCode::OK, axum::Json(response))
}
Err(err) => {
eprintln!("Error: {err:?}");
response.message = "ERROR - Updating user profile".to_string();
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
)
}
}
}
Err(err) => {
eprintln!("Error: {err:?}");
response.message = "ERROR".to_string();
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
)
}
}
}
}
}
+2
View File
@@ -10,4 +10,6 @@ pub mod endpoints {
pub const UPDATE_PASSWORD: &str = "/api/v2/user/password";
pub const SERVICE_LOGIN: &str = "/api/v2/service/login";
pub const REFRESH_TOKEN: &str = "/api/v2/token/refresh";
pub const GET_USER_PROFILE: &str = "/api/v2/user/profile/{id}";
pub const UPDATE_USER_PROFILE: &str = "/api/v2/user/profile/update";
}
+1 -1
View File
@@ -93,7 +93,7 @@ pub async fn register_user(
let salt_string = hashing::generate_salt().unwrap();
let mut salt = simodels::user::salt::Salt::default();
let generated_salt = salt_string;
salt.salt = generated_salt.to_string();
salt.salt = generated_salt.to_string().clone();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
user.salt_id = salt.id;
let hashed_password =
+52 -26
View File
@@ -1,17 +1,39 @@
use argon2::{
Argon2, // The Argon2 algorithm struct
PasswordVerifier,
password_hash::{
PasswordHasher,
SaltString,
rand_core::OsRng, // Secure random number generator
},
};
use argon2::{Argon2, PasswordVerifier, password_hash::PasswordHasher};
use rand::distr::SampleString;
pub struct SaltString {
pub raw: String,
pub in_bytes: Vec<u8>,
}
impl SaltString {
pub fn generate() -> Result<SaltString, argon2::Error> {
let mut rng = rand::rng();
let s = rand::distr::Alphanumeric.sample_string(&mut rng, 20);
let salt_string = SaltString {
raw: s.to_string(),
in_bytes: s.into_bytes(),
};
Ok(salt_string)
}
pub fn from_b64(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
let salt_string = SaltString {
raw: (&s).to_string(),
in_bytes: s.to_string().into_bytes(),
};
Ok(salt_string)
}
pub fn to_string(&self) -> &String {
&self.raw
}
}
pub fn generate_salt() -> Result<SaltString, argon2::Error> {
// Generate a random salt
// SaltString::generate uses OsRng internally for cryptographic security
Ok(SaltString::generate(&mut OsRng))
SaltString::generate()
}
pub fn get_salt(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
@@ -24,14 +46,11 @@ pub fn hash_password(
) -> Result<String, argon2::password_hash::Error> {
let password_bytes = password.as_bytes();
// Create an Argon2 instance with default parameters (recommended)
// You could customize parameters here if needed, but defaults are strong
let argon2 = Argon2::default();
// Hash the password with the salt
// The output is a PasswordHash string format that includes algorithm, version,
// parameters, salt, and the hash itself.
Ok(argon2.hash_password(password_bytes, salt)?.to_string())
Ok(argon2
.hash_password_with_salt(password_bytes, &salt.in_bytes)?
.to_string())
}
pub fn verify_password(
@@ -48,9 +67,9 @@ pub fn verify_password(
// Verify the password against the parsed hash
// This automatically uses the correct salt and parameters embedded in `parsed_hash`
match Argon2::default().verify_password(password_bytes, &parsed_hash) {
Ok(()) => Ok(true), // Passwords match
Err(argon2::password_hash::Error::Password) => Ok(false), // Passwords don't match
Err(e) => Err(e), // Some other error occurred (e.g., invalid hash format)
Ok(()) => Ok(true), // Passwords match
Err(argon2::password_hash::Error::PasswordInvalid) => Ok(false), // Passwords don't match
Err(e) => Err(e), // Some other error occurred (e.g., invalid hash format)
}
}
@@ -58,10 +77,15 @@ pub fn verify_password(
mod tests {
use super::*;
pub const TEST_PASSWORD: &str = "somethingrandom";
pub const TEST_WRONG_PASSWORD: &str = "Differentanotherlevel";
#[test]
fn test_hash_password() {
let some_password = String::from("somethingrandom");
match hash_password(&some_password, &generate_salt().unwrap()) {
let some_password = String::from(TEST_PASSWORD);
let salt = generate_salt().unwrap();
match hash_password(&some_password, &salt) {
Ok(p) => match verify_password(&some_password, p.clone()) {
Ok(res) => {
assert_eq!(res, true);
@@ -78,8 +102,10 @@ mod tests {
#[test]
fn test_wrong_password() {
let some_password = String::from("somethingrandom");
match hash_password(&some_password, &generate_salt().unwrap()) {
let some_password = String::from(TEST_PASSWORD);
let salt = generate_salt().unwrap();
match hash_password(&some_password, &salt) {
Ok(p) => {
match verify_password(&some_password, p.clone()) {
Ok(res) => {
@@ -89,7 +115,7 @@ mod tests {
assert!(false, "Error: {:?}", err.to_string());
}
}
let wrong_password = String::from("Differentanotherlevel");
let wrong_password = String::from(TEST_WRONG_PASSWORD);
let result = verify_password(&wrong_password, p.clone()).unwrap();
assert_eq!(false, result, "Passwords should not match");
}
+145
View File
@@ -0,0 +1,145 @@
pub mod callers;
pub mod config;
pub mod db;
pub mod hashing;
pub mod repo;
pub mod token_stuff;
pub mod init {
use axum::{
Router,
routing::{get, patch, post, put},
};
use utoipa::OpenApi;
use super::callers;
use callers::common as common_callers;
use callers::login as login_caller;
use callers::register as register_caller;
use login_caller::endpoint as login_endpoints;
use login_caller::response as login_responses;
use register_caller::response as register_responses;
#[derive(utoipa::OpenApi)]
#[openapi(
paths(
common_callers::endpoint::db_ping, common_callers::endpoint::root,
register_caller::register_user,
login_endpoints::login, login_endpoints::update_password, login_endpoints::service_login, login_endpoints::refresh_token, login_endpoints::get_user_profile,
),
components(schemas(common_callers::response::TestResult,
register_responses::Response,
login_responses::Response, login_responses::service_login::Response, login_responses::update_password::Response, login_responses::refresh_token::Response, login_responses::get_user_profile::GetUserProfileResponse)),
tags(
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
)
)]
struct ApiDoc;
mod cors {
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
let cors = tower_http::cors::CorsLayer::new()
.allow_methods([
axum::http::Method::GET,
axum::http::Method::PATCH,
axum::http::Method::POST,
axum::http::Method::PUT,
axum::http::Method::DELETE,
])
.allow_headers([
axum::http::header::CONTENT_TYPE,
axum::http::header::AUTHORIZATION,
])
.allow_credentials(true)
.max_age(std::time::Duration::from_secs(3600));
// Dynamically set the allowed origin based on the environment
match std::env::var(sienvy::keys::APP_ENV).as_deref() {
Ok("production") => {
let allowed_origins_env = sienvy::environment::get_allowed_origins();
match sienvy::utility::delimitize(&allowed_origins_env) {
Ok(alwd) => {
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
.into_iter()
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
.collect();
cors.allow_origin(allowed_origins)
}
Err(err) => {
eprintln!(
"Could not parse out allowed origins from env: Error: {err:?}"
);
std::process::exit(-1);
}
}
}
_ => {
// Development (default): Allow localhost origins
cors.allow_origin(vec![
"http://localhost:4200".parse().unwrap(),
"http://127.0.0.1:4200".parse().unwrap(),
])
}
}
}
}
pub async fn routes() -> Router {
// build our application with a route
Router::new()
.route(
callers::endpoints::DBTEST,
get(callers::common::endpoint::db_ping),
)
.route(
callers::endpoints::ROOT,
get(callers::common::endpoint::root),
)
.route(
callers::endpoints::REGISTER,
post(callers::register::register_user),
)
.route(
callers::endpoints::LOGIN,
post(callers::login::endpoint::login),
)
.route(
callers::endpoints::UPDATE_PASSWORD,
patch(callers::login::endpoint::update_password),
)
.route(
callers::endpoints::SERVICE_LOGIN,
post(callers::login::endpoint::service_login),
)
.route(
callers::endpoints::REFRESH_TOKEN,
post(callers::login::endpoint::refresh_token),
)
.route(
callers::endpoints::GET_USER_PROFILE,
get(callers::login::endpoint::get_user_profile),
)
.route(
callers::endpoints::UPDATE_USER_PROFILE,
put(callers::login::endpoint::update_user_profile),
)
.layer(cors::configure_cors().await)
.layer(cors::configure_cors().await)
}
pub async fn app() -> Router {
let pool = super::db::init::create_pool()
.await
.expect("Failed to create pool");
super::db::init::migrations(&pool).await;
routes()
.await
.merge(
utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
.url("/api-docs/openapi.json", ApiDoc::openapi()),
)
.layer(axum::Extension(pool))
}
}
+240 -141
View File
@@ -1,9 +1,5 @@
pub mod callers;
pub mod config;
pub mod db;
pub mod hashing;
pub mod repo;
pub mod token_stuff;
use soaricarus_auth;
use soaricarus_auth::init;
#[tokio::main]
async fn main() {
@@ -13,144 +9,17 @@ async fn main() {
let app = init::app().await;
// run our app with hyper, listening globally on port 8001
let url = config::get_full();
let url = soaricarus_auth::config::get_full();
let listener = tokio::net::TcpListener::bind(url).await.unwrap();
axum::serve(listener, app).await.unwrap();
}
mod init {
use axum::{
Router,
routing::{get, patch, post},
};
use utoipa::OpenApi;
use super::callers;
use callers::common as common_callers;
use callers::login as login_caller;
use callers::register as register_caller;
use login_caller::endpoint as login_endpoints;
use login_caller::response as login_responses;
use register_caller::response as register_responses;
#[derive(utoipa::OpenApi)]
#[openapi(
paths(
common_callers::endpoint::db_ping, common_callers::endpoint::root,
register_caller::register_user,
login_endpoints::login, login_endpoints::update_password, login_endpoints::service_login, login_endpoints::refresh_token
),
components(schemas(common_callers::response::TestResult,
register_responses::Response,
login_responses::Response, login_responses::service_login::Response, login_responses::update_password::Response, login_responses::refresh_token::Response)),
tags(
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
)
)]
struct ApiDoc;
mod cors {
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
let cors = tower_http::cors::CorsLayer::new()
.allow_methods([
axum::http::Method::GET,
axum::http::Method::PATCH,
axum::http::Method::POST,
axum::http::Method::PUT,
axum::http::Method::DELETE,
])
.allow_headers([
axum::http::header::CONTENT_TYPE,
axum::http::header::AUTHORIZATION,
])
.allow_credentials(true)
.max_age(std::time::Duration::from_secs(3600));
// Dynamically set the allowed origin based on the environment
match std::env::var(sienvy::keys::APP_ENV).as_deref() {
Ok("production") => {
let allowed_origins_env = sienvy::environment::get_allowed_origins();
match sienvy::utility::delimitize(&allowed_origins_env) {
Ok(alwd) => {
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
.into_iter()
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
.collect();
cors.allow_origin(allowed_origins)
}
Err(err) => {
eprintln!(
"Could not parse out allowed origins from env: Error: {err:?}"
);
std::process::exit(-1);
}
}
}
_ => {
// Development (default): Allow localhost origins
cors.allow_origin(vec![
"http://localhost:4200".parse().unwrap(),
"http://127.0.0.1:4200".parse().unwrap(),
])
}
}
}
}
pub async fn routes() -> Router {
// build our application with a route
Router::new()
.route(
callers::endpoints::DBTEST,
get(callers::common::endpoint::db_ping),
)
.route(
callers::endpoints::ROOT,
get(callers::common::endpoint::root),
)
.route(
callers::endpoints::REGISTER,
post(callers::register::register_user),
)
.route(
callers::endpoints::LOGIN,
post(callers::login::endpoint::login),
)
.route(
callers::endpoints::UPDATE_PASSWORD,
patch(callers::login::endpoint::update_password),
)
.route(
callers::endpoints::SERVICE_LOGIN,
post(callers::login::endpoint::service_login),
)
.route(
callers::endpoints::REFRESH_TOKEN,
post(callers::login::endpoint::refresh_token),
)
.layer(cors::configure_cors().await)
}
pub async fn app() -> Router {
let pool = super::db::init::create_pool()
.await
.expect("Failed to create pool");
super::db::init::migrations(&pool).await;
routes()
.await
.merge(
utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
.url("/api-docs/openapi.json", ApiDoc::openapi()),
)
.layer(axum::Extension(pool))
}
}
#[cfg(test)]
mod tests {
use super::*;
use soaricarus_auth;
use soaricarus_auth::callers;
use soaricarus_auth::db;
use axum::{
body::Body,
@@ -261,6 +130,9 @@ mod tests {
pub mod test_data {
use serde_json::json;
pub const UPDATED_FIRSTNAME: &str = "Bolt";
pub const UPDATED_LASTNAME: &str = "Thunder";
pub fn get_updated_password(user_id: &uuid::Uuid) -> serde_json::Value {
json!({
"username": "somethingsss",
@@ -270,9 +142,22 @@ mod tests {
"confirmed_password": "SpeakWithUrChest22!"
})
}
pub fn update_user_profile(
user_id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> serde_json::Value {
json!({
"firstname": firstname,
"lastname": lastname,
"user_id": user_id
})
}
}
pub mod requests {
use soaricarus_auth::callers;
use tower::ServiceExt; // for `call`, `oneshot`, and `ready`
pub async fn register(
@@ -282,7 +167,7 @@ mod tests {
let payload = super::get_test_register_payload(&usr);
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(crate::callers::endpoints::REGISTER)
.uri(callers::endpoints::REGISTER)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
@@ -297,7 +182,7 @@ mod tests {
let payload = super::get_test_login_payload(&usr);
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(crate::callers::endpoints::LOGIN)
.uri(callers::endpoints::LOGIN)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
@@ -312,13 +197,52 @@ mod tests {
let payload = super::test_data::get_updated_password(user_id);
let req = axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::UPDATE_PASSWORD)
.uri(callers::endpoints::UPDATE_PASSWORD)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
app.clone().oneshot(req).await
}
pub async fn get_user_profile(
app: &axum::Router,
user_id: &uuid::Uuid,
) -> Result<axum::response::Response, std::convert::Infallible> {
let raw_uri = String::from(callers::endpoints::GET_USER_PROFILE);
let end_index = raw_uri.len() - 4;
let uri = format!("{}{user_id}", (&raw_uri[..end_index]).to_string());
let req = axum::http::Request::builder()
.method(axum::http::Method::GET)
.uri(uri)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::empty())
.unwrap();
app.clone().oneshot(req).await
}
pub async fn update_user_profile(
app: &axum::Router,
user_id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> Result<axum::response::Response, std::convert::Infallible> {
let payload = super::test_data::update_user_profile(user_id, firstname, lastname);
let req = axum::http::Request::builder()
.method(axum::http::Method::PUT)
.uri(callers::endpoints::UPDATE_USER_PROFILE)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
app.clone().oneshot(req).await
}
}
pub mod responses {
pub use soaricarus_auth::callers::login::response as login_responses;
pub use soaricarus_auth::callers::register::response as register_responses;
}
#[tokio::test]
@@ -554,7 +478,7 @@ mod tests {
let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap();
let key = sienvy::environment::get_secret_key().value;
match token_stuff::create_service_token(&key, &id) {
match soaricarus_auth::token_stuff::create_service_token(&key, &id) {
Ok((token, _expire)) => {
let payload = serde_json::json!({
"access_token": token
@@ -689,4 +613,179 @@ mod tests {
let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
}
#[tokio::test]
async fn test_get_user_profile() {
let tm_pool = db_mgr::get_pool().await.unwrap();
let db_name = db_mgr::generate_db_name().await;
match db_mgr::create_database(&tm_pool, &db_name).await {
Ok(_) => {
println!("Success");
}
Err(e) => {
assert!(false, "Error: {:?}", e.to_string());
}
}
let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
db::init::migrations(&pool).await;
let app = init::routes().await.layer(axum::Extension(pool));
let usr = get_test_register_request();
let response = requests::register(&app, &usr).await;
match response {
Ok(resp) => {
assert_eq!(
resp.status(),
StatusCode::CREATED,
"Message: {:?} {:?}",
resp,
usr.username
);
let body = axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap();
let parsed_body: callers::register::response::Response =
serde_json::from_slice(&body).unwrap();
let returned_usr = &parsed_body.data[0];
let user_id = returned_usr.id;
assert_eq!(false, user_id.is_nil(), "Id is not populated");
assert_eq!(
usr.username, returned_usr.username,
"Usernames do not match"
);
assert!(returned_usr.date_created.is_some(), "Date Created is empty");
let mut n_usr = callers::login::request::Request::default();
n_usr.username = usr.username.clone();
n_usr.password = usr.password.clone();
match requests::get_user_profile(&app, &user_id).await {
Ok(resp) => {
assert_eq!(StatusCode::OK, resp.status(), "Status is not right");
let body = axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap();
let parsed_body: responses::login_responses::get_user_profile::GetUserProfileResponse =
serde_json::from_slice(&body).unwrap();
let user_profile = &parsed_body.data[0];
assert!(
!user_profile.username.is_empty(),
"Username should not be null is nil"
);
}
Err(err) => {
assert!(false, "Error: {:?}", err.to_string());
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err.to_string());
}
};
let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
}
#[tokio::test]
async fn test_update_user_profile() {
let tm_pool = db_mgr::get_pool().await.unwrap();
let db_name = db_mgr::generate_db_name().await;
match db_mgr::create_database(&tm_pool, &db_name).await {
Ok(_) => {
println!("Success");
}
Err(e) => {
assert!(false, "Error: {:?}", e.to_string());
}
}
let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
db::init::migrations(&pool).await;
let app = init::routes().await.layer(axum::Extension(pool));
let usr = get_test_register_request();
let response = requests::register(&app, &usr).await;
match response {
Ok(resp) => {
assert_eq!(
resp.status(),
StatusCode::CREATED,
"Message: {:?} {:?}",
resp,
usr.username
);
let body = axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap();
let parsed_body: responses::register_responses::Response =
serde_json::from_slice(&body).unwrap();
let returned_usr = &parsed_body.data[0];
let user_id = returned_usr.id;
assert_eq!(false, user_id.is_nil(), "Id is not populated");
assert_eq!(
usr.username, returned_usr.username,
"Usernames do not match"
);
assert!(returned_usr.date_created.is_some(), "Date Created is empty");
let updated_firstname = test_data::UPDATED_FIRSTNAME;
let updated_lastname = test_data::UPDATED_LASTNAME;
match requests::update_user_profile(
&app,
&user_id,
&updated_firstname,
&updated_lastname,
)
.await
{
Ok(resp) => {
assert_eq!(StatusCode::OK, resp.status(), "Status is not right");
let body = axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap();
let parsed_body: responses::login_responses::update_user_profile::UpdateUserProfileResponse =
serde_json::from_slice(&body).unwrap();
let user_profile = &parsed_body.data[0];
assert_eq!(
updated_firstname, user_profile.firstname,
"Firstname has not been updated"
);
assert_eq!(
updated_lastname, user_profile.lastname,
"Lastname has not been updated"
);
}
Err(err) => {
assert!(false, "Error: {:?}", err.to_string());
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err.to_string());
}
};
let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
}
}
+104 -14
View File
@@ -24,26 +24,88 @@ pub mod user {
match result {
Ok(r) => match r {
Some(r) => Ok(simodels::user::User {
id: r.try_get("id")?,
username: r.try_get("username")?,
password: r.try_get("password")?,
email: r.try_get("email")?,
email_verified: r.try_get("email_verified")?,
phone: r.try_get("phone")?,
salt_id: r.try_get("salt_id")?,
firstname: r.try_get("firstname")?,
lastname: r.try_get("lastname")?,
date_created: r.try_get("date_created")?,
last_login: r.try_get("last_login")?,
status: r.try_get("status")?,
}),
Some(r) => parse_row(&r).await,
None => Err(sqlx::Error::RowNotFound),
},
Err(e) => Err(e),
}
}
pub async fn get_with_id(
pool: &sqlx::PgPool,
id: &uuid::Uuid,
) -> Result<simodels::user::User, sqlx::Error> {
let result = sqlx::query(
r#"
SELECT * FROM "user" WHERE id = $1
"#,
)
.bind(id)
.fetch_optional(pool)
.await;
match result {
Ok(r) => match r {
Some(roww) => parse_row(&roww).await,
None => Err(sqlx::Error::RowNotFound),
},
Err(e) => Err(e),
}
}
async fn parse_row(row: &sqlx::postgres::PgRow) -> Result<simodels::user::User, sqlx::Error> {
Ok(simodels::user::User {
id: row
.try_get("id")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
username: row
.try_get("username")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
password: row
.try_get("password")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
email: row
.try_get("email")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
phone: row
.try_get("phone")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
firstname: row
.try_get("firstname")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
lastname: row
.try_get("lastname")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
email_verified: row
.try_get("email_verified")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
date_created: row
.try_get("date_created")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
status: row
.try_get("status")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
last_login: row
.try_get("last_login")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
salt_id: row
.try_get("salt_id")
.map_err(|_e| sqlx::Error::RowNotFound)
.unwrap(),
})
}
pub async fn update_password(
pool: &sqlx::PgPool,
user: &simodels::user::User,
@@ -70,6 +132,34 @@ pub mod user {
}
}
pub async fn update_user_profile(
pool: &sqlx::PgPool,
id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> Result<bool, sqlx::Error> {
match sqlx::query(
r#"
UPDATE "user" SET firstname = $1, lastname = $2 WHERE id = $3
"#,
)
.bind(firstname)
.bind(lastname)
.bind(id)
.execute(pool)
.await
{
Ok(r) => {
if r.rows_affected() > 0 {
Ok(true)
} else {
Ok(false)
}
}
Err(err) => Err(err),
}
}
pub async fn update_last_login(
pool: &sqlx::PgPool,
user: &simodels::user::User,