tsk-14: Update user profile #15
No files matched your search
+145
@@ -0,0 +1,145 @@
|
|||||||
|
pub mod callers;
|
||||||
|
pub mod config;
|
||||||
|
pub mod db;
|
||||||
|
pub mod hashing;
|
||||||
|
pub mod repo;
|
||||||
|
pub mod token_stuff;
|
||||||
|
|
||||||
|
pub mod init {
|
||||||
|
use axum::{
|
||||||
|
Router,
|
||||||
|
routing::{get, patch, post, put},
|
||||||
|
};
|
||||||
|
use utoipa::OpenApi;
|
||||||
|
|
||||||
|
use super::callers;
|
||||||
|
use callers::common as common_callers;
|
||||||
|
use callers::login as login_caller;
|
||||||
|
use callers::register as register_caller;
|
||||||
|
use login_caller::endpoint as login_endpoints;
|
||||||
|
use login_caller::response as login_responses;
|
||||||
|
use register_caller::response as register_responses;
|
||||||
|
|
||||||
|
#[derive(utoipa::OpenApi)]
|
||||||
|
#[openapi(
|
||||||
|
paths(
|
||||||
|
common_callers::endpoint::db_ping, common_callers::endpoint::root,
|
||||||
|
register_caller::register_user,
|
||||||
|
login_endpoints::login, login_endpoints::update_password, login_endpoints::service_login, login_endpoints::refresh_token, login_endpoints::get_user_profile,
|
||||||
|
),
|
||||||
|
components(schemas(common_callers::response::TestResult,
|
||||||
|
register_responses::Response,
|
||||||
|
login_responses::Response, login_responses::service_login::Response, login_responses::update_password::Response, login_responses::refresh_token::Response, login_responses::get_user_profile::GetUserProfileResponse)),
|
||||||
|
tags(
|
||||||
|
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
struct ApiDoc;
|
||||||
|
|
||||||
|
mod cors {
|
||||||
|
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
|
||||||
|
let cors = tower_http::cors::CorsLayer::new()
|
||||||
|
.allow_methods([
|
||||||
|
axum::http::Method::GET,
|
||||||
|
axum::http::Method::PATCH,
|
||||||
|
axum::http::Method::POST,
|
||||||
|
axum::http::Method::PUT,
|
||||||
|
axum::http::Method::DELETE,
|
||||||
|
])
|
||||||
|
.allow_headers([
|
||||||
|
axum::http::header::CONTENT_TYPE,
|
||||||
|
axum::http::header::AUTHORIZATION,
|
||||||
|
])
|
||||||
|
.allow_credentials(true)
|
||||||
|
.max_age(std::time::Duration::from_secs(3600));
|
||||||
|
|
||||||
|
// Dynamically set the allowed origin based on the environment
|
||||||
|
match std::env::var(sienvy::keys::APP_ENV).as_deref() {
|
||||||
|
Ok("production") => {
|
||||||
|
let allowed_origins_env = sienvy::environment::get_allowed_origins();
|
||||||
|
match sienvy::utility::delimitize(&allowed_origins_env) {
|
||||||
|
Ok(alwd) => {
|
||||||
|
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
|
||||||
|
.into_iter()
|
||||||
|
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
|
||||||
|
.collect();
|
||||||
|
cors.allow_origin(allowed_origins)
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
eprintln!(
|
||||||
|
"Could not parse out allowed origins from env: Error: {err:?}"
|
||||||
|
);
|
||||||
|
std::process::exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// Development (default): Allow localhost origins
|
||||||
|
cors.allow_origin(vec![
|
||||||
|
"http://localhost:4200".parse().unwrap(),
|
||||||
|
"http://127.0.0.1:4200".parse().unwrap(),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn routes() -> Router {
|
||||||
|
// build our application with a route
|
||||||
|
Router::new()
|
||||||
|
.route(
|
||||||
|
callers::endpoints::DBTEST,
|
||||||
|
get(callers::common::endpoint::db_ping),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::ROOT,
|
||||||
|
get(callers::common::endpoint::root),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::REGISTER,
|
||||||
|
post(callers::register::register_user),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::LOGIN,
|
||||||
|
post(callers::login::endpoint::login),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::UPDATE_PASSWORD,
|
||||||
|
patch(callers::login::endpoint::update_password),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::SERVICE_LOGIN,
|
||||||
|
post(callers::login::endpoint::service_login),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::REFRESH_TOKEN,
|
||||||
|
post(callers::login::endpoint::refresh_token),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::GET_USER_PROFILE,
|
||||||
|
get(callers::login::endpoint::get_user_profile),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
callers::endpoints::UPDATE_USER_PROFILE,
|
||||||
|
put(callers::login::endpoint::update_user_profile),
|
||||||
|
)
|
||||||
|
.layer(cors::configure_cors().await)
|
||||||
|
.layer(cors::configure_cors().await)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn app() -> Router {
|
||||||
|
let pool = super::db::init::create_pool()
|
||||||
|
.await
|
||||||
|
.expect("Failed to create pool");
|
||||||
|
|
||||||
|
super::db::init::migrations(&pool).await;
|
||||||
|
|
||||||
|
routes()
|
||||||
|
.await
|
||||||
|
.merge(
|
||||||
|
utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
|
||||||
|
.url("/api-docs/openapi.json", ApiDoc::openapi()),
|
||||||
|
)
|
||||||
|
.layer(axum::Extension(pool))
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
-145
@@ -1,9 +1,5 @@
|
|||||||
pub mod callers;
|
use soaricarus_auth;
|
||||||
pub mod config;
|
use soaricarus_auth::init;
|
||||||
pub mod db;
|
|
||||||
pub mod hashing;
|
|
||||||
pub mod repo;
|
|
||||||
pub mod token_stuff;
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
@@ -13,148 +9,18 @@ async fn main() {
|
|||||||
let app = init::app().await;
|
let app = init::app().await;
|
||||||
|
|
||||||
// run our app with hyper, listening globally on port 8001
|
// run our app with hyper, listening globally on port 8001
|
||||||
let url = config::get_full();
|
let url = soaricarus_auth::config::get_full();
|
||||||
let listener = tokio::net::TcpListener::bind(url).await.unwrap();
|
let listener = tokio::net::TcpListener::bind(url).await.unwrap();
|
||||||
axum::serve(listener, app).await.unwrap();
|
axum::serve(listener, app).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
mod init {
|
|
||||||
use axum::{
|
|
||||||
Router,
|
|
||||||
routing::{get, patch, post},
|
|
||||||
};
|
|
||||||
use utoipa::OpenApi;
|
|
||||||
|
|
||||||
use super::callers;
|
|
||||||
use callers::common as common_callers;
|
|
||||||
use callers::login as login_caller;
|
|
||||||
use callers::register as register_caller;
|
|
||||||
use login_caller::endpoint as login_endpoints;
|
|
||||||
use login_caller::response as login_responses;
|
|
||||||
use register_caller::response as register_responses;
|
|
||||||
|
|
||||||
#[derive(utoipa::OpenApi)]
|
|
||||||
#[openapi(
|
|
||||||
paths(
|
|
||||||
common_callers::endpoint::db_ping, common_callers::endpoint::root,
|
|
||||||
register_caller::register_user,
|
|
||||||
login_endpoints::login, login_endpoints::update_password, login_endpoints::service_login, login_endpoints::refresh_token, login_endpoints::get_user_profile,
|
|
||||||
),
|
|
||||||
components(schemas(common_callers::response::TestResult,
|
|
||||||
register_responses::Response,
|
|
||||||
login_responses::Response, login_responses::service_login::Response, login_responses::update_password::Response, login_responses::refresh_token::Response, login_responses::get_user_profile::GetUserProfileResponse)),
|
|
||||||
tags(
|
|
||||||
(name = "soaricarus Auth API", description = "Auth API for soaricarus API")
|
|
||||||
)
|
|
||||||
)]
|
|
||||||
struct ApiDoc;
|
|
||||||
|
|
||||||
mod cors {
|
|
||||||
pub async fn configure_cors() -> tower_http::cors::CorsLayer {
|
|
||||||
let cors = tower_http::cors::CorsLayer::new()
|
|
||||||
.allow_methods([
|
|
||||||
axum::http::Method::GET,
|
|
||||||
axum::http::Method::PATCH,
|
|
||||||
axum::http::Method::POST,
|
|
||||||
axum::http::Method::PUT,
|
|
||||||
axum::http::Method::DELETE,
|
|
||||||
])
|
|
||||||
.allow_headers([
|
|
||||||
axum::http::header::CONTENT_TYPE,
|
|
||||||
axum::http::header::AUTHORIZATION,
|
|
||||||
])
|
|
||||||
.allow_credentials(true)
|
|
||||||
.max_age(std::time::Duration::from_secs(3600));
|
|
||||||
|
|
||||||
// Dynamically set the allowed origin based on the environment
|
|
||||||
match std::env::var(sienvy::keys::APP_ENV).as_deref() {
|
|
||||||
Ok("production") => {
|
|
||||||
let allowed_origins_env = sienvy::environment::get_allowed_origins();
|
|
||||||
match sienvy::utility::delimitize(&allowed_origins_env) {
|
|
||||||
Ok(alwd) => {
|
|
||||||
let allowed_origins: Vec<axum::http::HeaderValue> = alwd
|
|
||||||
.into_iter()
|
|
||||||
.map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
|
|
||||||
.collect();
|
|
||||||
cors.allow_origin(allowed_origins)
|
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
eprintln!(
|
|
||||||
"Could not parse out allowed origins from env: Error: {err:?}"
|
|
||||||
);
|
|
||||||
std::process::exit(-1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
// Development (default): Allow localhost origins
|
|
||||||
cors.allow_origin(vec![
|
|
||||||
"http://localhost:4200".parse().unwrap(),
|
|
||||||
"http://127.0.0.1:4200".parse().unwrap(),
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn routes() -> Router {
|
|
||||||
// build our application with a route
|
|
||||||
Router::new()
|
|
||||||
.route(
|
|
||||||
callers::endpoints::DBTEST,
|
|
||||||
get(callers::common::endpoint::db_ping),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::ROOT,
|
|
||||||
get(callers::common::endpoint::root),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::REGISTER,
|
|
||||||
post(callers::register::register_user),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::LOGIN,
|
|
||||||
post(callers::login::endpoint::login),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::UPDATE_PASSWORD,
|
|
||||||
patch(callers::login::endpoint::update_password),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::SERVICE_LOGIN,
|
|
||||||
post(callers::login::endpoint::service_login),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::REFRESH_TOKEN,
|
|
||||||
post(callers::login::endpoint::refresh_token),
|
|
||||||
)
|
|
||||||
.route(
|
|
||||||
callers::endpoints::GET_USER_PROFILE,
|
|
||||||
get(callers::login::endpoint::get_user_profile),
|
|
||||||
)
|
|
||||||
.layer(cors::configure_cors().await)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn app() -> Router {
|
|
||||||
let pool = super::db::init::create_pool()
|
|
||||||
.await
|
|
||||||
.expect("Failed to create pool");
|
|
||||||
|
|
||||||
super::db::init::migrations(&pool).await;
|
|
||||||
|
|
||||||
routes()
|
|
||||||
.await
|
|
||||||
.merge(
|
|
||||||
utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
|
|
||||||
.url("/api-docs/openapi.json", ApiDoc::openapi()),
|
|
||||||
)
|
|
||||||
.layer(axum::Extension(pool))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use soaricarus_auth;
|
||||||
|
use soaricarus_auth::callers;
|
||||||
|
use soaricarus_auth::db;
|
||||||
|
|
||||||
use axum::{
|
use axum::{
|
||||||
body::Body,
|
body::Body,
|
||||||
@@ -274,10 +140,19 @@ mod tests {
|
|||||||
"confirmed_password": "SpeakWithUrChest22!"
|
"confirmed_password": "SpeakWithUrChest22!"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn update_user_profile(user_id: &uuid::Uuid, firstname: &str, lastname: &str) -> serde_json::Value {
|
||||||
|
json!({
|
||||||
|
"firstname": firstname,
|
||||||
|
"lastname": lastname,
|
||||||
|
"user_id": user_id
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod requests {
|
pub mod requests {
|
||||||
use tower::ServiceExt; // for `call`, `oneshot`, and `ready`
|
use tower::ServiceExt; // for `call`, `oneshot`, and `ready`
|
||||||
|
use soaricarus_auth::callers;
|
||||||
|
|
||||||
pub async fn register(
|
pub async fn register(
|
||||||
app: &axum::Router,
|
app: &axum::Router,
|
||||||
@@ -286,7 +161,7 @@ mod tests {
|
|||||||
let payload = super::get_test_register_payload(&usr);
|
let payload = super::get_test_register_payload(&usr);
|
||||||
let req = axum::http::Request::builder()
|
let req = axum::http::Request::builder()
|
||||||
.method(axum::http::Method::POST)
|
.method(axum::http::Method::POST)
|
||||||
.uri(crate::callers::endpoints::REGISTER)
|
.uri(callers::endpoints::REGISTER)
|
||||||
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
||||||
.body(axum::body::Body::from(payload.to_string()))
|
.body(axum::body::Body::from(payload.to_string()))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -301,7 +176,7 @@ mod tests {
|
|||||||
let payload = super::get_test_login_payload(&usr);
|
let payload = super::get_test_login_payload(&usr);
|
||||||
let req = axum::http::Request::builder()
|
let req = axum::http::Request::builder()
|
||||||
.method(axum::http::Method::POST)
|
.method(axum::http::Method::POST)
|
||||||
.uri(crate::callers::endpoints::LOGIN)
|
.uri(callers::endpoints::LOGIN)
|
||||||
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
||||||
.body(axum::body::Body::from(payload.to_string()))
|
.body(axum::body::Body::from(payload.to_string()))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -316,7 +191,7 @@ mod tests {
|
|||||||
let payload = super::test_data::get_updated_password(user_id);
|
let payload = super::test_data::get_updated_password(user_id);
|
||||||
let req = axum::http::Request::builder()
|
let req = axum::http::Request::builder()
|
||||||
.method(axum::http::Method::PATCH)
|
.method(axum::http::Method::PATCH)
|
||||||
.uri(crate::callers::endpoints::UPDATE_PASSWORD)
|
.uri(callers::endpoints::UPDATE_PASSWORD)
|
||||||
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
||||||
.body(axum::body::Body::from(payload.to_string()))
|
.body(axum::body::Body::from(payload.to_string()))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -328,7 +203,7 @@ mod tests {
|
|||||||
app: &axum::Router,
|
app: &axum::Router,
|
||||||
user_id: &uuid::Uuid,
|
user_id: &uuid::Uuid,
|
||||||
) -> Result<axum::response::Response, std::convert::Infallible> {
|
) -> Result<axum::response::Response, std::convert::Infallible> {
|
||||||
let raw_uri = String::from(crate::callers::endpoints::GET_USER_PROFILE);
|
let raw_uri = String::from(callers::endpoints::GET_USER_PROFILE);
|
||||||
let end_index = raw_uri.len() - 4;
|
let end_index = raw_uri.len() - 4;
|
||||||
|
|
||||||
let uri = format!("{}{user_id}", (&raw_uri[..end_index]).to_string());
|
let uri = format!("{}{user_id}", (&raw_uri[..end_index]).to_string());
|
||||||
@@ -340,6 +215,23 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
app.clone().oneshot(req).await
|
app.clone().oneshot(req).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn update_user_profile(
|
||||||
|
app: &axum::Router,
|
||||||
|
user_id: &uuid::Uuid,
|
||||||
|
firstname: &str,
|
||||||
|
lastname: &str,
|
||||||
|
) -> Result<axum::response::Response, std::convert::Infallible> {
|
||||||
|
let payload = super::test_data::update_user_profile(user_id, firstname, lastname);
|
||||||
|
let req = axum::http::Request::builder()
|
||||||
|
.method(axum::http::Method::PUT)
|
||||||
|
.uri(callers::endpoints::UPDATE_USER_PROFILE)
|
||||||
|
.header(axum::http::header::CONTENT_TYPE, "application/json")
|
||||||
|
.body(axum::body::Body::from(payload.to_string()))
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
app.clone().oneshot(req).await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -575,7 +467,7 @@ mod tests {
|
|||||||
let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap();
|
let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap();
|
||||||
let key = sienvy::environment::get_secret_key().value;
|
let key = sienvy::environment::get_secret_key().value;
|
||||||
|
|
||||||
match token_stuff::create_service_token(&key, &id) {
|
match soaricarus_auth::token_stuff::create_service_token(&key, &id) {
|
||||||
Ok((token, _expire)) => {
|
Ok((token, _expire)) => {
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
"access_token": token
|
"access_token": token
|
||||||
|
|||||||
Reference in new issue
Block a user