syn2mas: implement WriteBatch for MasNewCompatRefreshToken
This commit is contained in:
18
crates/syn2mas/.sqlx/query-1d1004d0fb5939fbf30c1986b80b986b1b4864a778525d0b8b0ad6678aef3e9f.json
generated
Normal file
18
crates/syn2mas/.sqlx/query-1d1004d0fb5939fbf30c1986b80b986b1b4864a778525d0b8b0ad6678aef3e9f.json
generated
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n INSERT INTO syn2mas__compat_refresh_tokens (\n compat_refresh_token_id,\n compat_session_id,\n compat_access_token_id,\n refresh_token,\n created_at)\n SELECT * FROM UNNEST(\n $1::UUID[],\n $2::UUID[],\n $3::UUID[],\n $4::TEXT[],\n $5::TIMESTAMP WITH TIME ZONE[])\n ",
|
||||
"describe": {
|
||||
"columns": [],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"UuidArray",
|
||||
"UuidArray",
|
||||
"UuidArray",
|
||||
"TextArray",
|
||||
"TimestamptzArray"
|
||||
]
|
||||
},
|
||||
"nullable": []
|
||||
},
|
||||
"hash": "1d1004d0fb5939fbf30c1986b80b986b1b4864a778525d0b8b0ad6678aef3e9f"
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n INSERT INTO syn2mas__compat_refresh_tokens (\n compat_refresh_token_id,\n compat_session_id,\n compat_access_token_id,\n refresh_token,\n created_at)\n SELECT * FROM UNNEST(\n $1::UUID[],\n $2::UUID[],\n $3::UUID[],\n $4::TEXT[],\n $5::TIMESTAMP WITH TIME ZONE[])\n ",
|
||||
"describe": {
|
||||
"columns": [],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"UuidArray",
|
||||
"UuidArray",
|
||||
"UuidArray",
|
||||
"TextArray",
|
||||
"TimestamptzArray"
|
||||
]
|
||||
},
|
||||
"nullable": []
|
||||
},
|
||||
"hash": "88975196c4c174d464b33aa015ce5d8cac3836701fc24922f4f0e8b98d330796"
|
||||
}
|
||||
@@ -668,6 +668,58 @@ pub struct MasNewCompatRefreshToken {
|
||||
pub created_at: DateTime<Utc>,
|
||||
}
|
||||
|
||||
impl WriteBatch for MasNewCompatRefreshToken {
|
||||
async fn write_batch(conn: &mut PgConnection, batch: Vec<Self>) -> Result<(), Error> {
|
||||
let mut refresh_token_ids: Vec<Uuid> = Vec::with_capacity(batch.len());
|
||||
let mut session_ids: Vec<Uuid> = Vec::with_capacity(batch.len());
|
||||
let mut access_token_ids: Vec<Uuid> = Vec::with_capacity(batch.len());
|
||||
let mut refresh_tokens: Vec<String> = Vec::with_capacity(batch.len());
|
||||
let mut created_ats: Vec<DateTime<Utc>> = Vec::with_capacity(batch.len());
|
||||
|
||||
for MasNewCompatRefreshToken {
|
||||
refresh_token_id,
|
||||
session_id,
|
||||
access_token_id,
|
||||
refresh_token,
|
||||
created_at,
|
||||
} in batch
|
||||
{
|
||||
refresh_token_ids.push(refresh_token_id);
|
||||
session_ids.push(session_id);
|
||||
access_token_ids.push(access_token_id);
|
||||
refresh_tokens.push(refresh_token);
|
||||
created_ats.push(created_at);
|
||||
}
|
||||
|
||||
sqlx::query!(
|
||||
r#"
|
||||
INSERT INTO syn2mas__compat_refresh_tokens (
|
||||
compat_refresh_token_id,
|
||||
compat_session_id,
|
||||
compat_access_token_id,
|
||||
refresh_token,
|
||||
created_at)
|
||||
SELECT * FROM UNNEST(
|
||||
$1::UUID[],
|
||||
$2::UUID[],
|
||||
$3::UUID[],
|
||||
$4::TEXT[],
|
||||
$5::TIMESTAMP WITH TIME ZONE[])
|
||||
"#,
|
||||
&refresh_token_ids[..],
|
||||
&session_ids[..],
|
||||
&access_token_ids[..],
|
||||
&refresh_tokens[..],
|
||||
&created_ats[..],
|
||||
)
|
||||
.execute(&mut *conn)
|
||||
.await
|
||||
.into_database("writing compat refresh tokens to MAS")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// The 'version' of the password hashing scheme used for passwords when they
|
||||
/// are migrated from Synapse to MAS.
|
||||
/// This is version 1, as in the previous syn2mas script.
|
||||
@@ -1103,52 +1155,7 @@ impl MasWriter {
|
||||
self.writer_pool
|
||||
.spawn_with_connection(move |conn| {
|
||||
Box::pin(async move {
|
||||
let mut refresh_token_ids: Vec<Uuid> = Vec::with_capacity(tokens.len());
|
||||
let mut session_ids: Vec<Uuid> = Vec::with_capacity(tokens.len());
|
||||
let mut access_token_ids: Vec<Uuid> = Vec::with_capacity(tokens.len());
|
||||
let mut refresh_tokens: Vec<String> = Vec::with_capacity(tokens.len());
|
||||
let mut created_ats: Vec<DateTime<Utc>> = Vec::with_capacity(tokens.len());
|
||||
|
||||
for MasNewCompatRefreshToken {
|
||||
refresh_token_id,
|
||||
session_id,
|
||||
access_token_id,
|
||||
refresh_token,
|
||||
created_at,
|
||||
} in tokens
|
||||
{
|
||||
refresh_token_ids.push(refresh_token_id);
|
||||
session_ids.push(session_id);
|
||||
access_token_ids.push(access_token_id);
|
||||
refresh_tokens.push(refresh_token);
|
||||
created_ats.push(created_at);
|
||||
}
|
||||
|
||||
sqlx::query!(
|
||||
r#"
|
||||
INSERT INTO syn2mas__compat_refresh_tokens (
|
||||
compat_refresh_token_id,
|
||||
compat_session_id,
|
||||
compat_access_token_id,
|
||||
refresh_token,
|
||||
created_at)
|
||||
SELECT * FROM UNNEST(
|
||||
$1::UUID[],
|
||||
$2::UUID[],
|
||||
$3::UUID[],
|
||||
$4::TEXT[],
|
||||
$5::TIMESTAMP WITH TIME ZONE[])
|
||||
"#,
|
||||
&refresh_token_ids[..],
|
||||
&session_ids[..],
|
||||
&access_token_ids[..],
|
||||
&refresh_tokens[..],
|
||||
&created_ats[..],
|
||||
)
|
||||
.execute(&mut *conn)
|
||||
.await
|
||||
.into_database("writing compat refresh tokens to MAS")?;
|
||||
|
||||
MasNewCompatRefreshToken::write_batch(conn, tokens).await?;
|
||||
Ok(())
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user