phoenix/schedtxt_auth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refresh endpoint #7

Merged
phoenix merged 8 commits from refresh_token into main 2026-06-12 10:51:40 -04:00
Conversation 0 Commits 8 Files Changed 8
+535 -118
8 changed files with 535 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -2213,7 +2213,7 @@ dependencies = [
[[package]]
name = "textsender_auth"
version = "0.1.17"
version = "0.1.18"
dependencies = [
"argon2",
"async-std",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "textsender_auth"
version = "0.1.17"
version = "0.1.18"
edition = "2024"
rust-version = "1.95"
src/callers/login.rs
+172
View File
@@ -32,6 +32,11 @@ pub mod request {
}
}
}
#[derive(Deserialize, utoipa::ToSchema)]
pub struct RefreshTokenRequest {
pub access_token: String,
}
}
pub mod response {
@@ -57,6 +62,12 @@ pub mod response {
let _parsed_body: LoginResponse = serde_json::from_slice(&body).unwrap();
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>,
}
}
/// Endpoint for a user login
@@ -337,3 +348,164 @@ pub async fn service_user_login(
}
}
}
/// 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(),
}),
)
}
}
}
src/callers/mod.rs
+2
View File
@@ -13,4 +13,6 @@ pub mod endpoints {
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";
}
src/lib.rs
+4
View File
@@ -106,6 +106,10 @@ pub mod init {
callers::endpoints::LOGIN_SERVICE_USER,
post(callers::login::service_user_login),
)
.route(
callers::endpoints::REFRESH_TOKEN,
post(callers::login::refresh_token),
)
.layer(cors::configure_cors().await)
}
src/repo/mod.rs
+30
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(
pool: &sqlx::PgPool,
user: &textsender_models::user::User,
src/repo/service.rs
+36
View File
@@ -49,6 +49,42 @@ pub async fn get_passphrase(
}
}
pub async fn get(
pool: &sqlx::PgPool,
id: &uuid::Uuid,
) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
match sqlx::query(
r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE id = $1"#
).bind(id)
.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 get_with_username(
pool: &sqlx::PgPool,
username: &String,
tests/tests.rs
+289 -116
View File
@@ -134,6 +134,7 @@ pub mod requests {
app.clone().oneshot(req).await
}
/// Function to call service user login endpoint
pub async fn login_service_user(
app: &axum::Router,
username: &str,
@@ -152,6 +153,24 @@ pub mod requests {
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
}
}
/// Test user firstname
@@ -170,140 +189,194 @@ const TEST_SERVICE_USERNAME: &str = "swoon";
/// Test service passphrase
const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23";
async fn convert_response<T>(response: axum::response::Response) -> Result<T, std::io::Error>
where
T: serde::de::DeserializeOwned,
{
match axum::body::to_bytes(response.into_body(), usize::MAX).await {
Ok(body) => {
let resp: T = serde_json::from_slice(&body).unwrap();
Ok(resp)
mod util {
pub async fn convert_response<T>(
response: axum::response::Response,
) -> Result<T, std::io::Error>
where
T: serde::de::DeserializeOwned,
{
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(
app: &axum::Router,
) -> Result<textsender_models::user::User, std::io::Error> {
match requests::register_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 convert_response::<callers::register::response::Response>(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())),
}
}
mod flow {
use super::callers;
use super::requests;
use super::util;
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 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"))
pub async fn register_user(
app: &axum::Router,
) -> Result<textsender_models::user::User, std::io::Error> {
match requests::register_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::Response>(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(err),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
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 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"))
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(err),
}
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
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 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"))
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(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())),
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
@@ -327,7 +400,7 @@ async fn test_register_user() {
let app = init::routes().await.layer(axum::Extension(pool));
match register_user(&app).await {
match flow::register_user(&app).await {
Ok(returned_user) => {
assert_eq!(
TEST_USERNAME, returned_user.username,
@@ -367,8 +440,8 @@ async fn test_login_user() {
let app = init::routes().await.layer(axum::Extension(pool));
match register_user(&app).await {
Ok(user) => match login_user(&app, &user.username, TEST_PASSWORD).await {
match flow::register_user(&app).await {
Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
Ok(login_result) => {
assert_eq!(
false,
@@ -415,7 +488,7 @@ async fn test_register_service_user() {
match requests::register_service_user(&app).await {
Ok(response) => {
match convert_response::<callers::register::response::RegisterServiceUserResponse>(
match util::convert_response::<callers::register::response::RegisterServiceUserResponse>(
response,
)
.await
@@ -466,14 +539,16 @@ async fn test_login_service_user() {
let app = init::routes().await.layer(axum::Extension(pool));
match register_service_user(&app).await {
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 login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE).await {
match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
.await
{
Ok(login_result) => {
assert_eq!(
false,
@@ -498,3 +573,101 @@ async fn test_login_service_user() {
}
}
}
#[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:?}");
}
}
}