Fix overwriting alternate registry token

crates/cargo-test-support/src/registry.rs

@@ -60,6 +60,17 @@ pub fn alt_api_url() -> Url {
     Url::from_file_path(alt_api_path()).ok().unwrap()
 }
 
+fn generate_path(name: &str) -> PathBuf {
+    paths::root().join(name)
+}
+fn generate_url(name: &str) -> Url {
+    Url::from_file_path(generate_path(name)).ok().unwrap()
+}
+fn generate_dl_url(name: &str) -> String {
+    let base = Url::from_file_path(generate_path(name)).ok().unwrap();
+    format!("{}/{{crate}}/{{version}}/{{crate}}-{{version}}.crate", base)
+}
+
 /// A builder for creating a new package in a registry.
 ///
 /// This uses "source replacement" using an automatically generated
@@ -166,9 +177,13 @@ pub fn init() {
 
         [registries.alternative]
         index = '{alt}'
+
+        [registries.alternative2]
+        index = '{alt2}'
     "#,
             reg = registry_url(),
-            alt = alt_registry_url()
+            alt = alt_registry_url(),
+            alt2 = generate_url("alternative2-registry")
         )
         .as_bytes()
     ));
@@ -214,6 +229,23 @@ pub fn init() {
     fs::create_dir_all(alt_api_path().join("api/v1/crates")).unwrap();
 }
 
+pub fn init_alt2_registry() {
+    // Initialize an alternative2 registry.
+    repo(&generate_path("alternative2-registry"))
+        .file(
+            "config.json",
+            &format!(
+                r#"
+            {{"dl":"{}","api":"{}"}}
+        "#,
+                generate_dl_url("alt2_dl"),
+                generate_url("alt2_api")
+            ),
+        )
+        .build();
+    fs::create_dir_all(generate_path("alt2_api").join("api/v1/crates")).unwrap();
+}
+
 impl Package {
     /// Creates a new package builder.
     /// Call `publish()` to finalize and build the package.

src/cargo/util/config/mod.rs

@@ -1314,14 +1314,14 @@ pub fn save_credentials(cfg: &Config, token: String, registry: Option<String>) -
             .open_rw(filename, cfg, "credentials' config file")?
     };
 
-    let (key, value) = {
+    let (key, mut value) = {
         let key = "token".to_string();
         let value = ConfigValue::String(token, file.path().to_path_buf());
         let mut map = HashMap::new();
         map.insert(key, value);
         let table = CV::Table(map, file.path().to_path_buf());
 
-        if let Some(registry) = registry {
+        if let Some(registry) = registry.clone() {
             let mut map = HashMap::new();
             map.insert(registry, table);
             (
@@ -1352,6 +1352,12 @@ pub fn save_credentials(cfg: &Config, token: String, registry: Option<String>) -
             .insert("registry".into(), map.into());
     }
 
+    if let Some(_) = registry {
+        if let Some(table) = toml.as_table_mut().unwrap().remove("registries") {
+            let v = CV::from_toml(file.path(), table)?;
+            value.merge(v)?;
+        }
+    }
     toml.as_table_mut().unwrap().insert(key, value.into_toml());
 
     let contents = toml.to_string();

tests/testsuite/login.rs

@@ -12,6 +12,7 @@ use cargo_test_support::{cargo_process, t};
 use toml;
 
 const TOKEN: &str = "test-token";
+const TOKEN2: &str = "test-token2";
 const ORIGINAL_TOKEN: &str = "api-token";
 
 fn setup_new_credentials() {
@@ -169,6 +170,7 @@ fn new_credentials_is_used_instead_old() {
 #[cargo_test]
 fn registry_credentials() {
     registry::init();
+    registry::init_alt2_registry();
     setup_new_credentials();
 
     let reg = "alternative";
@@ -185,4 +187,18 @@ fn registry_credentials() {
 
     // Also ensure that we get the new token for the registry
     assert!(check_token(TOKEN, Some(reg)));
+
+    let reg2 = "alternative2";
+    cargo_process("login --registry")
+        .arg(reg2)
+        .arg(TOKEN2)
+        .arg("-Zunstable-options")
+        .masquerade_as_nightly_cargo()
+        .run();
+
+    // Ensure not overwriting 1st alternate registry token with
+    // 2nd alternate registry token (see rust-lang/cargo#7701).
+    assert!(check_token(ORIGINAL_TOKEN, None));
+    assert!(check_token(TOKEN, Some(reg)));
+    assert!(check_token(TOKEN2, Some(reg2)));
 }