phil/ezidam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated api to create totp struct, get totp secret directly if it exists

Browse source
This commit is contained in:
Philippe Loctaux 2023-05-01 11:48:57 +02:00
parent e70d035c86
commit f891d2f940
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ezidam/src/routes/settings/security.rs
View file

@ -34,7 +34,7 @@ pub async fn user_settings_security(
let page = Page::UserSecuritySettings(super::content::UserSecuritySettings {
user: jwt_user.0,
logout_time_effective: JWT_DURATION_MINUTES,
totp_enabled: user.is_totp_enabled(),
totp_enabled: user.totp_secret().is_some(),
});
Ok(flash
@ -261,7 +261,7 @@ pub async fn user_settings_security_totp(
let totp = totp::new(
totp::secret_to_bytes(&secret)?,
issuer,
Some(issuer),
jwt_user.0.username.to_string(),
)?;
@ -305,7 +305,7 @@ pub async fn user_settings_security_totp_form(
// Get settings
let settings = Settings::get(&mut transaction).await?;
// Get issuer
// Get totp issuer
let issuer = settings
.url()
.map(Url::parse)
@ -316,7 +316,7 @@ pub async fn user_settings_security_totp_form(
transaction.commit().await?;
if disable {
return match user.is_totp_enabled() {
return match user.totp_secret().is_some() {
true => {
// Delete secret and backup
let mut transaction = db.begin().await?;
@ -340,7 +340,7 @@ pub async fn user_settings_security_totp_form(
};
}
if enable && user.is_totp_enabled() {
if enable && user.totp_secret().is_some() {
return Ok(Flash::new(
Redirect::to(uri!(user_settings_security)),
FlashKind::Warning,
@ -355,7 +355,11 @@ pub async fn user_settings_security_totp_form(
let totp_secret = totp::secret_to_bytes(&secret)?;
let totp = totp::new(totp_secret.clone(), issuer, user.username().to_string())?;
let totp = totp::new(
totp_secret.clone(),
Some(issuer),
user.username().to_string(),
)?;
if let Some(token) = form.token {
return if totp.check_current(token)? {