Merge pull request #109 from filecoin-project/fix/modify-bot-name

Modified bot name. Retrieve from env variable

Author: clriesco

fplus-http-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-http-server"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.0.16"
+version = "1.0.17"
 description = "FPlus main http module"
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -20,7 +20,7 @@ actix-cors = "0.6.4"
 reqwest = { version = "0.11.18", features = ["json"] }
 futures = "0.3.28"
 dotenv = "0.15.0"
-fplus-lib = { path = "../fplus-lib", version = "1.0.16" }
+fplus-lib = { path = "../fplus-lib", version = "1.0.17" }
 anyhow = "1.0.75"
 async-trait = "0.1.73"
 uuidv4 = "1.0.0"

fplus-lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-lib"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.0.16"
+version = "1.0.17"
 edition = "2021"
 description = "FPlus library/helper files"
 license = "MIT OR Apache-2.0"

fplus-lib/src/core/mod.rs

@@ -27,9 +27,6 @@ use crate::core::application::file::Allocation;
 
 pub mod application;
 
-const DEV_BOT_USER: &str = "filplus-github-bot-read-write[bot]";
-const PROD_BOT_USER: &str = "filplus-falcon[bot]";
-
 #[derive(Deserialize)]
 pub struct CreateApplicationInfo {
     pub issue_number: String,
@@ -778,14 +775,7 @@ impl LDNApplication {
             log::info!("- Application is in a valid state!");
             return Ok(true);
         }
-
-        // Check if application is in any other state
-        let bot_user = if get_env_var_or_default("FILPLUS_ENV", "dev") == "prod" {
-            PROD_BOT_USER
-        } else {
-            DEV_BOT_USER
-        };
-
+        let bot_user = get_env_var_or_default("BOT_USER", "filplus-github-bot-read-write[bot]");
         if author != bot_user {
             log::warn!("- Author is not the bot user");
             return Ok(false);
@@ -813,11 +803,7 @@ impl LDNApplication {
             let app_state = application_file.lifecycle.get_state();
             let active_request_id = application_file.lifecycle.active_request.clone();
             let valid_rkh = Self::fetch_rkh().await?;
-            let bot_user = if get_env_var_or_default("FILPLUS_ENV", "dev") == "prod" {
-                PROD_BOT_USER
-            } else {
-                DEV_BOT_USER
-            };
+            let bot_user = get_env_var_or_default("BOT_USER", "filplus-github-bot-read-write[bot]");
 
             let res: bool = match app_state {
                 AppState::Submitted => {