style: cargo clippy & cargo fmt
This commit is contained in:
parent
19f64d413c
commit
e59f7b5a1f
20 changed files with 137 additions and 67 deletions
|
@ -10,10 +10,7 @@ use crate::{
|
|||
Data,
|
||||
error::Error,
|
||||
schema::*,
|
||||
utils::{
|
||||
PASSWORD_REGEX, generate_token, new_refresh_token_cookie,
|
||||
user_uuid_from_identifier,
|
||||
},
|
||||
utils::{PASSWORD_REGEX, generate_token, new_refresh_token_cookie, user_uuid_from_identifier},
|
||||
};
|
||||
|
||||
use super::Response;
|
||||
|
|
|
@ -42,7 +42,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
|
|||
.execute(&mut conn)
|
||||
.await
|
||||
{
|
||||
error!("{}", error);
|
||||
error!("{error}");
|
||||
}
|
||||
|
||||
refresh_token_cookie.make_removal();
|
||||
|
@ -70,7 +70,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
|
|||
refresh_token = new_refresh_token;
|
||||
}
|
||||
Err(error) => {
|
||||
error!("{}", error);
|
||||
error!("{error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,11 +12,17 @@ use uuid::Uuid;
|
|||
|
||||
use super::Response;
|
||||
use crate::{
|
||||
error::Error, objects::Member, schema::{
|
||||
access_tokens::{self, dsl as adsl}, refresh_tokens::{self, dsl as rdsl}, users::{self, dsl as udsl}
|
||||
}, utils::{
|
||||
generate_token, new_refresh_token_cookie, EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX
|
||||
}, Data
|
||||
Data,
|
||||
error::Error,
|
||||
objects::Member,
|
||||
schema::{
|
||||
access_tokens::{self, dsl as adsl},
|
||||
refresh_tokens::{self, dsl as rdsl},
|
||||
users::{self, dsl as udsl},
|
||||
},
|
||||
utils::{
|
||||
EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX, generate_token, new_refresh_token_cookie,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
|
|
|
@ -72,8 +72,7 @@ pub async fn post(
|
|||
reset_password: web::Json<ResetPassword>,
|
||||
data: web::Data<Data>,
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let password_reset_token =
|
||||
PasswordResetToken::get(&data, reset_password.token.clone()).await?;
|
||||
let password_reset_token = PasswordResetToken::get(&data, reset_password.token.clone()).await?;
|
||||
|
||||
password_reset_token
|
||||
.set_password(&data, reset_password.password.clone())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue