0.34.6_repo_cleanup

src/admin/certificate_api.rs

@@ -119,8 +119,6 @@ async fn certificate_api_rotate(
     Ok(Json(value))
 }
 
-// Per-credential settings are intentionally separate from token rotation.
-// The input cannot include token/token_hash, and every read returns only metadata.
 #[derive(Deserialize)]
 #[serde(deny_unknown_fields)]
 struct CertificateApiEdit {
@@ -134,7 +132,10 @@ async fn certificate_api_detail(
     Path(key_id): Path<String>,
 ) -> Result<Json<Value>, ApiError> {
     if !valid_certificate_api_key_id(&key_id) {
-        return Err(ApiError(StatusCode::NOT_FOUND, "certificate_api.not_found".into()));
+        return Err(ApiError(
+            StatusCode::NOT_FOUND,
+            "certificate_api.not_found".into(),
+        ));
     }
     let credential = state
         .store
@@ -152,11 +153,17 @@ async fn certificate_api_edit(
     Json(input): Json<CertificateApiEdit>,
 ) -> Result<Json<Value>, ApiError> {
     if !valid_certificate_api_key_id(&key_id) {
-        return Err(ApiError(StatusCode::NOT_FOUND, "certificate_api.not_found".into()));
+        return Err(ApiError(
+            StatusCode::NOT_FOUND,
+            "certificate_api.not_found".into(),
+        ));
     }
     let comment = input.comment.trim();
     if !valid_certificate_api_comment(comment) {
-        return Err(ApiError(StatusCode::UNPROCESSABLE_ENTITY, "certificate_api.invalid_comment".into()));
+        return Err(ApiError(
+            StatusCode::UNPROCESSABLE_ENTITY,
+            "certificate_api.invalid_comment".into(),
+        ));
     }
     let mut certificate_ids: Vec<String> = input
         .certificate_ids
@@ -168,7 +175,9 @@ async fn certificate_api_edit(
     certificate_ids.dedup();
     if certificate_ids.is_empty()
         || certificate_ids.len() > 32
-        || certificate_ids.iter().any(|value| value == "*" || !crate::config::valid_id(value))
+        || certificate_ids
+            .iter()
+            .any(|value| value == "*" || !crate::config::valid_id(value))
     {
         return Err(ApiError(
             StatusCode::UNPROCESSABLE_ENTITY,
@@ -178,7 +187,11 @@ async fn certificate_api_edit(
     let credential = state
         .store
         .edit_certificate_api_credential(
-            &key_id, comment, input.allow_deploy, &certificate_ids, &session.username,
+            &key_id,
+            comment,
+            input.allow_deploy,
+            &certificate_ids,
+            &session.username,
         )
         .await
         .map_err(auth::internal)?
@@ -192,7 +205,10 @@ async fn certificate_api_regenerate(
     Path(key_id): Path<String>,
 ) -> Result<Json<Value>, ApiError> {
     if !valid_certificate_api_key_id(&key_id) {
-        return Err(ApiError(StatusCode::NOT_FOUND, "certificate_api.not_found".into()));
+        return Err(ApiError(
+            StatusCode::NOT_FOUND,
+            "certificate_api.not_found".into(),
+        ));
     }
     let token = auth::random_secret();
     let hash = auth::secret_hash(&token);
@@ -202,7 +218,6 @@ async fn certificate_api_regenerate(
         .await
         .map_err(auth::internal)?
         .ok_or_else(|| ApiError(StatusCode::NOT_FOUND, "certificate_api.not_found".into()))?;
-    // The only endpoint in this flow that returns the new bearer secret.
     Ok(Json(json!({ "credential": credential, "token": token })))
 }
 
@@ -242,4 +257,3 @@ async fn certificate_api_revoke_all(
         .map_err(auth::internal)?;
     Ok(Json(json!({"configured": false, "revoked": revoked})))
 }
-