Merge branch 'main' into feat/login_hint_with_email

Author: mcalinghee

.github/workflows/build.yaml

@@ -226,7 +226,7 @@ jobs:
     steps:
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5.7.0
+        uses: docker/metadata-action@v5.8.0
         with:
           images: "${{ env.IMAGE }}"
           bake-target: docker-metadata-action
@@ -242,7 +242,7 @@ jobs:
 
       - name: Docker meta (debug variant)
         id: meta-debug
-        uses: docker/metadata-action@v5.7.0
+        uses: docker/metadata-action@v5.8.0
         with:
           images: "${{ env.IMAGE }}"
           bake-target: docker-metadata-action-debug

Cargo.lock

@@ -593,7 +593,7 @@ features = ["derive"] # Most of the time, if we need serde, we need derive
 
 # JSON serialization and deserialization
 [workspace.dependencies.serde_json]
-version = "1.0.141"
+version = "1.0.142"
 features = ["preserve_order"]
 
 # URL encoded form serialization
@@ -650,7 +650,7 @@ version = "0.3.0"
 
 # Async runtime
 [workspace.dependencies.tokio]
-version = "1.47.0"
+version = "1.47.1"
 features = ["full"]
 
 [workspace.dependencies.tokio-stream]

Cargo.toml

@@ -43,8 +43,8 @@ impl Options {
             r"The homeserver host in the config (`matrix.homeserver`) is not a valid domain.
 See {DOCS_BASE}/setup/homeserver.html",
         )?;
+        let admin_token = config.matrix.secret().await?;
         let hs_api = config.matrix.endpoint;
-        let admin_token = config.matrix.secret;
 
         if !issuer.starts_with("https://") {
             warn!(

crates/cli/src/commands/doctor.rs

@@ -322,6 +322,11 @@ impl Options {
             } => {
                 let database_config = DatabaseConfig::extract_or_default(figment)
                     .map_err(anyhow::Error::from_boxed)?;
+                let matrix_config =
+                    MatrixConfig::extract(figment).map_err(anyhow::Error::from_boxed)?;
+                let http_client = mas_http::reqwest_client();
+                let homeserver =
+                    homeserver_connection_from_config(&matrix_config, http_client).await?;
                 let mut conn = database_connection_from_config(&database_config).await?;
                 let txn = conn.begin().await?;
                 let mut repo = PgRepository::from_conn(txn);
@@ -338,6 +343,24 @@ impl Options {
                     Device::generate(&mut rng)
                 };
 
+                if let Err(e) = homeserver
+                    .upsert_device(&user.username, device.as_str(), None)
+                    .await
+                {
+                    error!(
+                        error = &*e,
+                        "Could not create the device on the homeserver, aborting"
+                    );
+
+                    // Schedule a device sync job to remove the potential leftover device
+                    repo.queue_job()
+                        .schedule_job(&mut rng, &clock, SyncDevicesJob::new(&user))
+                        .await?;
+
+                    repo.into_inner().commit().await?;
+                    return Ok(ExitCode::FAILURE);
+                }
+
                 let compat_session = repo
                     .compat_session()
                     .add(&mut rng, &clock, &user, device, None, admin, None)
@@ -590,7 +613,8 @@ impl Options {
                     MatrixConfig::extract(figment).map_err(anyhow::Error::from_boxed)?;
 
                 let password_manager = password_manager_from_config(&password_config).await?;
-                let homeserver = homeserver_connection_from_config(&matrix_config, http_client);
+                let homeserver =
+                    homeserver_connection_from_config(&matrix_config, http_client).await?;
                 let mut conn = database_connection_from_config(&database_config).await?;
                 let txn = conn.begin().await?;
                 let mut repo = PgRepository::from_conn(txn);

crates/cli/src/commands/manage.rs

@@ -167,7 +167,7 @@ impl Options {
         let http_client = mas_http::reqwest_client();
 
         let homeserver_connection =
-            homeserver_connection_from_config(&config.matrix, http_client.clone());
+            homeserver_connection_from_config(&config.matrix, http_client.clone()).await?;
 
         if !self.no_worker {
             let mailer = mailer_from_config(&config.email, &templates)?;

crates/cli/src/commands/server.rs

@@ -59,7 +59,7 @@ impl Options {
         test_mailer_in_background(&mailer, Duration::from_secs(30));
 
         let http_client = mas_http::reqwest_client();
-        let conn = homeserver_connection_from_config(&config.matrix, http_client);
+        let conn = homeserver_connection_from_config(&config.matrix, http_client).await?;
 
         drop(config);
 

crates/cli/src/commands/worker.rs

@@ -385,7 +385,7 @@ pub async fn config_sync(
                 continue;
             }
 
-            let client_secret = client.client_secret.as_deref();
+            let client_secret = client.client_secret().await?;
             let client_name = client.client_name.as_ref();
             let client_auth_method = client.client_auth_method();
             let jwks = client.jwks.as_ref();

crates/cli/src/sync.rs

@@ -464,36 +464,36 @@ pub async fn load_policy_factory_dynamic_data(
 
 /// Create a clonable, type-erased [`HomeserverConnection`] from the
 /// configuration
-pub fn homeserver_connection_from_config(
+pub async fn homeserver_connection_from_config(
     config: &MatrixConfig,
     http_client: reqwest::Client,
-) -> Arc<dyn HomeserverConnection> {
-    match config.kind {
-        HomeserverKind::Synapse | HomeserverKind::SynapseLegacy => {
-            Arc::new(LegacySynapseConnection::new(
+) -> anyhow::Result<Arc<dyn HomeserverConnection>> {
+    Ok(match config.kind {
+        HomeserverKind::Synapse | HomeserverKind::SynapseModern => {
+            Arc::new(SynapseConnection::new(
                 config.homeserver.clone(),
                 config.endpoint.clone(),
-                config.secret.clone(),
+                config.secret().await?,
                 http_client,
             ))
         }
-        HomeserverKind::SynapseModern => Arc::new(SynapseConnection::new(
+        HomeserverKind::SynapseLegacy => Arc::new(LegacySynapseConnection::new(
             config.homeserver.clone(),
             config.endpoint.clone(),
-            config.secret.clone(),
+            config.secret().await?,
             http_client,
         )),
         HomeserverKind::SynapseReadOnly => {
-            let connection = LegacySynapseConnection::new(
+            let connection = SynapseConnection::new(
                 config.homeserver.clone(),
                 config.endpoint.clone(),
-                config.secret.clone(),
+                config.secret().await?,
                 http_client,
             );
             let readonly = ReadOnlyHomeserverConnection::new(connection);
             Arc::new(readonly)
         }
-    }
+    })
 }
 
 #[cfg(test)]