chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: indempotency restart for email autoconfirm and non autoconfirm

This commit is contained in:
Fu Zi Xiang 2023-11-07 00:32:28 +08:00
parent c029759573
commit 17044ad4f0
No known key found for this signature in database
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gotrue-entity/src/dto.rs
View File

@ -197,7 +197,7 @@ impl OAuthProvider {
pub struct OAuthURL {
pub url: String,
}
#[derive(Serialize, Deserialize)]
#[derive(Serialize, Deserialize, Debug)]
#[serde(untagged)]
pub enum SignUpResponse {
Authenticated(GotrueTokenResponse),

62
src/application.rs
View File

@ -215,33 +215,9 @@ async fn setup_admin_account(
let password = gotrue_setting.admin_password.as_str();
let res_resp = gotrue_client.sign_up(admin_email, password).await;
match res_resp {
Ok(resp) => match resp {
gotrue_entity::dto::SignUpResponse::Authenticated(resp) => {
tracing::info!(
"Admin user already created and authenticated at {:?}",
resp.user.email_confirmed_at
);
Ok(())
},
gotrue_entity::dto::SignUpResponse::NotAuthenticated(user) => {
let user_id = user.id.parse::<uuid::Uuid>().unwrap();
let result = sqlx::query(
r#"
UPDATE auth.users
SET role = 'supabase_admin', email_confirmed_at = NOW()
WHERE id = $1
"#,
)
.bind(user_id)
.execute(pg_pool)
.await
.context("failed to update the admin user")?;
println!("res_resp: {:?}", &res_resp);
assert_eq!(result.rows_affected(), 1);
Ok(())
},
},
match res_resp {
Err(err) => {
if let app_error::gotrue::GoTrueError::Internal(err) = err {
match (err.code, err.msg.as_str()) {
@ -255,6 +231,40 @@ async fn setup_admin_account(
Err(err.into())
}
},
Ok(resp) => match resp {
gotrue_entity::dto::SignUpResponse::Authenticated(resp) => {
tracing::info!(
"Admin user already created and authenticated at {:?}",
resp.user.email_confirmed_at
);
Ok(())
},
gotrue_entity::dto::SignUpResponse::NotAuthenticated(user) => match user.role.as_str() {
"supabase_admin" => {
tracing::info!("Admin user already created and set role to supabase_admin");
Ok(())
},
_ => {
let user_id = user.id.parse::<uuid::Uuid>().unwrap();
let result = sqlx::query(
r#"
UPDATE auth.users
SET role = 'supabase_admin', email_confirmed_at = NOW()
WHERE id = $1
"#,
)
.bind(user_id)
.execute(pg_pool)
.await
.context("failed to update the admin user")?;
assert_eq!(result.rows_affected(), 1);
tracing::info!("Admin user created and set role to supabase_admin");
Ok(())
},
},
},
}
}