Skip to content

Commit

Permalink
Merge pull request #487 from danwilhelm/login-issues
Browse files Browse the repository at this point in the history
Login issues
  • Loading branch information
fitzgen authored Jan 11, 2019
2 parents 5fafee7 + 2343e97 commit 35cabb6
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/npm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@ pub fn npm_login(
always_auth: bool,
auth_type: &Option<String>,
) -> Result<(), failure::Error> {
let mut args = String::new();

args.push_str(&format!("--registry={}", registry));
let mut args = vec![format!("login"), format!("--registry={}", registry)];

if let Some(scope) = scope {
args.push_str(&format!(" --scope={}", scope));
args.push(format!("--scope={}", scope));
}

if always_auth == true {
args.push_str(" --always_auth");
args.push(format!("--always_auth"));
}

if let Some(auth_type) = auth_type {
args.push_str(&format!(" --auth_type={}", auth_type));
args.push(format!("--auth_type={}", auth_type));
}

// Interactively ask user for npm login info.
// (child::run does not support interactive input)
let mut cmd = Command::new("npm");
cmd.arg("login")
.arg(args)
.stdin(Stdio::inherit())
.stdout(Stdio::inherit());
child::run(log, cmd, "npm login")
.with_context(|_| format!("Login to registry {} failed", registry))?;
Ok(())
cmd.args(args);

info!(log, "Running {:?}", cmd);
match cmd.status()?.success() {
true => Ok(()),
false => bail!("Login to registry {} failed", registry),
}
}

0 comments on commit 35cabb6

Please sign in to comment.