Skip to content

Commit

Permalink
fix: improve login command behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
daimond113 committed Aug 12, 2024
1 parent 30c9be8 commit 836870f
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/cli/commands/auth/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ pub struct LoginCommand {
/// The index to use. Defaults to `default`, or the configured default index if current directory doesn't have a manifest
#[arg(short, long)]
index: Option<String>,

/// Whether to not prefix the token with `Bearer `
#[arg(short, long, conflicts_with = "token")]
no_bearer: bool,


/// The token to use for authentication, skipping login
#[arg(short, long, conflicts_with = "index")]
token: Option<String>,
Expand Down Expand Up @@ -185,12 +181,13 @@ impl LoginCommand {
}

pub fn run(self, project: Project, reqwest: reqwest::blocking::Client) -> anyhow::Result<()> {
let token_given = self.token.is_some();
let token = match self.token {
Some(token) => token,
None => self.authenticate_device_flow(&project, &reqwest)?,
};

let token = if self.no_bearer {
let token = if token_given {
println!("set token");
token
} else {
Expand Down

0 comments on commit 836870f

Please sign in to comment.