diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 72decf18..8b447454 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2452,6 +2452,7 @@ version = "1.0.1"
dependencies = [
"cocoa",
"objc",
+ "rand 0.8.5",
"rust-argon2",
"serde",
"serde_json",
@@ -2461,7 +2462,6 @@ dependencies = [
"tauri-plugin-autostart",
"tauri-plugin-single-instance",
"tauri-plugin-sql",
- "tauri-plugin-store",
"tauri-plugin-stronghold",
]
@@ -4847,18 +4847,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "tauri-plugin-store"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#0d0ed7b9075ee21f37d787217fba3ef0784b2449"
-dependencies = [
- "log",
- "serde",
- "serde_json",
- "tauri",
- "thiserror",
-]
-
[[package]]
name = "tauri-plugin-stronghold"
version = "0.0.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index cf841cef..a9363a2c 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -16,13 +16,13 @@ tauri-build = { version = "1.2", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2", features = [ "clipboard-read-text", "clipboard-write-text", "dialog-open", "fs-read-dir", "fs-read-file", "http-all", "http-multipart", "notification-all", "os-all", "process-relaunch", "shell-open", "system-tray", "updater", "window-close", "window-start-dragging"] }
+tauri = { version = "1.2", features = [ "path-all", "fs-read-dir", "fs-read-file", "clipboard-read-text", "clipboard-write-text", "dialog-open", "http-all", "http-multipart", "notification-all", "os-all", "process-relaunch", "shell-open", "system-tray", "updater", "window-close", "window-start-dragging"] }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
sqlx-cli = {version = "0.7.0", default-features = false, features = ["sqlite"] }
rust-argon2 = "1.0"
+rand = "0.8.5"
[dependencies.tauri-plugin-sql]
git = "https://github.com/tauri-apps/plugins-workspace"
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f0dc875a..f8a53515 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -7,6 +7,7 @@
#[macro_use]
extern crate objc;
+// use rand::distributions::{Alphanumeric, DistString};
use tauri::{Manager, WindowEvent};
use tauri_plugin_autostart::MacosLauncher;
use tauri_plugin_sql::{Migration, MigrationKind};
@@ -121,8 +122,13 @@ fn main() {
..Default::default()
};
- let key = argon2::hash_raw(password.as_ref(), b"SALT_TODO", &config)
- .expect("failed to hash password");
+ // let salt = Alphanumeric.sample_string(&mut rand::thread_rng(), 12);
+ let key = argon2::hash_raw(
+ password.as_ref(),
+ b"LUME_NEED_RUST_DEVELOPER_HELP_MAKE_SALT_RANDOM",
+ &config,
+ )
+ .expect("failed to hash password");
key.to_vec()
})
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d5143697..82f04ba3 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -41,6 +41,9 @@
"$VIDEO/*"
]
},
+ "path": {
+ "all": true
+ },
"shell": {
"all": false,
"open": true
diff --git a/src/app.tsx b/src/app.tsx
index 40543fe1..e644b4b8 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -5,10 +5,13 @@ import { CreateStep1Screen } from '@app/auth/create/step-1';
import { CreateStep2Screen } from '@app/auth/create/step-2';
import { CreateStep3Screen } from '@app/auth/create/step-3';
import { CreateStep4Screen } from '@app/auth/create/step-4';
+import { CreateStep5Screen } from '@app/auth/create/step-5';
import { AuthImportScreen } from '@app/auth/import';
import { ImportStep1Screen } from '@app/auth/import/step-1';
import { ImportStep2Screen } from '@app/auth/import/step-2';
+import { ImportStep3Screen } from '@app/auth/import/step-3';
import { OnboardingScreen } from '@app/auth/onboarding';
+import { UnlockScreen } from '@app/auth/unlock';
import { WelcomeScreen } from '@app/auth/welcome';
import { ChannelScreen } from '@app/channel';
import { ChatScreen } from '@app/chat';
@@ -51,6 +54,7 @@ const router = createBrowserRouter([
children: [
{ path: '', element: