Fix the save credentials not working

crates/gpapi/src/credential.rs

@@ -196,7 +196,11 @@ impl Credential {
       ),
       // Use the empty string as the password if auth_cookie is present
       Credential::Cached(cred) => (
-        cred.password(),
+        if cred.auth_cookie.is_some() {
+          None
+        } else {
+          cred.password()
+        },
         None,
         cred.auth_cookie.as_ref().map(|c| c.user_auth_cookie()),
         cred.auth_cookie.as_ref().map(|c| c.prelogon_user_auth_cookie()),

crates/gpapi/src/portal/config.rs

@@ -103,20 +103,6 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
   let client = Client::try_from(gp_params)?;
 
   let mut params = cred.to_params();
-  // Avoid sending the auth cookies for the portal config API if the password is cached
-  // Otherwise, the portal will return an error even if the password is correct, because
-  // the auth cookies could have been invalidated and the portal server takes precedence
-  // over the password
-  if let Credential::Cached(cache_cred) = cred {
-    if cache_cred.password().is_some() {
-      info!("Using cached credentials, excluding auth cookies from the portal config request");
-
-      params.remove("prelogin-cookie");
-      params.remove("portal-userauthcookie");
-      params.remove("portal-prelogonuserauthcookie");
-    }
-  }
-
   let extra_params = gp_params.to_params();
 
   params.extend(extra_params);