4 Commits
Author SHA1 Message Date
phoenix b678c098cb Update name of user endpoint (#9)
Rust Build / Test Suite (push) Successful in 48s
Rust Build / Rustfmt (push) Successful in 1m23s
Rust Build / Check (push) Successful in 1m35s
Rust Build / Clippy (push) Successful in 1m13s
Rust Build / build (push) Successful in 2m57s
Rust Build / Rustfmt (pull_request) Successful in 1m15s
Rust Build / Test Suite (pull_request) Successful in 1m38s
Rust Build / Check (pull_request) Successful in 1m50s
Rust Build / Clippy (pull_request) Successful in 1m24s
Rust Build / build (pull_request) Successful in 2m59s
Reviewed-on: phoenix/textsender-auth#9
2026-06-12 17:27:46 -04:00
phoenix e3ee24c131 Update password endpoint (#8)
Rust Build / Rustfmt (push) Successful in 40s
Rust Build / Clippy (push) Successful in 1m12s
Rust Build / Check (push) Successful in 2m3s
Rust Build / Test Suite (push) Successful in 2m10s
Rust Build / build (push) Successful in 1m48s
Rust Build / Rustfmt (pull_request) Successful in 37s
Rust Build / Test Suite (pull_request) Successful in 1m10s
Rust Build / Check (pull_request) Successful in 1m30s
Rust Build / Clippy (pull_request) Successful in 1m36s
Rust Build / build (pull_request) Successful in 3m29s
Reviewed-on: phoenix/textsender-auth#8
2026-06-12 13:08:34 -04:00
phoenix 8e0b8b737b Refresh endpoint (#7)
Rust Build / Rustfmt (push) Successful in 1m0s
Rust Build / Clippy (pull_request) Successful in 1m48s
Rust Build / Check (push) Successful in 1m10s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (push) Successful in 1m4s
Rust Build / Test Suite (pull_request) Successful in 1m1s
Rust Build / Check (pull_request) Successful in 1m45s
Rust Build / build (pull_request) Successful in 3m11s
Rust Build / Test Suite (push) Successful in 2m25s
Rust Build / build (push) Successful in 1m41s
Reviewed-on: phoenix/textsender-auth#7
2026-06-12 10:51:40 -04:00
phoenix e5e34b4ad3 Service login (#6)
Rust Build / build (push) Successful in 1m42s
Rust Build / Clippy (push) Successful in 1m52s
Rust Build / Rustfmt (pull_request) Successful in 53s
Rust Build / Test Suite (pull_request) Successful in 1m25s
Rust Build / Clippy (pull_request) Successful in 1m40s
Rust Build / build (pull_request) Successful in 1m36s
Rust Build / Check (pull_request) Successful in 1m47s
Rust Build / Rustfmt (push) Successful in 1m24s
Rust Build / Check (push) Successful in 1m29s
Rust Build / Test Suite (push) Successful in 1m29s
Reviewed-on: phoenix/textsender-auth#6
2026-06-11 18:02:23 -04:00
11 changed files with 1591 additions and 105 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
# --- Add database service definition --- # --- Add database service definition ---
services: services:
postgres: postgres:
image: postgres:18.3-alpine image: postgres:18.4-alpine
env: env:
# Use secrets for DB init, with fallbacks for flexibility # Use secrets for DB init, with fallbacks for flexibility
POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }} POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
Generated
+1 -1
View File
@@ -2213,7 +2213,7 @@ dependencies = [
[[package]] [[package]]
name = "textsender_auth" name = "textsender_auth"
version = "0.1.16" version = "0.1.20"
dependencies = [ dependencies = [
"argon2", "argon2",
"async-std", "async-std",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "textsender_auth" name = "textsender_auth"
version = "0.1.16" version = "0.1.20"
edition = "2024" edition = "2024"
rust-version = "1.95" rust-version = "1.95"
-32
View File
@@ -1,32 +0,0 @@
-- CREATE EXTENSION IF NOT EXISTS pgcrypto;
-- CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
--
-- DROP TABLE IF EXISTS "user" CASCADE;
-- DROP TABLE IF EXISTS "salt" CASCADE;
-- DROP TABLE IF EXISTS "service_user" CASCADE;
--
-- CREATE TABLE IF NOT EXISTS "user" (
-- id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-- first_name TEXT NOT NULL,
-- last_name TEXT NOT NULL,
-- phone_number TEXT NOT NULL,
-- username TEXT NOT NULL,
-- password TEXT NOT NULL,
-- created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-- last_login TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-- salt_id UUID NOT NULL
-- );
--
--
-- CREATE TABLE IF NOT EXISTS "salt" (
-- id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-- salt TEXT NOT NULL
-- );
--
-- CREATE TABLE IF NOT EXISTS "service_user" (
-- id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-- username TEXT NOT NULL,
-- passphrase TEXT NOT NULL,
-- created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-- last_login timestamptz NULL
-- );
+668
View File
@@ -9,6 +9,74 @@ pub mod request {
pub username: String, pub username: String,
pub password: String, pub password: String,
} }
#[derive(Deserialize, utoipa::ToSchema)]
pub struct ServiceUserLoginRequest {
pub username: String,
pub passphrase: String,
}
impl ServiceUserLoginRequest {
pub fn is_empty(&self) -> (bool, Option<String>) {
if self.username.is_empty() && self.passphrase.is_empty() {
(
true,
Some(String::from("Username and passphrase are empty")),
)
} else if self.username.is_empty() {
(true, Some(String::from("Username is empty")))
} else if self.username.is_empty() {
(true, Some(String::from("Passphrase is empty")))
} else {
(false, None)
}
}
}
#[derive(Deserialize, utoipa::ToSchema)]
pub struct RefreshTokenRequest {
pub access_token: String,
}
#[derive(Deserialize, utoipa::ToSchema)]
pub struct UpdatePasswordRequest {
pub user_id: uuid::Uuid,
pub current_password: String,
pub updated_password: String,
pub confirmed_password: String,
}
impl UpdatePasswordRequest {
pub fn is_valid(&self) -> bool {
if self.user_id.is_nil()
|| self.current_password.is_empty()
|| self.updated_password.is_empty()
|| self.confirmed_password.is_empty()
{
false
} else {
self.updated_password == self.confirmed_password
}
}
}
#[derive(Deserialize, utoipa::ToSchema)]
pub struct UserUpdateNameRequest {
pub user_id: uuid::Uuid,
pub firstname: String,
pub lastname: String,
}
impl UserUpdateNameRequest {
pub fn is_valid(&self) -> (bool, Option<String>) {
if self.user_id.is_nil() || self.firstname.is_empty() || self.lastname.is_empty() {
let reason = String::from("Missing fields");
(false, Some(reason))
} else {
(true, None)
}
}
}
} }
pub mod response { pub mod response {
@@ -19,6 +87,12 @@ pub mod response {
pub data: Vec<textsender_models::token::LoginResult>, pub data: Vec<textsender_models::token::LoginResult>,
} }
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
pub struct ServiceUserLoginResponse {
pub message: String,
pub data: Vec<textsender_models::token::LoginResult>,
}
pub async fn extract( pub async fn extract(
response: axum::response::Response, response: axum::response::Response,
) -> Result<LoginResponse, std::io::Error> { ) -> Result<LoginResponse, std::io::Error> {
@@ -28,6 +102,24 @@ pub mod response {
let _parsed_body: LoginResponse = serde_json::from_slice(&body).unwrap(); let _parsed_body: LoginResponse = serde_json::from_slice(&body).unwrap();
todo!("Add code to convert axum::Response to this type"); todo!("Add code to convert axum::Response to this type");
} }
#[derive(Deserialize, Serialize, utoipa::ToSchema)]
pub struct RefreshTokenResponse {
pub message: String,
pub data: Vec<textsender_models::token::LoginResult>,
}
#[derive(Deserialize, Serialize, utoipa::ToSchema)]
pub struct UpdatePasswordResponse {
pub message: String,
pub data: Vec<uuid::Uuid>,
}
#[derive(Deserialize, Serialize, utoipa::ToSchema)]
pub struct UserUpdateNameResponse {
pub message: String,
pub data: Vec<textsender_models::user::User>,
}
} }
/// Endpoint for a user login /// Endpoint for a user login
@@ -160,3 +252,579 @@ pub async fn user_login(
} }
} }
} }
/// Endpoint for service user login
#[utoipa::path(
post,
path = super::endpoints::LOGIN_SERVICE_USER,
request_body(
content = request::ServiceUserLoginRequest,
description = "Data required for service user to lgoin",
content_type = "application/json"
),
responses(
(status = 201, description = "Service uuser login successful", body = response::ServiceUserLoginResponse),
(status = 400, description = "Bad data", body = response::ServiceUserLoginResponse),
(status = 500, description = "Something went wrong", body = response::ServiceUserLoginResponse)
)
)]
pub async fn service_user_login(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::Json(payload): axum::Json<request::ServiceUserLoginRequest>,
) -> (
axum::http::StatusCode,
axum::Json<response::ServiceUserLoginResponse>,
) {
if payload.username.is_empty() || payload.passphrase.is_empty() {
let reason = if payload.username.is_empty() {
String::from("Username not provided")
} else {
String::from("Passphrase not provided")
};
(
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response::ServiceUserLoginResponse {
message: reason,
data: Vec::new(),
}),
)
} else {
match repo::service::exists(&pool, &payload.username).await {
Ok(exists) => {
if !exists {
println!("User does not exists");
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: String::from("Unable to login"),
data: Vec::new(),
}),
)
} else {
println!("Good to create");
let service_user =
match repo::service::get_with_username(&pool, &payload.username).await {
Ok(service_user) => service_user,
Err(err) => {
eprintln!("Error: {err:?}");
return (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: String::from("Unable to login"),
data: Vec::new(),
}),
);
}
};
println!("Service user: {service_user:?}");
println!("Payload: {:?}", payload.passphrase);
let hashed_password = service_user.passphrase.clone();
println!("Hash password: {hashed_password:?}");
match hashing::verify_password(&payload.passphrase, hashed_password) {
Ok(matches) => {
if matches {
// Create token
println!("Creating token");
let key = textsender_models::envy::environment::get_secret_key()
.await
.value;
let (token_literal, duration) =
token_stuff::create_token(&key, &service_user.id).unwrap();
if token_stuff::verify_token(&key, &token_literal) {
let current_time = time::OffsetDateTime::now_utc();
let _ = repo::service::update_last_login(
&pool,
&service_user,
&current_time,
)
.await;
(
axum::http::StatusCode::OK,
axum::Json(response::ServiceUserLoginResponse {
message: String::from(
super::messages::SUCCESSFUL_MESSAGE,
),
data: vec![textsender_models::token::LoginResult {
user_id: service_user.id,
access_token: token_literal,
token_type: String::from(
textsender_models::token::TOKEN_TYPE,
),
issued_at: duration,
..Default::default()
}],
}),
)
} else {
eprintln!("Invalid token");
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: String::from("Invalid attempt"),
data: Vec::new(),
}),
)
}
} else {
eprintln!("No match");
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: String::from("Invalid attempt"),
data: Vec::new(),
}),
)
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::ServiceUserLoginResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
/// Endpoint for service user login
#[utoipa::path(
post,
path = super::endpoints::REFRESH_TOKEN,
request_body(
content = request::RefreshTokenRequest,
description = "Data required refresh token",
content_type = "application/json"
),
responses(
(status = 200, description = "Service uuser login successful", body = response::RefreshTokenResponse),
(status = 400, description = "Bad data", body = response::RefreshTokenResponse),
(status = 500, description = "Something went wrong", body = response::RefreshTokenResponse)
)
)]
pub async fn refresh_token(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::Json(payload): axum::Json<request::RefreshTokenRequest>,
) -> (
axum::http::StatusCode,
axum::Json<response::RefreshTokenResponse>,
) {
if payload.access_token.is_empty() {
let reason = String::from("Access token not provided");
(
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response::RefreshTokenResponse {
message: reason,
data: Vec::new(),
}),
)
} else {
let key = textsender_models::envy::environment::get_secret_key()
.await
.value;
if token_stuff::verify_token(&key, &payload.access_token) {
match token_stuff::extract_id_from_token(&key, &payload.access_token) {
Ok(id) => {
let generate_service_token = |id, key| -> (Option<String>, Option<i64>) {
match token_stuff::create_service_refresh_token(key, id) {
Ok((token, issued)) => (Some(token), Some(issued)),
Err(_err) => (None, None),
}
};
let mut response = response::RefreshTokenResponse {
message: String::new(),
data: Vec::new(),
};
match repo::user::get_with_id(&pool, &id).await {
Ok(_user) => {
let (refresh_token, issued) = generate_service_token(&id, &key);
match refresh_token {
Some(token) => match issued {
Some(issued_at) => {
response.message =
String::from(super::messages::SUCCESSFUL_MESSAGE);
let lr = textsender_models::token::LoginResult {
user_id: id,
access_token: token,
issued_at,
token_type: String::from(
textsender_models::token::TOKEN_TYPE,
),
..Default::default()
};
response.data.push(lr);
(axum::http::StatusCode::OK, axum::Json(response))
}
None => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: String::from("Issued at not returned"),
data: Vec::new(),
}),
),
},
None => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: String::from("Refresh token not generated"),
data: Vec::new(),
}),
),
}
}
Err(err) => {
println!("Unable to find user, checking service user: {err:?}");
match repo::service::get(&pool, &id).await {
Ok(_service_user) => {
let (refresh_token, issued) = generate_service_token(&id, &key);
match refresh_token {
Some(token) => match issued {
Some(issued_at) => {
response.message = String::from(
super::messages::SUCCESSFUL_MESSAGE,
);
let lr = textsender_models::token::LoginResult {
user_id: id,
access_token: token,
issued_at,
token_type: String::from(
textsender_models::token::TOKEN_TYPE,
),
..Default::default()
};
response.data.push(lr);
(axum::http::StatusCode::OK, axum::Json(response))
}
None => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: String::from("Issued at not returned"),
data: Vec::new(),
}),
),
},
None => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: String::from(
"Refresh token not generated",
),
data: Vec::new(),
}),
),
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
} else {
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::RefreshTokenResponse {
message: String::from("Unable to verify token"),
data: Vec::new(),
}),
)
}
}
}
/// Endpoint for a updating password
#[utoipa::path(
patch,
path = super::endpoints::UPDATE_PASSWORD,
request_body(
content = request::UpdatePasswordRequest,
description = "Data required to update password",
content_type = "application/json"
),
responses(
(status = 200, description = "User login successful", body = response::UpdatePasswordResponse),
(status = 400, description = "Bad data", body = response::UpdatePasswordResponse),
(status = 500, description = "Something went wrong", body = response::UpdatePasswordResponse)
)
)]
pub async fn update_password(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::Json(payload): axum::Json<request::UpdatePasswordRequest>,
) -> (
axum::http::StatusCode,
axum::Json<response::UpdatePasswordResponse>,
) {
if !payload.is_valid() {
(
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response::UpdatePasswordResponse {
message: String::from("Invalid passwords"),
data: Vec::new(),
}),
)
} else {
let verify_password = |current_password, hashed_password| -> Result<bool, std::io::Error> {
match hashing::verify_password(current_password, hashed_password) {
Ok(matches) => Ok(matches),
Err(err) => Err(std::io::Error::other(err.to_string())),
}
};
match repo::user::get_with_id(&pool, &payload.user_id).await {
Ok(user) => {
let hashed_password = user.password.clone();
match verify_password(&payload.current_password, hashed_password) {
Ok(matches) => {
if matches {
let (generate_salt, mut salt) = super::register::generate_the_salt();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
let updated_hashed_password = match hashing::hash_password(
&payload.updated_password,
&generate_salt,
) {
Ok(hashed) => hashed,
Err(err) => {
eprintln!("Error: {err:?}");
String::new()
}
};
match repo::user::update_password(
&pool,
&user,
&updated_hashed_password,
)
.await
{
Ok(()) => (
axum::http::StatusCode::OK,
axum::Json(response::UpdatePasswordResponse {
message: String::from(super::messages::SUCCESSFUL_MESSAGE),
data: vec![user.id],
}),
),
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
} else {
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: String::from("Issue updating password"),
data: Vec::new(),
}),
)
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
Err(err) => {
println!("No User found, trying Service User: {err:?}");
// Try service user
match repo::service::get(&pool, &payload.user_id).await {
Ok(service_user) => {
let hashed_password = service_user.passphrase.clone();
match verify_password(&payload.current_password, hashed_password) {
Ok(matches) => {
if matches {
let (generate_salt, mut salt) =
super::register::generate_the_salt();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
let updated_hashed_password = match hashing::hash_password(
&payload.updated_password,
&generate_salt,
) {
Ok(hashed) => hashed,
Err(err) => {
eprintln!("Error: {err:?}");
String::new()
}
};
match repo::service::update_passphrase(
&pool,
&service_user,
&updated_hashed_password,
)
.await
{
Ok(()) => (
axum::http::StatusCode::OK,
axum::Json(response::UpdatePasswordResponse {
message: String::from(
super::messages::SUCCESSFUL_MESSAGE,
),
data: vec![service_user.id],
}),
),
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
} else {
(
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: String::from("Issue updating password"),
data: Vec::new(),
}),
)
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UpdatePasswordResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
}
}
/// Endpoint for a updating password
#[utoipa::path(
patch,
path = super::endpoints::UPDATE_USER_NAME,
request_body(
content = request::UserUpdateNameRequest,
description = "Data required to update name of a user",
content_type = "application/json"
),
responses(
(status = 200, description = "Names were updated", body = response::UserUpdateNameResponse),
(status = 304, description = "Nothing to change", body = response::UserUpdateNameResponse),
(status = 400, description = "Bad data", body = response::UserUpdateNameResponse),
(status = 500, description = "Something went wrong", body = response::UserUpdateNameResponse)
)
)]
pub async fn update_name_of_user(
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
axum::Json(payload): axum::Json<request::UserUpdateNameRequest>,
) -> (
axum::http::StatusCode,
axum::Json<response::UserUpdateNameResponse>,
) {
let (valid_request, reason) = payload.is_valid();
if !valid_request {
(
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response::UserUpdateNameResponse {
message: reason.unwrap_or_default(),
data: Vec::new(),
}),
)
} else {
match repo::user::get_with_id(&pool, &payload.user_id).await {
Ok(user) => {
if user.firstname == payload.firstname || user.lastname == payload.lastname {
(
axum::http::StatusCode::NOT_MODIFIED,
axum::Json(response::UserUpdateNameResponse {
message: String::from("No change"),
data: Vec::new(),
}),
)
} else {
match repo::user::update_name(
&pool,
&user.id,
&payload.firstname,
&payload.lastname,
)
.await
{
Ok(_) => (
axum::http::StatusCode::OK,
axum::Json(response::UserUpdateNameResponse {
message: String::from(super::messages::SUCCESSFUL_MESSAGE),
data: vec![textsender_models::user::User {
id: user.id,
phone_number: user.phone_number,
firstname: payload.firstname,
lastname: payload.lastname,
username: user.username,
created: user.created,
last_login: user.last_login,
..Default::default()
}],
}),
),
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UserUpdateNameResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
Err(err) => (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response::UserUpdateNameResponse {
message: err.to_string(),
data: Vec::new(),
}),
),
}
}
}
+8
View File
@@ -11,4 +11,12 @@ pub mod endpoints {
pub const DBTEST: &str = "/api/v1/test/db"; pub const DBTEST: &str = "/api/v1/test/db";
/// Endpoint constant for service user registration /// Endpoint constant for service user registration
pub const REGISTER_SERVICE_USER: &str = "/api/v1/service/register"; pub const REGISTER_SERVICE_USER: &str = "/api/v1/service/register";
/// Endpoint constant for service login user
pub const LOGIN_SERVICE_USER: &str = "/api/v1/service/login";
/// Endpoint constant for refresh token
pub const REFRESH_TOKEN: &str = "/api/v1/token/refresh";
/// Endpoint constant for updating password
pub const UPDATE_PASSWORD: &str = "/api/v1/user/password/update";
/// Endpoint constant for updating user's name
pub const UPDATE_USER_NAME: &str = "/api/v1/user/name/update";
} }
+4 -3
View File
@@ -59,7 +59,7 @@ pub mod response {
} }
} }
fn generate_the_salt() -> ( pub fn generate_the_salt() -> (
argon2::password_hash::SaltString, argon2::password_hash::SaltString,
textsender_models::user::Salt, textsender_models::user::Salt,
) { ) {
@@ -252,7 +252,7 @@ pub async fn register_service_user(
salt.id = repo::salt::insert(&pool, &salt).await.unwrap(); salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
let mut service_user = textsender_models::user::ServiceUser { let mut service_user = textsender_models::user::ServiceUser {
username: payload.username.clone(), username: payload.username.clone(),
passphrase: hashing::hash_password(&payload.username, &generate_salt) passphrase: hashing::hash_password(&payload.passphrase, &generate_salt)
.unwrap(), .unwrap(),
salt_id: salt.id, salt_id: salt.id,
..Default::default() ..Default::default()
@@ -261,9 +261,10 @@ pub async fn register_service_user(
println!("Creating user"); println!("Creating user");
match repo::service::insert(&pool, &service_user).await { match repo::service::insert(&pool, &service_user).await {
Ok(created) => { Ok((service_user_id, created)) => {
resp.message = String::from(super::messages::SUCCESSFUL_MESSAGE); resp.message = String::from(super::messages::SUCCESSFUL_MESSAGE);
service_user.created = Some(created); service_user.created = Some(created);
service_user.id = service_user_id;
resp.data.push(service_user); resp.data.push(service_user);
(axum::http::StatusCode::CREATED, axum::Json(resp)) (axum::http::StatusCode::CREATED, axum::Json(resp))
} }
+17 -1
View File
@@ -8,7 +8,7 @@ pub mod token_stuff;
pub mod init { pub mod init {
use axum::{ use axum::{
Router, Router,
routing::{get, post}, routing::{get, patch, post},
}; };
use utoipa::OpenApi; use utoipa::OpenApi;
@@ -102,6 +102,22 @@ pub mod init {
post(callers::register::register_service_user), post(callers::register::register_service_user),
) )
.route(callers::endpoints::LOGIN, post(callers::login::user_login)) .route(callers::endpoints::LOGIN, post(callers::login::user_login))
.route(
callers::endpoints::LOGIN_SERVICE_USER,
post(callers::login::service_user_login),
)
.route(
callers::endpoints::REFRESH_TOKEN,
post(callers::login::refresh_token),
)
.route(
callers::endpoints::UPDATE_PASSWORD,
patch(callers::login::update_password),
)
.route(
callers::endpoints::UPDATE_USER_NAME,
patch(callers::login::update_name_of_user),
)
.layer(cors::configure_cors().await) .layer(cors::configure_cors().await)
} }
+84
View File
@@ -41,6 +41,36 @@ pub mod user {
} }
} }
pub async fn get_with_id(
pool: &sqlx::PgPool,
id: &uuid::Uuid,
) -> Result<textsender_models::user::User, sqlx::Error> {
match sqlx::query(
r#"
SELECT id, username, password, phone_number, salt_id, firstname, lastname, created, last_login FROM "user" WHERE id = $1
"#,
)
.bind(id)
.fetch_optional(pool)
.await {
Ok(r) => match r {
Some(r) => Ok(textsender_models::user::User {
id: r.try_get("id")?,
username: r.try_get("username")?,
password: r.try_get("password")?,
phone_number: r.try_get("phone_number")?,
salt_id: r.try_get("salt_id")?,
firstname: r.try_get("firstname")?,
lastname: r.try_get("lastname")?,
created: r.try_get("created")?,
last_login: r.try_get("last_login")?,
}),
None => Err(sqlx::Error::RowNotFound),
},
Err(e) => Err(e),
}
}
pub async fn update_last_login( pub async fn update_last_login(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
user: &textsender_models::user::User, user: &textsender_models::user::User,
@@ -74,6 +104,60 @@ pub mod user {
} }
} }
pub async fn update_password(
pool: &sqlx::PgPool,
user: &textsender_models::user::User,
updated_hashed_password: &String,
) -> Result<(), sqlx::Error> {
match sqlx::query(
r#"
UPDATE "user" SET password = $1 WHERE id = $2
"#,
)
.bind(updated_hashed_password)
.bind(user.id)
.execute(pool)
.await
{
Ok(row) => {
if row.rows_affected() > 0 {
Ok(())
} else {
Err(sqlx::Error::RowNotFound)
}
}
Err(err) => Err(err),
}
}
pub async fn update_name(
pool: &sqlx::PgPool,
id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> Result<(), 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(row) => {
if row.rows_affected() > 0 {
Ok(())
} else {
Err(sqlx::Error::RowNotFound)
}
}
Err(err) => Err(err),
}
}
pub async fn exists(pool: &sqlx::PgPool, username: &String) -> Result<bool, sqlx::Error> { pub async fn exists(pool: &sqlx::PgPool, username: &String) -> Result<bool, sqlx::Error> {
let result = sqlx::query( let result = sqlx::query(
r#" r#"
+115 -9
View File
@@ -49,22 +49,32 @@ pub async fn get_passphrase(
} }
} }
pub async fn get_with_username( pub async fn get(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
username: &String, id: &uuid::Uuid,
) -> Result<textsender_models::user::ServiceUser, sqlx::Error> { ) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
match sqlx::query( match sqlx::query(
r#"SELECT id, username, passphrase, created, last_login FROM "service_user" WHERE username = $1"# r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE id = $1"#
).bind(username) ).bind(id)
.fetch_one(pool).await { .fetch_one(pool).await {
Ok(row) => { Ok(row) => {
let last_login: Option<time::OffsetDateTime> = match row.try_get("last_login") {
Ok(login) => {
Some(login)
}
Err(err) => {
eprintln!("Error: {err:?}");
None
}
};
let service_user = textsender_models::user::ServiceUser { let service_user = textsender_models::user::ServiceUser {
id: row.try_get("id")?, id: row.try_get("id")?,
username: row.try_get("username")?, username: row.try_get("username")?,
passphrase: row.try_get("passphrase")?, passphrase: row.try_get("passphrase")?,
created: row.try_get("created")?, created: row.try_get("created")?,
last_login: row.try_get("last_login")?, last_login,
salt_id: row.try_get("salt_id")? salt_id: row.try_get("salt_id")?,
}; };
Ok(service_user) Ok(service_user)
@@ -75,14 +85,109 @@ pub async fn get_with_username(
} }
} }
pub async fn get_with_username(
pool: &sqlx::PgPool,
username: &String,
) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
match sqlx::query(
r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE username = $1"#
).bind(username)
.fetch_one(pool).await {
Ok(row) => {
let last_login: Option<time::OffsetDateTime> = match row.try_get("last_login") {
Ok(login) => {
Some(login)
}
Err(err) => {
eprintln!("Error: {err:?}");
None
}
};
let service_user = textsender_models::user::ServiceUser {
id: row.try_get("id")?,
username: row.try_get("username")?,
passphrase: row.try_get("passphrase")?,
created: row.try_get("created")?,
last_login,
salt_id: row.try_get("salt_id")?,
};
Ok(service_user)
}
Err(err) => {
Err(err)
}
}
}
pub async fn update_last_login(
pool: &sqlx::PgPool,
service_user: &textsender_models::user::ServiceUser,
time: &time::OffsetDateTime,
) -> Result<time::OffsetDateTime, sqlx::Error> {
let result = sqlx::query(
r#"
UPDATE "service_user" SET last_login = $1 WHERE id = $2 RETURNING last_login
"#,
)
.bind(time)
.bind(service_user.id)
.fetch_optional(pool)
.await
.map_err(|e| {
eprintln!("Error updating time: {e}");
e
});
match result {
Ok(row) => match row {
Some(r) => {
let last_login: time::OffsetDateTime = r
.try_get("last_login")
.map_err(|_e| sqlx::Error::RowNotFound)?;
Ok(last_login)
}
None => Err(sqlx::Error::RowNotFound),
},
Err(err) => Err(err),
}
}
pub async fn update_passphrase(
pool: &sqlx::PgPool,
user: &textsender_models::user::ServiceUser,
updated_hashed_passphrase: &String,
) -> Result<(), sqlx::Error> {
match sqlx::query(
r#"
UPDATE "service_user" SET passphrase = $1 WHERE id = $2
"#,
)
.bind(updated_hashed_passphrase)
.bind(user.id)
.execute(pool)
.await
{
Ok(row) => {
if row.rows_affected() > 0 {
Ok(())
} else {
Err(sqlx::Error::RowNotFound)
}
}
Err(err) => Err(err),
}
}
pub async fn insert( pub async fn insert(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
service_user: &textsender_models::user::ServiceUser, service_user: &textsender_models::user::ServiceUser,
) -> Result<time::OffsetDateTime, sqlx::Error> { ) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> {
match sqlx::query( match sqlx::query(
r#"INSERT INTO "service_user" (username, passphrase, salt_id) r#"INSERT INTO "service_user" (username, passphrase, salt_id)
VALUES ($1, $2, $3) VALUES ($1, $2, $3)
RETURNING created RETURNING id, created
"#, "#,
) )
.bind(&service_user.username) .bind(&service_user.username)
@@ -92,8 +197,9 @@ pub async fn insert(
.await .await
{ {
Ok(row) => { Ok(row) => {
let id: uuid::Uuid = row.try_get("id")?;
let created: time::OffsetDateTime = row.try_get("created")?; let created: time::OffsetDateTime = row.try_get("created")?;
Ok(created) Ok((id, created))
} }
Err(err) => Err(err), Err(err) => Err(err),
} }
+692 -57
View File
@@ -133,6 +133,98 @@ pub mod requests {
app.clone().oneshot(req).await app.clone().oneshot(req).await
} }
/// Function to call service user login endpoint
pub async fn login_service_user(
app: &axum::Router,
username: &str,
passphrase: &str,
) -> Result<axum::response::Response, std::convert::Infallible> {
let payload = serde_json::json!({
"username": username,
"passphrase": passphrase,
});
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(super::callers::endpoints::LOGIN_SERVICE_USER)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
app.clone().oneshot(req).await
}
/// Function to call token refresh endpoint
pub async fn refresh_token(
app: &axum::Router,
access_token: &str,
) -> Result<axum::response::Response, std::convert::Infallible> {
let payload = serde_json::json!({
"access_token": access_token,
});
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(super::callers::endpoints::REFRESH_TOKEN)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap();
app.clone().oneshot(req).await
}
/// Function to call update password endpoint
pub async fn update_password(
app: &axum::Router,
user_id: &uuid::Uuid,
current_password: &str,
updated_password: &str,
confirmed_password: &str,
) -> Result<axum::response::Response, axum::http::Error> {
let payload = serde_json::json!({
"user_id": user_id,
"current_password": current_password,
"updated_password": updated_password,
"confirmed_password": confirmed_password,
});
match axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(super::callers::endpoints::UPDATE_PASSWORD)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
{
Ok(req) => match app.clone().oneshot(req).await {
Ok(resp) => Ok(resp),
Err(err) => Err(axum::http::Error::from(err)),
},
Err(err) => Err(err),
}
}
/// Function to call update name of user endpoint
pub async fn update_name_of_user(
app: &axum::Router,
user_id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> Result<axum::response::Response, axum::http::Error> {
let payload = serde_json::json!({
"user_id": user_id,
"firstname": firstname,
"lastname": lastname,
});
match axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(super::callers::endpoints::UPDATE_USER_NAME)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
{
Ok(req) => match app.clone().oneshot(req).await {
Ok(resp) => Ok(resp),
Err(err) => Err(axum::http::Error::from(err)),
},
Err(err) => Err(err),
}
}
} }
/// Test user firstname /// Test user firstname
@@ -145,74 +237,288 @@ const TEST_USERNAME: &str = "BillyBob01";
const TEST_PASSWORD: &str = "923ndcry392qryudx328qrdy328r"; const TEST_PASSWORD: &str = "923ndcry392qryudx328qrdy328r";
/// Test user phone number /// Test user phone number
const TEST_PHONE_NUMBER: &str = "+10123456789"; const TEST_PHONE_NUMBER: &str = "+10123456789";
/// Test updated user password
const TEST_UPDATED_PASSWORD: &str = "3cnf29ry8q27i3yrc928qi37ryndxc2198q7yd9xzq12837e";
/// Test updated user firstname
const TEST_UPDATED_FIRSTNAME: &str = "Kuoth";
/// Test updated user lastname
const TEST_UPDATED_LASTNAME: &str = "Wech";
/// Test service username /// Test service username
const TEST_SERVICE_USERNAME: &str = "swoon"; const TEST_SERVICE_USERNAME: &str = "swoon";
/// Test service passphrase /// Test service passphrase
const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23"; const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23";
/// Test updated service user passphrase
const TEST_SERVICE_UPDATED_PASSPHRASE: &str = "3487ncfyth934287fcrty32487fry32in7";
async fn convert_response<T>(response: axum::response::Response) -> Result<T, std::io::Error> mod util {
where pub async fn convert_response<T>(
T: serde::de::DeserializeOwned, response: axum::response::Response,
{ ) -> Result<T, std::io::Error>
match axum::body::to_bytes(response.into_body(), usize::MAX).await { where
Ok(body) => { T: serde::de::DeserializeOwned,
let resp: T = serde_json::from_slice(&body).unwrap(); {
Ok(resp) match axum::body::to_bytes(response.into_body(), usize::MAX).await {
Ok(body) => {
let resp: T = match serde_json::from_slice(&body) {
Ok(val) => val,
Err(err) => {
return Err(std::io::Error::other(err.to_string()));
}
};
Ok(resp)
}
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }
async fn register_user( mod flow {
app: &axum::Router, use super::callers;
) -> Result<textsender_models::user::User, std::io::Error> { use super::requests;
match requests::register_user(&app).await { use super::util;
Ok(response) => {
if axum::http::StatusCode::CREATED != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match axum::body::to_bytes(response.into_body(), usize::MAX).await {
Ok(body) => {
let parsed_body: callers::register::response::Response =
serde_json::from_slice(&body).unwrap();
Ok(parsed_body.data[0].clone())
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
async fn login_user( pub async fn register_user(
app: &axum::Router, app: &axum::Router,
username: &str, ) -> Result<textsender_models::user::User, std::io::Error> {
password: &str, match requests::register_user(&app).await {
) -> Result<textsender_models::token::LoginResult, std::io::Error> { Ok(response) => {
match requests::login_user(&app, username, password).await { if axum::http::StatusCode::CREATED != response.status() {
Ok(response) => { Err(std::io::Error::other(format!(
if axum::http::StatusCode::OK != response.status() { "Status code is off {:?}",
Err(std::io::Error::other(format!( response.status()
"Status code is off {:?}", )))
response.status() } else {
))) match util::convert_response::<callers::register::response::Response>(response)
} else { .await
match axum::body::to_bytes(response.into_body(), usize::MAX).await { {
Ok(body) => { Ok(response) => {
let parsed_body: callers::login::response::LoginResponse = if response.data.len() > 0 {
serde_json::from_slice(&body).unwrap(); let user = response.data[0].clone();
Ok(parsed_body.data[0].clone()) Ok(user)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
} }
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn login_user(
app: &axum::Router,
username: &str,
password: &str,
) -> Result<textsender_models::token::LoginResult, std::io::Error> {
match requests::login_user(&app, username, password).await {
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<callers::login::response::LoginResponse>(
response,
)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let user = response.data[0].clone();
Ok(user)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn register_service_user(
app: &axum::Router,
) -> Result<textsender_models::user::ServiceUser, std::io::Error> {
match requests::register_service_user(&app).await {
Ok(response) => {
if axum::http::StatusCode::CREATED != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<
callers::register::response::RegisterServiceUserResponse,
>(response)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let service_user = response.data[0].clone();
Ok(service_user)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn login_service_user(
app: &axum::Router,
username: &str,
passphrase: &str,
) -> Result<textsender_models::token::LoginResult, std::io::Error> {
match requests::login_service_user(&app, username, passphrase).await {
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<callers::login::response::ServiceUserLoginResponse>(
response,
)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let login_result = response.data[0].clone();
Ok(login_result)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn refresh_token(
app: &axum::Router,
access_token: &str,
) -> Result<textsender_models::token::LoginResult, std::io::Error> {
match requests::refresh_token(app, access_token).await {
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<callers::login::response::RefreshTokenResponse>(
response,
)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let login_result = response.data[0].clone();
Ok(login_result)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn update_password(
app: &axum::Router,
user_id: &uuid::Uuid,
current_password: &str,
updated_password: &str,
confirmed_password: &str,
) -> Result<uuid::Uuid, std::io::Error> {
match requests::update_password(
app,
user_id,
current_password,
updated_password,
confirmed_password,
)
.await
{
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<callers::login::response::UpdatePasswordResponse>(
response,
)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let id = response.data[0].clone();
Ok(id)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
pub async fn update_name_of_user(
app: &axum::Router,
user_id: &uuid::Uuid,
firstname: &str,
lastname: &str,
) -> Result<textsender_models::user::User, std::io::Error> {
match requests::update_name_of_user(app, user_id, firstname, lastname).await {
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
Err(std::io::Error::other(format!(
"Status code is off {:?}",
response.status()
)))
} else {
match util::convert_response::<callers::login::response::UserUpdateNameResponse>(
response,
)
.await
{
Ok(response) => {
if response.data.len() > 0 {
let user = response.data[0].clone();
Ok(user)
} else {
Err(std::io::Error::other("No data returned"))
}
}
Err(err) => Err(err),
}
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }
@@ -236,7 +542,7 @@ async fn test_register_user() {
let app = init::routes().await.layer(axum::Extension(pool)); let app = init::routes().await.layer(axum::Extension(pool));
match register_user(&app).await { match flow::register_user(&app).await {
Ok(returned_user) => { Ok(returned_user) => {
assert_eq!( assert_eq!(
TEST_USERNAME, returned_user.username, TEST_USERNAME, returned_user.username,
@@ -276,8 +582,8 @@ async fn test_login_user() {
let app = init::routes().await.layer(axum::Extension(pool)); let app = init::routes().await.layer(axum::Extension(pool));
match register_user(&app).await { match flow::register_user(&app).await {
Ok(user) => match login_user(&app, &user.username, TEST_PASSWORD).await { Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
Ok(login_result) => { Ok(login_result) => {
assert_eq!( assert_eq!(
false, false,
@@ -324,7 +630,7 @@ async fn test_register_service_user() {
match requests::register_service_user(&app).await { match requests::register_service_user(&app).await {
Ok(response) => { Ok(response) => {
match convert_response::<callers::register::response::RegisterServiceUserResponse>( match util::convert_response::<callers::register::response::RegisterServiceUserResponse>(
response, response,
) )
.await .await
@@ -354,3 +660,332 @@ async fn test_register_service_user() {
} }
} }
} }
#[tokio::test]
async fn test_login_service_user() {
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));
match flow::register_service_user(&app).await {
Ok(user) => {
assert_eq!(
false,
user.id.is_nil(),
"The service user id should not be nil"
);
match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
.await
{
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match db_mgr::drop_database(&tm_pool, &db_name).await {
Ok(()) => {}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
#[tokio::test]
async fn test_refresh_token() {
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));
match flow::register_user(&app).await {
Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
match flow::refresh_token(&app, &login_result.access_token).await {
Ok(refresh_login_result) => {
assert_eq!(
false,
refresh_login_result.access_token.is_empty(),
"Refreshed access token should not be empty"
);
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
},
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match flow::register_service_user(&app).await {
Ok(user) => {
assert_eq!(
false,
user.id.is_nil(),
"The service user id should not be nil"
);
match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
.await
{
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
match flow::refresh_token(&app, &login_result.access_token).await {
Ok(refresh_login_result) => {
assert_eq!(
false,
refresh_login_result.access_token.is_empty(),
"Refreshed access token should not be empty"
);
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match db_mgr::drop_database(&tm_pool, &db_name).await {
Ok(()) => {}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
#[tokio::test]
async fn test_update_password() {
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));
match flow::register_user(&app).await {
Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
match flow::update_password(
&app,
&user.id,
TEST_PASSWORD,
TEST_UPDATED_PASSWORD,
TEST_UPDATED_PASSWORD,
)
.await
{
Ok(id) => {
assert_eq!(id, user.id, "Ids do not match");
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
},
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match flow::register_service_user(&app).await {
Ok(service_user) => {
assert_eq!(
false,
service_user.id.is_nil(),
"The service user id should not be nil"
);
match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
.await
{
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
match flow::update_password(
&app,
&service_user.id,
TEST_SERVICE_PASSPHRASE,
TEST_SERVICE_UPDATED_PASSPHRASE,
TEST_SERVICE_UPDATED_PASSPHRASE,
)
.await
{
Ok(id) => {
assert_eq!(id, service_user.id, "Ids do not match");
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match db_mgr::drop_database(&tm_pool, &db_name).await {
Ok(()) => {}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
#[tokio::test]
async fn test_update_name_of_password() {
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));
match flow::register_user(&app).await {
Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
Ok(login_result) => {
assert_eq!(
false,
login_result.access_token.is_empty(),
"Access token is empty when it should not be"
);
match flow::update_name_of_user(
&app,
&user.id,
TEST_UPDATED_FIRSTNAME,
TEST_UPDATED_LASTNAME,
)
.await
{
Ok(user) => {
assert_eq!(
TEST_UPDATED_FIRSTNAME, user.firstname,
"Firstname do not match"
);
assert_eq!(
TEST_UPDATED_LASTNAME, user.lastname,
"Lastname do not match"
);
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}
Err(err) => {
assert!(false, "Error: {err:?}");
}
},
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
match db_mgr::drop_database(&tm_pool, &db_name).await {
Ok(()) => {}
Err(err) => {
assert!(false, "Error: {err:?}");
}
}
}