matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-07 22:41:18 +03:00
Code Activity

storage: user and user email repository

Browse Source
This commit is contained in:
Quentin Gliech
2023-01-02 15:28:44 +01:00
parent 870a37151f
commit 13a9d03647
26 changed files with 2148 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/cli/src/commands/manage.rs
View File

@ -20,9 +20,7 @@ use mas_router::UrlBuilder;
use mas_storage::{
oauth2::client::{insert_client_from_config, lookup_client, truncate_clients},
upstream_oauth2::UpstreamOAuthProviderRepository,
user::{
add_user_password, lookup_user_by_username, lookup_user_email, mark_user_email_as_verified,
},
user::{add_user_password, UserEmailRepository, UserRepository},
Clock, Repository,
};
use oauth2_types::scope::Scope;
@ -202,7 +200,9 @@ impl Options {
let password_manager = password_manager_from_config(&passwords_config).await?;
let mut txn = pool.begin().await?;
let user = lookup_user_by_username(&mut txn, username)
let user = txn
.user()
.find_by_username(username)
.await?
.context("User not found")?;
@ -232,13 +232,18 @@ impl Options {
let pool = database_from_config(&config).await?;
let mut txn = pool.begin().await?;
let user = lookup_user_by_username(&mut txn, username)
let user = txn
.user()
.find_by_username(username)
.await?
.context("User not found")?;
let email = lookup_user_email(&mut txn, &user, email)
let email = txn
.user_email()
.find(&user, email)
.await?
.context("Email not found")?;
let email = mark_user_email_as_verified(&mut txn, &clock, email).await?;
let email = txn.user_email().mark_as_verified(&clock, email).await?;
txn.commit().await?;
info!(?email, "Email marked as verified");