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: unify most oauth2 related errors

Browse Source
This commit is contained in:
Quentin Gliech
2022-12-07 20:11:49 +01:00
parent b7cad48bbd
commit 102571512e
15 changed files with 261 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ use mas_storage::{
lookup_user_by_username, lookup_user_email, mark_user_email_as_verified, register_user,
set_password,
},
Clock, LookupError,
Clock,
};
use oauth2_types::scope::Scope;
use rand::SeedableRng;
@ -259,14 +259,10 @@ impl Options {
for client in config.clients.iter() {
let client_id = client.client_id;
let res = lookup_client(&mut txn, client_id).await;
match res {
Ok(_) => {
warn!(%client_id, "Skipping already imported client");
continue;
}
Err(e) if e.not_found() => {}
Err(e) => anyhow::bail!(e),
let res = lookup_client(&mut txn, client_id).await?;
if res.is_some() {
warn!(%client_id, "Skipping already imported client");
continue;
}
info!(%client_id, "Importing client");