Service login (#6)
Rust Build / Rustfmt (push) Successful in 1m24s
Rust Build / Check (push) Successful in 1m29s
Rust Build / Test Suite (push) Successful in 1m29s
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 / Check (pull_request) Successful in 1m47s
Rust Build / Clippy (pull_request) Successful in 1m40s
Rust Build / build (pull_request) Successful in 1m36s
Rust Build / Rustfmt (push) Successful in 1m24s
Rust Build / Check (push) Successful in 1m29s
Rust Build / Test Suite (push) Successful in 1m29s
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 / Check (pull_request) Successful in 1m47s
Rust Build / Clippy (pull_request) Successful in 1m40s
Rust Build / build (pull_request) Successful in 1m36s
Reviewed-on: phoenix/textsender-auth#6
This commit was merged in pull request #6.
This commit is contained in:
@@ -9,6 +9,29 @@ pub mod request {
|
||||
pub username: 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub mod response {
|
||||
@@ -19,6 +42,12 @@ pub mod response {
|
||||
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(
|
||||
response: axum::response::Response,
|
||||
) -> Result<LoginResponse, std::io::Error> {
|
||||
@@ -160,3 +189,151 @@ 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,
|
||||
¤t_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(),
|
||||
}),
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,4 +11,6 @@ pub mod endpoints {
|
||||
pub const DBTEST: &str = "/api/v1/test/db";
|
||||
/// Endpoint constant for service user registration
|
||||
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";
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ pub async fn register_service_user(
|
||||
salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
|
||||
let mut service_user = textsender_models::user::ServiceUser {
|
||||
username: payload.username.clone(),
|
||||
passphrase: hashing::hash_password(&payload.username, &generate_salt)
|
||||
passphrase: hashing::hash_password(&payload.passphrase, &generate_salt)
|
||||
.unwrap(),
|
||||
salt_id: salt.id,
|
||||
..Default::default()
|
||||
@@ -261,9 +261,10 @@ pub async fn register_service_user(
|
||||
println!("Creating user");
|
||||
|
||||
match repo::service::insert(&pool, &service_user).await {
|
||||
Ok(created) => {
|
||||
Ok((service_user_id, created)) => {
|
||||
resp.message = String::from(super::messages::SUCCESSFUL_MESSAGE);
|
||||
service_user.created = Some(created);
|
||||
service_user.id = service_user_id;
|
||||
resp.data.push(service_user);
|
||||
(axum::http::StatusCode::CREATED, axum::Json(resp))
|
||||
}
|
||||
|
||||
@@ -102,6 +102,10 @@ pub mod init {
|
||||
post(callers::register::register_service_user),
|
||||
)
|
||||
.route(callers::endpoints::LOGIN, post(callers::login::user_login))
|
||||
.route(
|
||||
callers::endpoints::LOGIN_SERVICE_USER,
|
||||
post(callers::login::service_user_login),
|
||||
)
|
||||
.layer(cors::configure_cors().await)
|
||||
}
|
||||
|
||||
|
||||
+50
-6
@@ -54,17 +54,27 @@ pub async fn get_with_username(
|
||||
username: &String,
|
||||
) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
|
||||
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 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: row.try_get("last_login")?,
|
||||
salt_id: row.try_get("salt_id")?
|
||||
last_login,
|
||||
salt_id: row.try_get("salt_id")?,
|
||||
};
|
||||
|
||||
Ok(service_user)
|
||||
@@ -75,14 +85,47 @@ pub async fn get_with_username(
|
||||
}
|
||||
}
|
||||
|
||||
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 insert(
|
||||
pool: &sqlx::PgPool,
|
||||
service_user: &textsender_models::user::ServiceUser,
|
||||
) -> Result<time::OffsetDateTime, sqlx::Error> {
|
||||
) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> {
|
||||
match sqlx::query(
|
||||
r#"INSERT INTO "service_user" (username, passphrase, salt_id)
|
||||
VALUES ($1, $2, $3)
|
||||
RETURNING created
|
||||
RETURNING id, created
|
||||
"#,
|
||||
)
|
||||
.bind(&service_user.username)
|
||||
@@ -92,8 +135,9 @@ pub async fn insert(
|
||||
.await
|
||||
{
|
||||
Ok(row) => {
|
||||
let id: uuid::Uuid = row.try_get("id")?;
|
||||
let created: time::OffsetDateTime = row.try_get("created")?;
|
||||
Ok(created)
|
||||
Ok((id, created))
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user