remove product key from setup flow (#1750)

* remove product key flow from setup

* feat: backend turned off encryption + new Id + no package id

* implement new encryption scheme in FE

* decode response string

* crypto not working

* update setup wizard closes #1762

* feat: Get the encryption key

* fix: Get to recovery

* remove old code

* fix build

* fix: Install works for now

* fix bug in config for adding new list items

* dismiss action modal on success

* clear button in config

* wip: Currently broken in avahi mdns

* include headers with req/res and refactor patchDB init and usage

* fix: Can now run in the main

* flatline on failed init

* update patch DB

* add last-wifi-region to data model even though not used by FE

* chore: Fix the start.

* wip: Fix wrong order for getting hostname before sql has been
created

* fix edge case where union keys displayed as new when not new

* fix: Can start

* last backup color, markdown links always new tab, fix bug with login

* refactor to remove WithRevision

* resolve circular dep issue

* update submodule

* fix patch-db

* update patchDB

* update patch again

* escape error

* decodeuricomponent

* increase proxy buffer size

* increase proxy buffer size

* fix nginx

Co-authored-by: BluJ <mogulslayer@gmail.com>
Co-authored-by: BluJ <dragondef@gmail.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>

backend/src/update/mod.rs

@@ -24,7 +24,6 @@ use tracing::instrument;
 
 use crate::context::RpcContext;
 use crate::db::model::UpdateProgress;
-use crate::db::util::WithRevision;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::{FileSystem, ReadWrite};
 use crate::disk::mount::guard::TmpMountGuard;
@@ -46,26 +45,24 @@ lazy_static! {
 
 /// An user/ daemon would call this to update the system to the latest version and do the updates available,
 /// and this will return something if there is an update, and in that case there will need to be a restart.
-#[command(rename = "update", display(display_update_result))]
+#[command(
+    rename = "update",
+    display(display_update_result),
+    metadata(sync_db = true)
+)]
 #[instrument(skip(ctx))]
 pub async fn update_system(
     #[context] ctx: RpcContext,
     #[arg(rename = "marketplace-url")] marketplace_url: Url,
-) -> Result<WithRevision<UpdateResult>, Error> {
-    let noop = WithRevision {
-        response: UpdateResult::NoUpdates,
-        revision: None,
-    };
+) -> Result<UpdateResult, Error> {
     if UPDATED.load(Ordering::SeqCst) {
-        return Ok(noop);
-    }
-    match maybe_do_update(ctx, marketplace_url).await? {
-        None => Ok(noop),
-        Some(r) => Ok(WithRevision {
-            response: UpdateResult::Updating,
-            revision: Some(r),
-        }),
+        return Ok(UpdateResult::NoUpdates);
     }
+    Ok(if maybe_do_update(ctx, marketplace_url).await?.is_some() {
+        UpdateResult::Updating
+    } else {
+        UpdateResult::NoUpdates
+    })
 }
 
 /// What is the status of the updates?
@@ -76,8 +73,8 @@ pub enum UpdateResult {
     Updating,
 }
 
-fn display_update_result(status: WithRevision<UpdateResult>, _: &ArgMatches) {
-    match status.response {
+fn display_update_result(status: UpdateResult, _: &ArgMatches) {
+    match status {
         UpdateResult::Updating => {
             println!("Updating...");
         }
@@ -190,7 +187,7 @@ async fn maybe_do_update(
         downloaded: 0,
     });
     status.save(&mut tx).await?;
-    let rev = tx.commit(None).await?;
+    let rev = tx.commit().await?;
 
     tokio::spawn(async move {
         let mut db = ctx.db.handle();