mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-08-16 19:30:27 +03:00
fix(cli): skip migrating updater config if not active (#8768)
This commit is contained in:
parent
bd73ab0a1a
commit
baca704d4b
6
.changes/fix-migrate-updater.md
Normal file
6
.changes/fix-migrate-updater.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"@tauri-apps/cli": patch:bug
|
||||||
|
"tauri-cli": patch:bug
|
||||||
|
---
|
||||||
|
|
||||||
|
Do not migrate updater configuration if the active flag is set to false.
|
@ -503,9 +503,20 @@ fn process_updater(
|
|||||||
if let Some(mut updater) = tauri_config.remove("updater") {
|
if let Some(mut updater) = tauri_config.remove("updater") {
|
||||||
if let Some(updater) = updater.as_object_mut() {
|
if let Some(updater) = updater.as_object_mut() {
|
||||||
updater.remove("dialog");
|
updater.remove("dialog");
|
||||||
updater.remove("active");
|
|
||||||
|
// we only migrate the updater config if it's active
|
||||||
|
// since we now assume it's always active if the config object is set
|
||||||
|
// we also migrate if pubkey is set so we do not lose that information on the migration
|
||||||
|
// in this case, the user need to deal with the updater being inactive on their own
|
||||||
|
if updater
|
||||||
|
.remove("active")
|
||||||
|
.and_then(|a| a.as_bool())
|
||||||
|
.unwrap_or_default()
|
||||||
|
|| updater.get("pubkey").is_some()
|
||||||
|
{
|
||||||
|
plugins.insert("updater".into(), serde_json::to_value(updater)?);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
plugins.insert("updater".into(), serde_json::to_value(updater)?);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -711,6 +722,38 @@ mod test {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn skips_migrating_updater() {
|
||||||
|
let original = serde_json::json!({
|
||||||
|
"tauri": {
|
||||||
|
"updater": {
|
||||||
|
"active": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let migrated = migrate(&original);
|
||||||
|
assert_eq!(migrated["plugins"]["updater"], serde_json::Value::Null);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn migrate_updater_pubkey() {
|
||||||
|
let original = serde_json::json!({
|
||||||
|
"tauri": {
|
||||||
|
"updater": {
|
||||||
|
"active": false,
|
||||||
|
"pubkey": "somekey"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let migrated = migrate(&original);
|
||||||
|
assert_eq!(
|
||||||
|
migrated["plugins"]["updater"]["pubkey"],
|
||||||
|
original["tauri"]["updater"]["pubkey"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn migrate_csp_object() {
|
fn migrate_csp_object() {
|
||||||
let original = serde_json::json!({
|
let original = serde_json::json!({
|
||||||
|
Loading…
Reference in New Issue
Block a user