Merge remote-tracking branch 'origin/main' into feat/multisig-support

Author: charlykeyko

fplus-http-server/src/main.rs

@@ -33,8 +33,8 @@ async fn main() -> std::io::Result<()> {
             .service(router::health)
             .service(router::application::create)
             .service(
-                web::scope("/api")
-                    .wrap(VerifierAuth) // Apply GitHubAuth to all routes under "/api"
+                web::scope("/verifier")
+                    .wrap(VerifierAuth)
                     .service(router::application::trigger)
                     .service(router::application::propose)
                     .service(router::application::approve)

fplus-http-server/src/middleware/verifier_auth.rs

@@ -55,7 +55,8 @@ use actix_web::{
           let query: Result<web::Query<RepoQuery>, _> = web::Query::from_query(query_string);
           let RepoQuery { owner, repo, github_username } = match query {
               Ok(q) => q.into_inner(),
-              Err(_) => {
+              Err(e) => {
+                println!("{}", e);
                   return Box::pin(async {
                       return Err(actix_web::error::ErrorBadRequest("Wrong query string format"));
                   });

fplus-http-server/src/router/application.rs

@@ -1,6 +1,6 @@
 use actix_web::{get, post, web, HttpResponse, Responder};
 use fplus_lib::core::{
-    application::file::VerifierInput, ApplicationQueryParams, CompleteGovernanceReviewInfo, CompleteNewApplicationProposalInfo, CreateApplicationInfo, DcReachedInfo, GithubQueryParams, LDNApplication, RefillInfo, ValidationPullRequestData, VerifierActionsQueryParams
+    application::file::VerifierInput, ApplicationQueryParams, CompleteNewApplicationProposalInfo, CreateApplicationInfo, DcReachedInfo, GithubQueryParams, LDNApplication, RefillInfo, ValidationPullRequestData, VerifierActionsQueryParams
 };
 
 #[post("/application")]
@@ -28,10 +28,8 @@ pub async fn single(query: web::Query<ApplicationQueryParams>) -> impl Responder
 
 #[post("/application/trigger")]
 pub async fn trigger(
-    query: web::Query<ApplicationQueryParams>,
-    info: web::Json<CompleteGovernanceReviewInfo>,
+    query: web::Query<VerifierActionsQueryParams>,
 ) -> impl Responder {
-    let CompleteGovernanceReviewInfo { actor} = info.into_inner();
     let ldn_application = match LDNApplication::load(query.id.clone(), query.owner.clone(), query.repo.clone()).await {
         Ok(app) => app,
         Err(e) => {
@@ -40,7 +38,7 @@ pub async fn trigger(
     };
     dbg!(&ldn_application);
     match ldn_application
-        .complete_governance_review(actor, query.owner.clone(), query.repo.clone())
+        .complete_governance_review(query.github_username.clone(), query.owner.clone(), query.repo.clone())
         .await
     {
         Ok(app) => HttpResponse::Ok().body(serde_json::to_string_pretty(&app).unwrap()),

fplus-lib/src/core/mod.rs

@@ -66,11 +66,6 @@ pub struct LDNApplication {
     pub branch_name: String,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CompleteGovernanceReviewInfo {
-    pub actor: String,
-}
-
 #[derive(Deserialize, Debug)]
 pub struct RefillInfo {
     pub id: String,