Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
587405c995
|
||
|
|
14259c6c38 | ||
|
|
778be1f4a2 | ||
|
|
de4c698836 | ||
|
|
db9d6f164e | ||
|
|
647bb6a379 | ||
|
|
0c0e1bdde3 |
No files matched your search
@@ -17,7 +17,7 @@ jobs:
|
|||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
components: cargo
|
components: cargo
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
@@ -34,7 +34,7 @@ jobs:
|
|||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:18.4-alpine
|
image: postgres:18.6-alpine
|
||||||
env:
|
env:
|
||||||
POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
|
POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
|
||||||
POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
|
POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
|
||||||
@@ -49,7 +49,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- name: Verify Docker Environment
|
- name: Verify Docker Environment
|
||||||
run: |
|
run: |
|
||||||
@@ -88,7 +88,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
- run: |
|
- run: |
|
||||||
@@ -108,7 +108,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: rustup component add clippy
|
- run: rustup component add clippy
|
||||||
- run: |
|
- run: |
|
||||||
@@ -128,7 +128,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.97
|
toolchain: 1.99
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
|
|||||||
Generated
+254
-324
File diff suppressed because it is too large.
Load diff
+12
-11
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "soaricarus_auth"
|
name = "soaricarus_auth"
|
||||||
version = "0.8.3"
|
version = "0.8.8"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.95"
|
rust-version = "1.95"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@@ -8,22 +8,23 @@ description = "Auth API for soaricarus"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
axum = { version = "0.8.9" }
|
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 = { version = "1.0.229", features = ["derive"] }
|
||||||
serde_json = { version = "1.0.151" }
|
serde_json = { version = "1.0.154" }
|
||||||
tokio = { version = "1.53.1", features = ["rt-multi-thread"] }
|
tokio = { version = "1.54.1", features = ["rt-multi-thread"] }
|
||||||
tracing-subscriber = { version = "0.3.23" }
|
tracing-subscriber = { version = "0.3.23" }
|
||||||
tower = { version = "0.5.3", features = ["full"] }
|
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"] }
|
sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
|
||||||
uuid = { version = "1.24.1", features = ["v4", "serde"] }
|
uuid = { version = "1.29.0", features = ["v4", "serde"] }
|
||||||
argon2 = { version = "0.5.3", features = ["std"] }
|
argon2 = { version = "0.6.0", features = ["alloc", "getrandom", "rand_core"] }
|
||||||
time = { version = "0.3.55", features = ["macros", "serde"] }
|
time = { version = "0.3.55", features = ["macros", "serde"] }
|
||||||
josekit = { version = "0.10.3" }
|
josekit = { version = "0.10.3" }
|
||||||
utoipa = { version = "5.5.0", features = ["axum_extras"] }
|
utoipa = { version = "6.0.0", features = ["axum_extras", "uuid", "time"] }
|
||||||
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
utoipa-swagger-ui = { version = "10.0.2", features = ["axum"] }
|
||||||
simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.6" }
|
rand = { version = "0.10.3" }
|
||||||
sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.1" }
|
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]
|
[dev-dependencies]
|
||||||
http-body-util = { version = "0.1.5" }
|
http-body-util = { version = "0.1.5" }
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM rust:1.97 as builder
|
FROM rust:1.99 as builder
|
||||||
|
|
||||||
# Set the working directory inside the container
|
# Set the working directory inside the container
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|||||||
+1
-3
@@ -1,5 +1,3 @@
|
|||||||
version: '3.8' # Use a recent version
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
auth_api:
|
auth_api:
|
||||||
build:
|
build:
|
||||||
@@ -16,7 +14,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
auth_db:
|
auth_db:
|
||||||
image: postgres:18.4-alpine
|
image: postgres:18.6-alpine
|
||||||
container_name: soaricarus_auth_db
|
container_name: soaricarus_auth_db
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op}
|
POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op}
|
||||||
|
|||||||
+145
-4
@@ -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 {
|
pub mod response {
|
||||||
@@ -79,6 +96,27 @@ pub mod response {
|
|||||||
pub data: Vec<uuid::Uuid>,
|
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
|
/// Module for login endpoints
|
||||||
@@ -141,7 +179,7 @@ pub mod endpoint {
|
|||||||
id: user.id,
|
id: user.id,
|
||||||
username: user.username.clone(),
|
username: user.username.clone(),
|
||||||
token: token_literal,
|
token: token_literal,
|
||||||
token_type: String::from(simodels::token::TOKEN_TYPE),
|
token_type: simodels::constants::token::TOKEN_TYPE.to_string(),
|
||||||
expiration: duration,
|
expiration: duration,
|
||||||
}],
|
}],
|
||||||
}),
|
}),
|
||||||
@@ -193,7 +231,7 @@ pub mod endpoint {
|
|||||||
id,
|
id,
|
||||||
username,
|
username,
|
||||||
token: token_literal,
|
token: token_literal,
|
||||||
token_type: String::from(simodels::token::TOKEN_TYPE),
|
token_type: simodels::constants::token::TOKEN_TYPE.to_string(),
|
||||||
expiration: duration,
|
expiration: duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -252,7 +290,8 @@ pub mod endpoint {
|
|||||||
id,
|
id,
|
||||||
token: access_token,
|
token: access_token,
|
||||||
expiration: exp_dur,
|
expiration: exp_dur,
|
||||||
token_type: String::from(simodels::token::TOKEN_TYPE),
|
token_type: simodels::constants::token::TOKEN_TYPE
|
||||||
|
.to_string(),
|
||||||
username,
|
username,
|
||||||
};
|
};
|
||||||
response.message = String::from("Successful");
|
response.message = String::from("Successful");
|
||||||
@@ -334,7 +373,7 @@ pub mod endpoint {
|
|||||||
Ok(salt) => {
|
Ok(salt) => {
|
||||||
let updated_salt_string = hashing::generate_salt().unwrap();
|
let updated_salt_string = hashing::generate_salt().unwrap();
|
||||||
let updated_salt = simodels::user::salt::Salt {
|
let updated_salt = simodels::user::salt::Salt {
|
||||||
salt: updated_salt_string.to_string(),
|
salt: updated_salt_string.to_string().clone(),
|
||||||
id: salt.id,
|
id: salt.id,
|
||||||
};
|
};
|
||||||
let updated_hashed_password = hashing::hash_password(
|
let updated_hashed_password = hashing::hash_password(
|
||||||
@@ -388,4 +427,106 @@ 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))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -10,4 +10,6 @@ pub mod endpoints {
|
|||||||
pub const UPDATE_PASSWORD: &str = "/api/v2/user/password";
|
pub const UPDATE_PASSWORD: &str = "/api/v2/user/password";
|
||||||
pub const SERVICE_LOGIN: &str = "/api/v2/service/login";
|
pub const SERVICE_LOGIN: &str = "/api/v2/service/login";
|
||||||
pub const REFRESH_TOKEN: &str = "/api/v2/token/refresh";
|
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";
|
||||||
}
|
}
|
||||||
@@ -93,7 +93,7 @@ pub async fn register_user(
|
|||||||
let salt_string = hashing::generate_salt().unwrap();
|
let salt_string = hashing::generate_salt().unwrap();
|
||||||
let mut salt = simodels::user::salt::Salt::default();
|
let mut salt = simodels::user::salt::Salt::default();
|
||||||
let generated_salt = salt_string;
|
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();
|
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
|
||||||
user.salt_id = salt.id;
|
user.salt_id = salt.id;
|
||||||
let hashed_password =
|
let hashed_password =
|
||||||
|
|||||||
+52
-26
@@ -1,17 +1,39 @@
|
|||||||
use argon2::{
|
use argon2::{Argon2, PasswordVerifier, password_hash::PasswordHasher};
|
||||||
Argon2, // The Argon2 algorithm struct
|
use rand::distr::SampleString;
|
||||||
PasswordVerifier,
|
|
||||||
password_hash::{
|
pub struct SaltString {
|
||||||
PasswordHasher,
|
pub raw: String,
|
||||||
SaltString,
|
pub in_bytes: Vec<u8>,
|
||||||
rand_core::OsRng, // Secure random number generator
|
}
|
||||||
},
|
|
||||||
};
|
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> {
|
pub fn generate_salt() -> Result<SaltString, argon2::Error> {
|
||||||
// Generate a random salt
|
SaltString::generate()
|
||||||
// SaltString::generate uses OsRng internally for cryptographic security
|
|
||||||
Ok(SaltString::generate(&mut OsRng))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_salt(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
|
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> {
|
) -> Result<String, argon2::password_hash::Error> {
|
||||||
let password_bytes = password.as_bytes();
|
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();
|
let argon2 = Argon2::default();
|
||||||
|
|
||||||
// Hash the password with the salt
|
Ok(argon2
|
||||||
// The output is a PasswordHash string format that includes algorithm, version,
|
.hash_password_with_salt(password_bytes, &salt.in_bytes)?
|
||||||
// parameters, salt, and the hash itself.
|
.to_string())
|
||||||
Ok(argon2.hash_password(password_bytes, salt)?.to_string())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn verify_password(
|
pub fn verify_password(
|
||||||
@@ -48,9 +67,9 @@ pub fn verify_password(
|
|||||||
// Verify the password against the parsed hash
|
// Verify the password against the parsed hash
|
||||||
// This automatically uses the correct salt and parameters embedded in `parsed_hash`
|
// This automatically uses the correct salt and parameters embedded in `parsed_hash`
|
||||||
match Argon2::default().verify_password(password_bytes, &parsed_hash) {
|
match Argon2::default().verify_password(password_bytes, &parsed_hash) {
|
||||||
Ok(()) => Ok(true), // Passwords match
|
Ok(()) => Ok(true), // Passwords match
|
||||||
Err(argon2::password_hash::Error::Password) => Ok(false), // Passwords don't 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)
|
Err(e) => Err(e), // Some other error occurred (e.g., invalid hash format)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,10 +77,15 @@ pub fn verify_password(
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
pub const TEST_PASSWORD: &str = "somethingrandom";
|
||||||
|
pub const TEST_WRONG_PASSWORD: &str = "Differentanotherlevel";
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_hash_password() {
|
fn test_hash_password() {
|
||||||
let some_password = String::from("somethingrandom");
|
let some_password = String::from(TEST_PASSWORD);
|
||||||
match hash_password(&some_password, &generate_salt().unwrap()) {
|
let salt = generate_salt().unwrap();
|
||||||
|
|
||||||
|
match hash_password(&some_password, &salt) {
|
||||||
Ok(p) => match verify_password(&some_password, p.clone()) {
|
Ok(p) => match verify_password(&some_password, p.clone()) {
|
||||||
Ok(res) => {
|
Ok(res) => {
|
||||||
assert_eq!(res, true);
|
assert_eq!(res, true);
|
||||||
@@ -78,8 +102,10 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_wrong_password() {
|
fn test_wrong_password() {
|
||||||
let some_password = String::from("somethingrandom");
|
let some_password = String::from(TEST_PASSWORD);
|
||||||
match hash_password(&some_password, &generate_salt().unwrap()) {
|
let salt = generate_salt().unwrap();
|
||||||
|
|
||||||
|
match hash_password(&some_password, &salt) {
|
||||||
Ok(p) => {
|
Ok(p) => {
|
||||||
match verify_password(&some_password, p.clone()) {
|
match verify_password(&some_password, p.clone()) {
|
||||||
Ok(res) => {
|
Ok(res) => {
|
||||||
@@ -89,7 +115,7 @@ mod tests {
|
|||||||
assert!(false, "Error: {:?}", err.to_string());
|
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();
|
let result = verify_password(&wrong_password, p.clone()).unwrap();
|
||||||
assert_eq!(false, result, "Passwords should not match");
|
assert_eq!(false, result, "Passwords should not match");
|
||||||
}
|
}
|
||||||
|
|||||||
+104
-2
@@ -38,11 +38,11 @@ mod init {
|
|||||||
paths(
|
paths(
|
||||||
common_callers::endpoint::db_ping, common_callers::endpoint::root,
|
common_callers::endpoint::db_ping, common_callers::endpoint::root,
|
||||||
register_caller::register_user,
|
register_caller::register_user,
|
||||||
login_endpoints::login, login_endpoints::update_password, login_endpoints::service_login, login_endpoints::refresh_token
|
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,
|
components(schemas(common_callers::response::TestResult,
|
||||||
register_responses::Response,
|
register_responses::Response,
|
||||||
login_responses::Response, login_responses::service_login::Response, login_responses::update_password::Response, login_responses::refresh_token::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(
|
tags(
|
||||||
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
|
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
|
||||||
)
|
)
|
||||||
@@ -128,6 +128,10 @@ mod init {
|
|||||||
callers::endpoints::REFRESH_TOKEN,
|
callers::endpoints::REFRESH_TOKEN,
|
||||||
post(callers::login::endpoint::refresh_token),
|
post(callers::login::endpoint::refresh_token),
|
||||||
)
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::GET_USER_PROFILE,
|
||||||
|
get(callers::login::endpoint::get_user_profile),
|
||||||
|
)
|
||||||
.layer(cors::configure_cors().await)
|
.layer(cors::configure_cors().await)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,6 +323,23 @@ mod tests {
|
|||||||
|
|
||||||
app.clone().oneshot(req).await
|
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(crate::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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -689,4 +710,85 @@ mod tests {
|
|||||||
|
|
||||||
let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
|
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: callers::login::response::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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+104
-14
@@ -24,26 +24,88 @@ pub mod user {
|
|||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(r) => match r {
|
Ok(r) => match r {
|
||||||
Some(r) => Ok(simodels::user::User {
|
Some(r) => parse_row(&r).await,
|
||||||
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")?,
|
|
||||||
}),
|
|
||||||
None => Err(sqlx::Error::RowNotFound),
|
None => Err(sqlx::Error::RowNotFound),
|
||||||
},
|
},
|
||||||
Err(e) => Err(e),
|
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(
|
pub async fn update_password(
|
||||||
pool: &sqlx::PgPool,
|
pool: &sqlx::PgPool,
|
||||||
user: &simodels::user::User,
|
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(
|
pub async fn update_last_login(
|
||||||
pool: &sqlx::PgPool,
|
pool: &sqlx::PgPool,
|
||||||
user: &simodels::user::User,
|
user: &simodels::user::User,
|
||||||
|
|||||||
Reference in new issue
Block a user