style: cargo clippy && format
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
This commit is contained in:
parent
860fa7a66e
commit
8605b81e7b
26 changed files with 274 additions and 178 deletions
|
@ -2,13 +2,17 @@ use std::time::{SystemTime, UNIX_EPOCH};
|
|||
|
||||
use actix_web::{HttpResponse, post, web};
|
||||
use argon2::{PasswordHash, PasswordVerifier};
|
||||
use diesel::{dsl::insert_into, ExpressionMethods, QueryDsl};
|
||||
use diesel::{ExpressionMethods, QueryDsl, dsl::insert_into};
|
||||
use diesel_async::RunQueryDsl;
|
||||
use serde::Deserialize;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
error::Error, api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, schema::*, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
|
||||
Data,
|
||||
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX},
|
||||
error::Error,
|
||||
schema::*,
|
||||
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
|
||||
};
|
||||
|
||||
use super::Response;
|
||||
|
@ -79,34 +83,45 @@ async fn login(
|
|||
) -> Result<HttpResponse, Error> {
|
||||
let mut conn = data.pool.get().await?;
|
||||
|
||||
let parsed_hash = PasswordHash::new(&database_password).map_err(|e| Error::PasswordHashError(e.to_string()))?;
|
||||
let parsed_hash = PasswordHash::new(&database_password)
|
||||
.map_err(|e| Error::PasswordHashError(e.to_string()))?;
|
||||
|
||||
if data
|
||||
.argon2
|
||||
.verify_password(request_password.as_bytes(), &parsed_hash)
|
||||
.is_err()
|
||||
{
|
||||
return Err(Error::Unauthorized("Wrong username or password".to_string()));
|
||||
return Err(Error::Unauthorized(
|
||||
"Wrong username or password".to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
let refresh_token = generate_refresh_token()?;
|
||||
let access_token = generate_access_token()?;
|
||||
|
||||
let current_time = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)?
|
||||
.as_secs() as i64;
|
||||
let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
|
||||
|
||||
use refresh_tokens::dsl as rdsl;
|
||||
|
||||
insert_into(refresh_tokens::table)
|
||||
.values((rdsl::token.eq(&refresh_token), rdsl::uuid.eq(uuid), rdsl::created_at.eq(current_time), rdsl::device_name.eq(device_name)))
|
||||
.values((
|
||||
rdsl::token.eq(&refresh_token),
|
||||
rdsl::uuid.eq(uuid),
|
||||
rdsl::created_at.eq(current_time),
|
||||
rdsl::device_name.eq(device_name),
|
||||
))
|
||||
.execute(&mut conn)
|
||||
.await?;
|
||||
|
||||
use access_tokens::dsl as adsl;
|
||||
|
||||
insert_into(access_tokens::table)
|
||||
.values((adsl::token.eq(&access_token), adsl::refresh_token.eq(&refresh_token), adsl::uuid.eq(uuid), adsl::created_at.eq(current_time)))
|
||||
.values((
|
||||
adsl::token.eq(&access_token),
|
||||
adsl::refresh_token.eq(&refresh_token),
|
||||
adsl::uuid.eq(uuid),
|
||||
adsl::created_at.eq(current_time),
|
||||
))
|
||||
.execute(&mut conn)
|
||||
.await?;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue