diff --git a/Cargo.lock b/Cargo.lock index 9713553..e046232 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3376,6 +3376,7 @@ dependencies = [ "unique_id", "url", "web-time", + "zeroize", ] [[package]] @@ -3532,6 +3533,7 @@ dependencies = [ "async-std", "async-trait", "automerge", + "base64-url", "either", "futures", "getrandom 0.2.10", @@ -3540,6 +3542,7 @@ dependencies = [ "ng-oxigraph", "ng-repo", "ng-storage-rocksdb", + "qrcode", "rand 0.7.3", "sbbf-rs-safe", "serde", diff --git a/helpers/app-auth/src/App.svelte b/helpers/app-auth/src/App.svelte index 8d1f17e..5417db8 100644 --- a/helpers/app-auth/src/App.svelte +++ b/helpers/app-auth/src/App.svelte @@ -56,7 +56,7 @@ routes.set("/user", User); routes.set("/wallet", WalletInfo); routes.set("/user/accounts", AccountInfo); - routes.set("/wallet/scanqr", ScanQRWeb); + routes.set("/scanqr", ScanQRWeb); routes.set("*", NotFound); let unsubscribe = () => {}; diff --git a/helpers/net-auth/src/App.svelte b/helpers/net-auth/src/App.svelte index c669042..8913b84 100644 --- a/helpers/net-auth/src/App.svelte +++ b/helpers/net-auth/src/App.svelte @@ -48,7 +48,7 @@ // routes.set("/user/registered", UserRegistered); // routes.set("/wallet", WalletInfo); // routes.set("/user/accounts", AccountInfo); - // routes.set("/wallet/scanqr", ScanQRWeb); + // routes.set("/scanqr", ScanQRWeb); // routes.set("/install", Install); routes.set("*", NotFound); diff --git a/nextgraph/src/local_broker.rs b/nextgraph/src/local_broker.rs index 74f13e9..d0c38d0 100644 --- a/nextgraph/src/local_broker.rs +++ b/nextgraph/src/local_broker.rs @@ -1683,8 +1683,9 @@ pub fn wallet_to_wallet_recovery( Wallet::V0(v0) => { let mut content = v0.content.clone(); content.security_img = vec![]; + content.security_txt = String::new(); NgQRCodeWalletRecoveryV0 { - wallet: content, + wallet: serde_bare::to_vec(&content).unwrap(), pazzle, mnemonic, pin, diff --git a/ng-app/index-web.html b/ng-app/index-web.html index 8b01168..aebb8f9 100644 --- a/ng-app/index-web.html +++ b/ng-app/index-web.html @@ -101,8 +101,9 @@