mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Allow specifying protocol for `rad web` 

This also adds an informative text instructing the user what clicking
the link does and improves the CLI argument names.

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
This commit is contained in:
Rūdolfs Ošiņš 2023-02-08 18:10:31 +01:00 committed by Alexis Sellier
parent 02c07d7be1
commit f1de61ad88
No known key found for this signature in database
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
radicle-cli/src/commands/web.rs
View File

@ -18,8 +18,8 @@ Usage
Options Options
--host, -h httpd host to bind to --backend, -b httpd to bind to
--web, -w interface host to bind to --frontend, -f Web interface to bind to
--verbose, -v Verbose output --verbose, -v Verbose output
--help Print help --help Print help
"#, "#,
@ -34,8 +34,8 @@ pub struct SessionInfo {
#[derive(Debug)] #[derive(Debug)]
pub struct Options { pub struct Options {
pub host: String, pub backend: String,
pub web: String, pub frontend: String,
pub verbose: bool, pub verbose: bool,
} }
@ -44,18 +44,18 @@ impl Args for Options {
use lexopt::prelude::*; use lexopt::prelude::*;
let mut parser = lexopt::Parser::from_args(args); let mut parser = lexopt::Parser::from_args(args);
let mut host = None; let mut backend = None;
let mut web = None; let mut frontend = None;
let mut verbose = false; let mut verbose = false;
while let Some(arg) = parser.next()? { while let Some(arg) = parser.next()? {
match arg { match arg {
Long("verbose") | Short('v') => verbose = true, Long("verbose") | Short('v') => verbose = true,
Long("host") | Short('h') => { Long("backend") | Short('b') => {
host = Some(parser.value()?.to_string_lossy().to_string()) backend = Some(parser.value()?.to_string_lossy().to_string())
} }
Long("web") | Short('w') => { Long("frontend") | Short('f') => {
web = Some(parser.value()?.to_string_lossy().to_string()) frontend = Some(parser.value()?.to_string_lossy().to_string())
} }
Long("help") => { Long("help") => {
return Err(Error::Help.into()); return Err(Error::Help.into());
@ -69,8 +69,8 @@ impl Args for Options {
Ok(( Ok((
Options { Options {
verbose, verbose,
host: host.unwrap_or(String::from("0.0.0.0:8080")), backend: backend.unwrap_or(String::from("http://0.0.0.0:8080")),
web: web.unwrap_or(String::from("localhost:3000")), frontend: frontend.unwrap_or(String::from("https://app.radicle.xyz")),
}, },
vec![], vec![],
)) ))
@ -84,19 +84,22 @@ pub fn sign(signer: Box<dyn Signer>, session: &SessionInfo) -> Result<Signature,
} }
pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
let session: SessionInfo = ureq::post(&format!("http://{}/api/v1/sessions", options.host)) let session: SessionInfo = ureq::post(&format!("{}/api/v1/sessions", options.backend))
.call()? .call()?
.into_json()?; .into_json()?;
let profile = ctx.profile()?; let profile = ctx.profile()?;
let signer = profile.signer()?; let signer = profile.signer()?;
let signature = sign(signer, &session)?; let signature = sign(signer, &session)?;
term::blank();
term::info!("Open the following link to authenticate:");
term::info!( term::info!(
"http://{}/session/{}?pk={}&sig={}", " 👉 {}/session/{}?pk={}&sig={}",
options.web, options.frontend,
session.session_id, session.session_id,
session.public_key, session.public_key,
signature, signature,
); );
term::blank();
Ok(()) Ok(())
} }