kiril/kovachev-bot-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Now allow supplying either password or OAuth2 token in config generation

Browse Source
This commit is contained in:
Kiril Kovachev 2025-05-09 12:24:10 +01:00
parent 357e012525
commit 1400334ce0
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mwbot_template.toml
View File

@ -4,5 +4,3 @@ rest_url = "{}"
[auth] [auth]
username = "{}" username = "{}"
# password = "{}"
oauth2_token = "{}"

28
src/main.rs
View File

@ -22,7 +22,11 @@ struct Cli {
#[derive(clap::Args, Debug, Clone, Eq, PartialEq, PartialOrd, Ord)] #[derive(clap::Args, Debug, Clone, Eq, PartialEq, PartialOrd, Ord)]
#[group(required = true, multiple = false)] #[group(required = true, multiple = false)]
struct AuthMethodParse { struct AuthMethodParse {
/// Specify the password of the bot
#[arg(long, env = "MW_BOTPASSWORD")]
password: Option<String>, password: Option<String>,
/// Specify the OAuth2 token of the bot
#[arg(long, env = "MW_OAUTH2")]
oauth2_token: Option<String> oauth2_token: Option<String>
} }
@ -45,12 +49,11 @@ struct SetupArgs {
/// Specify the username of the bot /// Specify the username of the bot
#[arg(long, env = "MW_USERNAME")] #[arg(long, env = "MW_USERNAME")]
username: String, username: String,
/// Specify the botpassword of the bot
#[arg(long, env = "MW_BOTPASSWORD")] /// Specify the password or OAuth2 key for the bot
botpassword: Option<String>, #[clap(flatten)]
/// Specify the OAuth2 token of the bot auth_phrase: AuthMethodParse,
#[arg(long, env = "MW_OAUTH2")]
oauth2_token: String,
/// Specify the API URL of the bot /// Specify the API URL of the bot
#[arg(long, env = "MW_API_URL")] #[arg(long, env = "MW_API_URL")]
api_url: String, api_url: String,
@ -73,7 +76,18 @@ fn read_config_template() -> Result<String, std::io::Error> {
} }
fn fill_config_template(config_template: String, args: SetupArgs) -> String { fn fill_config_template(config_template: String, args: SetupArgs) -> String {
formatx!(config_template, args.api_url, args.rest_url, args.username, args.botpassword.unwrap_or("".into()), args.oauth2_token).unwrap() let mut filled = formatx!(config_template, args.api_url, args.rest_url, args.username).unwrap();
let chosen_method: AuthMethod = args.auth_phrase.into();
match chosen_method {
AuthMethod::Password(password) => {
filled.push_str(format!("password = \"{}\"", password).as_str());
},
AuthMethod::OAuth2Token(oauth2_token) => {
filled.push_str(format!("oauth2_token = \"{}\"", oauth2_token).as_str());
}
}
filled.push('\n');
filled
} }
// Fix permissions on UNIX-like systems, since mwbot-rs doesn't like to read configs with loose permissions. // Fix permissions on UNIX-like systems, since mwbot-rs doesn't like to read configs with loose permissions.