diff --git a/src/app/auth/components/userRelay.tsx b/src/app/auth/components/userRelay.tsx
index 2280c7db..decb3016 100644
--- a/src/app/auth/components/userRelay.tsx
+++ b/src/app/auth/components/userRelay.tsx
@@ -1,7 +1,5 @@
import { Image } from '@shared/image';
-import { DEFAULT_AVATAR } from '@stores/constants';
-
import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
@@ -26,7 +24,6 @@ export function UserRelay({ pubkey }: { pubkey: string }) {
diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx
index 78578d6f..fc6868f4 100644
--- a/src/app/auth/create/step-1.tsx
+++ b/src/app/auth/create/step-1.tsx
@@ -1,10 +1,9 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
import { BaseDirectory, writeTextFile } from '@tauri-apps/plugin-fs';
import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
import { useEffect, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { createAccount } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { Button } from '@shared/button';
import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
@@ -14,7 +13,8 @@ import { useOnboarding } from '@stores/onboarding';
import { useStronghold } from '@stores/stronghold';
export function CreateStep1Screen() {
- const queryClient = useQueryClient();
+ const { db } = useStorage();
+
const navigate = useNavigate();
const setPrivkey = useStronghold((state) => state.setPrivkey);
const setTempPrivkey = useOnboarding((state) => state.setTempPrivkey);
@@ -40,42 +40,29 @@ export function CreateStep1Screen() {
};
const download = async () => {
- await writeTextFile('lume-keys.txt', `Public key: ${npub}\nPrivate key: ${nsec}`, {
- dir: BaseDirectory.Download,
- });
+ await writeTextFile(
+ `nostr_keys_${new Date().toISOString().slice(0, 10)}.txt`,
+ `Generated by Lume (lume.nu)\nPublic key: ${npub}\nPrivate key: ${nsec}`,
+ {
+ dir: BaseDirectory.Download,
+ }
+ );
setDownloaded(true);
};
- const account = useMutation({
- mutationFn: (data: {
- npub: string;
- pubkey: string;
- follows: null | string[][];
- is_active: number;
- }) => {
- return createAccount(data.npub, data.pubkey, null, 1);
- },
- onSuccess: (data) => {
- queryClient.setQueryData(['currentAccount'], data);
- },
- });
-
const submit = () => {
setLoading(true);
+ // update state
setPrivkey(privkey);
setTempPrivkey(privkey); // only use if user close app and reopen it
setPubkey(pubkey);
- account.mutate({
- npub,
- pubkey,
- follows: null,
- is_active: 1,
- });
+ // save to database
+ db.createAccount(npub, pubkey);
// redirect to next step
- setTimeout(() => navigate('/auth/create/step-2', { replace: true }), 1200);
+ navigate('/auth/create/step-2', { replace: true });
};
useEffect(() => {
diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx
index 9a7dde4a..70419881 100644
--- a/src/app/auth/create/step-2.tsx
+++ b/src/app/auth/create/step-2.tsx
@@ -1,15 +1,17 @@
+import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useEffect, useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
+import { useStorage } from '@libs/storage/provider';
+
import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
import { useOnboarding } from '@stores/onboarding';
import { useStronghold } from '@stores/stronghold';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
-
type FormValues = {
password: string;
};
@@ -37,7 +39,7 @@ export function CreateStep2Screen() {
const [passwordInput, setPasswordInput] = useState('password');
const [loading, setLoading] = useState(false);
- const { save } = useSecureStorage();
+ const { db } = useStorage();
// toggle private key
const showPassword = () => {
@@ -58,8 +60,13 @@ export function CreateStep2Screen() {
const onSubmit = async (data: { [x: string]: string }) => {
setLoading(true);
if (data.password.length > 3) {
+ const dir = await appConfigDir();
+ const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
+
+ db.secureDB = stronghold;
+
// save privkey to secure storage
- await save(pubkey, privkey, data.password);
+ await db.secureSave(pubkey, privkey);
// redirect to next step
navigate('/auth/create/step-3', { replace: true });
diff --git a/src/app/auth/create/step-3.tsx b/src/app/auth/create/step-3.tsx
index 64c91921..f9cebf4f 100644
--- a/src/app/auth/create/step-3.tsx
+++ b/src/app/auth/create/step-3.tsx
@@ -1,4 +1,3 @@
-import { useQueryClient } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
@@ -9,7 +8,6 @@ import { LoaderIcon } from '@shared/icons';
import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
import { Image } from '@shared/image';
-import { DEFAULT_AVATAR } from '@stores/constants';
import { useOnboarding } from '@stores/onboarding';
import { useNostr } from '@utils/hooks/useNostr';
@@ -17,10 +15,9 @@ import { useNostr } from '@utils/hooks/useNostr';
export function CreateStep3Screen() {
const navigate = useNavigate();
const setStep = useOnboarding((state) => state.setStep);
- const queryClient = useQueryClient();
const [loading, setLoading] = useState(false);
- const [picture, setPicture] = useState(DEFAULT_AVATAR);
+ const [picture, setPicture] = useState('https://void.cat/d/5VKmKyuHyxrNMf9bWSVPih');
const [banner, setBanner] = useState('');
const { publish } = useNostr();
@@ -47,10 +44,8 @@ export function CreateStep3Screen() {
tags: [],
});
- queryClient.invalidateQueries(['currentAccount']);
-
if (event) {
- setTimeout(() => navigate('/auth/onboarding', { replace: true }), 1000);
+ navigate('/auth/onboarding', { replace: true });
}
} catch (e) {
console.log('error: ', e);
@@ -76,7 +71,6 @@ export function CreateStep3Screen() {
@@ -88,7 +82,6 @@ export function CreateStep3Screen() {
diff --git a/src/app/auth/import/step-1.tsx b/src/app/auth/import/step-1.tsx
index 33565e4e..ac8c12c5 100644
--- a/src/app/auth/import/step-1.tsx
+++ b/src/app/auth/import/step-1.tsx
@@ -1,10 +1,9 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
import { getPublicKey, nip19 } from 'nostr-tools';
import { useEffect, useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { createAccount } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { LoaderIcon } from '@shared/icons';
import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
@@ -31,7 +30,6 @@ const resolver: Resolver = async (values) => {
};
export function ImportStep1Screen() {
- const queryClient = useQueryClient();
const navigate = useNavigate();
const setPrivkey = useStronghold((state) => state.setPrivkey);
const setTempPubkey = useOnboarding((state) => state.setTempPrivkey);
@@ -40,20 +38,7 @@ export function ImportStep1Screen() {
const [loading, setLoading] = useState(false);
- const account = useMutation({
- mutationFn: (data: {
- npub: string;
- pubkey: string;
- follows: null | string[];
- is_active: number | boolean;
- }) => {
- return createAccount(data.npub, data.pubkey, null, 1);
- },
- onSuccess: (data) => {
- queryClient.setQueryData(['currentAccount'], data);
- },
- });
-
+ const { db } = useStorage();
const {
register,
setError,
@@ -79,15 +64,10 @@ export function ImportStep1Screen() {
setPubkey(pubkey);
// add account to local database
- account.mutate({
- npub,
- pubkey,
- follows: null,
- is_active: 1,
- });
+ db.createAccount(npub, pubkey);
// redirect to step 2
- setTimeout(() => navigate('/auth/import/step-2', { replace: true }), 1200);
+ navigate('/auth/import/step-2', { replace: true });
}
} catch (error) {
setError('privkey', {
diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx
index ee00aa0b..afe372ff 100644
--- a/src/app/auth/import/step-2.tsx
+++ b/src/app/auth/import/step-2.tsx
@@ -1,15 +1,17 @@
+import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useEffect, useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
+import { useStorage } from '@libs/storage/provider';
+
import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
import { useOnboarding } from '@stores/onboarding';
import { useStronghold } from '@stores/stronghold';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
-
type FormValues = {
password: string;
};
@@ -37,7 +39,7 @@ export function ImportStep2Screen() {
const [passwordInput, setPasswordInput] = useState('password');
const [loading, setLoading] = useState(false);
- const { save } = useSecureStorage();
+ const { db } = useStorage();
// toggle private key
const showPassword = () => {
@@ -58,8 +60,13 @@ export function ImportStep2Screen() {
const onSubmit = async (data: { [x: string]: string }) => {
setLoading(true);
if (data.password.length > 3) {
+ const dir = await appConfigDir();
+ const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
+
+ db.secureDB = stronghold;
+
// save privkey to secure storage
- await save(pubkey, privkey, data.password);
+ await db.secureSave(pubkey, privkey);
// redirect to next step
navigate('/auth/import/step-3', { replace: true });
diff --git a/src/app/auth/import/step-3.tsx b/src/app/auth/import/step-3.tsx
index 93513a58..392c1981 100644
--- a/src/app/auth/import/step-3.tsx
+++ b/src/app/auth/import/step-3.tsx
@@ -1,41 +1,38 @@
-import { useQueryClient } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { User } from '@app/auth/components/user';
-import { updateLastLogin } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
import { useOnboarding } from '@stores/onboarding';
-import { useAccount } from '@utils/hooks/useAccount';
import { useNostr } from '@utils/hooks/useNostr';
export function ImportStep3Screen() {
- const queryClient = useQueryClient();
const navigate = useNavigate();
const setStep = useOnboarding((state) => state.setStep);
const [loading, setLoading] = useState(false);
- const { status, account } = useAccount();
- const { fetchNotes, fetchChats } = useNostr();
+ const { db } = useStorage();
+ const { fetchUserData } = useNostr();
const submit = async () => {
try {
// show loading indicator
setLoading(true);
- const now = Math.floor(Date.now() / 1000);
- await fetchNotes();
- await fetchChats();
- await updateLastLogin(now);
+ const data = await fetchUserData();
- queryClient.invalidateQueries(['currentAccount']);
-
- navigate('/auth/onboarding/step-2', { replace: true });
+ if (data.status === 'ok') {
+ navigate('/auth/onboarding/step-2', { replace: true });
+ } else {
+ console.log('error: ', data.message);
+ setLoading(false);
+ }
} catch (e) {
console.log('error: ', e);
setLoading(false);
@@ -55,40 +52,28 @@ export function ImportStep3Screen() {
- {status === 'loading' ? (
-
- ) : (
-
-
-
-
- )}
+
+
+
+
);
diff --git a/src/app/auth/migrate.tsx b/src/app/auth/migrate.tsx
index a2928b1a..5a177f89 100644
--- a/src/app/auth/migrate.tsx
+++ b/src/app/auth/migrate.tsx
@@ -1,17 +1,16 @@
import { useQueryClient } from '@tanstack/react-query';
+import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { removePrivkey } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
import { useStronghold } from '@stores/stronghold';
-import { useAccount } from '@utils/hooks/useAccount';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
-
type FormValues = {
password: string;
};
@@ -38,8 +37,7 @@ export function MigrateScreen() {
const [passwordInput, setPasswordInput] = useState('password');
const [loading, setLoading] = useState(false);
- const { account } = useAccount();
- const { save } = useSecureStorage();
+ const { db } = useStorage();
// toggle private key
const showPassword = () => {
@@ -63,13 +61,18 @@ export function MigrateScreen() {
// load private in secure storage
try {
// save privkey to secure storage
- await save(account.pubkey, account.privkey, data.password);
+ const dir = await appConfigDir();
+ const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
+
+ if (!db.secureDB) db.secureDB = stronghold;
+ await db.secureSave(db.account.pubkey, db.account.privkey);
+
// add privkey to state
- setPrivkey(account.privkey);
+ setPrivkey(db.account.privkey);
// remove privkey in db
- await removePrivkey();
+ await db.removePrivkey();
// clear cache
- await queryClient.invalidateQueries(['currentAccount']);
+ await queryClient.invalidateQueries(['account']);
// redirect to home
navigate('/', { replace: true });
} catch {
diff --git a/src/app/auth/onboarding/step-1.tsx b/src/app/auth/onboarding/step-1.tsx
index 79e64a00..53e87369 100644
--- a/src/app/auth/onboarding/step-1.tsx
+++ b/src/app/auth/onboarding/step-1.tsx
@@ -1,26 +1,24 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import { User } from '@app/auth/components/user';
-import { updateAccount } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons';
import { useOnboarding } from '@stores/onboarding';
-import { useAccount } from '@utils/hooks/useAccount';
import { useNostr } from '@utils/hooks/useNostr';
import { arrayToNIP02 } from '@utils/transform';
export function OnboardStep1Screen() {
- const queryClient = useQueryClient();
const navigate = useNavigate();
const setStep = useOnboarding((state) => state.setStep);
- const { publish, fetchNotes } = useNostr();
- const { account } = useAccount();
+ const { publish, fetchUserData, prefetchEvents } = useNostr();
+ const { db } = useStorage();
const { status, data } = useQuery(['trending-profiles'], async () => {
const res = await fetch('https://api.nostr.band/v0/trending/profiles');
if (!res.ok) {
@@ -44,22 +42,23 @@ export function OnboardStep1Screen() {
try {
setLoading(true);
- const tags = arrayToNIP02([...follows, account.pubkey]);
+ const tags = arrayToNIP02([...follows, db.account.pubkey]);
const event = await publish({ content: '', kind: 3, tags: tags });
- await updateAccount('follows', follows);
- // prefetch notes with current follows
- const notes = await fetchNotes(follows);
+ // prefetch data
+ const user = await fetchUserData(follows);
+ const data = await prefetchEvents();
// redirect to next step
- if (event && notes) {
- setTimeout(() => {
- queryClient.invalidateQueries(['currentAccount']);
- navigate('/auth/onboarding/step-2', { replace: true });
- }, 1000);
+ if (event && user.status === 'ok' && data.status === 'ok') {
+ navigate('/auth/onboarding/step-2', { replace: true });
+ } else {
+ setLoading(false);
+ console.log('error: ', data.message);
}
- } catch {
- console.log('error');
+ } catch (e) {
+ setLoading(false);
+ console.log('error: ', e);
}
};
diff --git a/src/app/auth/onboarding/step-2.tsx b/src/app/auth/onboarding/step-2.tsx
index 6ef68d62..f530e509 100644
--- a/src/app/auth/onboarding/step-2.tsx
+++ b/src/app/auth/onboarding/step-2.tsx
@@ -1,11 +1,11 @@
import { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom';
-import { createWidget } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons';
-import { BLOCK_KINDS } from '@stores/constants';
+import { widgetKinds } from '@stores/constants';
import { useOnboarding } from '@stores/onboarding';
const data = [
@@ -33,6 +33,8 @@ export function OnboardStep2Screen() {
const [loading, setLoading] = useState(false);
const [tags, setTags] = useState(new Set
());
+ const { db } = useStorage();
+
const toggleTag = (tag: string) => {
if (tags.has(tag)) {
setTags((prev) => {
@@ -50,10 +52,10 @@ export function OnboardStep2Screen() {
setLoading(true);
for (const tag of tags) {
- await createWidget(BLOCK_KINDS.hashtag, tag, tag.replace('#', ''));
+ await db.createWidget(widgetKinds.hashtag, tag, tag.replace('#', ''));
}
- setTimeout(() => navigate('/auth/onboarding/step-3', { replace: true }), 1000);
+ navigate('/auth/onboarding/step-3', { replace: true });
} catch {
console.log('error');
}
diff --git a/src/app/auth/onboarding/step-3.tsx b/src/app/auth/onboarding/step-3.tsx
index dea51bcc..533857a2 100644
--- a/src/app/auth/onboarding/step-3.tsx
+++ b/src/app/auth/onboarding/step-3.tsx
@@ -5,14 +5,13 @@ import { useNavigate } from 'react-router-dom';
import { UserRelay } from '@app/auth/components/userRelay';
import { useNDK } from '@libs/ndk/provider';
-import { createRelay } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons';
import { FULL_RELAYS } from '@stores/constants';
import { useOnboarding } from '@stores/onboarding';
-import { useAccount } from '@utils/hooks/useAccount';
import { useNostr } from '@utils/hooks/useNostr';
export function OnboardStep3Screen() {
@@ -23,13 +22,16 @@ export function OnboardStep3Screen() {
const [relays, setRelays] = useState(new Set());
const { publish } = useNostr();
- const { account } = useAccount();
+ const { db } = useStorage();
const { ndk } = useNDK();
const { status, data } = useQuery(
['relays'],
async () => {
const tmp = new Map();
- const events = await ndk.fetchEvents({ kinds: [10002], authors: account.follows });
+ const events = await ndk.fetchEvents({
+ kinds: [10002],
+ authors: db.account.follows,
+ });
if (events) {
events.forEach((event) => {
@@ -42,7 +44,8 @@ export function OnboardStep3Screen() {
return tmp;
},
{
- enabled: account ? true : false,
+ enabled: db.account ? true : false,
+ refetchOnWindowFocus: false,
}
);
@@ -62,21 +65,22 @@ export function OnboardStep3Screen() {
try {
if (!skip) {
for (const relay of relays) {
- await createRelay(relay);
+ await db.createRelay(relay);
}
const tags = Array.from(relays).map((relay) => ['r', relay.replace(/\/+$/, '')]);
await publish({ content: '', kind: 10002, tags: tags });
} else {
for (const relay of FULL_RELAYS) {
- await createRelay(relay);
+ await db.createRelay(relay);
}
}
- setTimeout(() => {
- clearStep();
- navigate('/', { replace: true });
- }, 1000);
+ // update last login
+ await db.updateLastLogin();
+
+ clearStep();
+ navigate('/', { replace: true });
} catch (e) {
setLoading(false);
console.log('error: ', e);
diff --git a/src/app/auth/reset.tsx b/src/app/auth/reset.tsx
index 36691c13..52d0be9b 100644
--- a/src/app/auth/reset.tsx
+++ b/src/app/auth/reset.tsx
@@ -1,15 +1,16 @@
+import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { getPublicKey, nip19 } from 'nostr-tools';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
+import { useStorage } from '@libs/storage/provider';
+
import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
import { useStronghold } from '@stores/stronghold';
-import { useAccount } from '@utils/hooks/useAccount';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
-
type FormValues = {
password: string;
privkey: string;
@@ -36,8 +37,7 @@ export function ResetScreen() {
const [passwordInput, setPasswordInput] = useState('password');
const [loading, setLoading] = useState(false);
- const { account } = useAccount();
- const { save, reset } = useSecureStorage();
+ const { db } = useStorage();
// toggle private key
const showPassword = () => {
@@ -66,7 +66,7 @@ export function ResetScreen() {
const tmpPubkey = getPublicKey(privkey);
- if (tmpPubkey !== account.pubkey) {
+ if (tmpPubkey !== db.account.pubkey) {
setLoading(false);
setError('password', {
type: 'custom',
@@ -75,11 +75,20 @@ export function ResetScreen() {
});
} else {
// remove old stronghold
- await reset();
+ await db.secureReset();
+
// save privkey to secure storage
- await save(account.pubkey, account.privkey, data.password);
+ const dir = await appConfigDir();
+ const stronghold = await Stronghold.load(
+ `${dir}/lume.stronghold`,
+ data.password
+ );
+
+ if (!db.secureDB) db.secureDB = stronghold;
+ await db.secureSave(db.account.pubkey, db.account.privkey);
+
// add privkey to state
- setPrivkey(account.privkey);
+ setPrivkey(db.account.privkey);
// redirect to home
navigate('/auth/unlock', { replace: true });
}
diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx
index 0dd45ad3..9338c1ea 100644
--- a/src/app/auth/unlock.tsx
+++ b/src/app/auth/unlock.tsx
@@ -1,14 +1,17 @@
+import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { Link, useNavigate } from 'react-router-dom';
-import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
+import { User } from '@app/auth/components/user';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { ArrowRightCircleIcon, EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
import { useStronghold } from '@stores/stronghold';
-import { useAccount } from '@utils/hooks/useAccount';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
-
type FormValues = {
password: string;
};
@@ -31,21 +34,10 @@ export function UnlockScreen() {
const navigate = useNavigate();
const setPrivkey = useStronghold((state) => state.setPrivkey);
- const [passwordInput, setPasswordInput] = useState('password');
- const [loading, setLoading] = useState(false);
-
- const { account } = useAccount();
- const { load } = useSecureStorage();
-
- // toggle private key
- const showPassword = () => {
- if (passwordInput === 'password') {
- setPasswordInput('text');
- } else {
- setPasswordInput('password');
- }
- };
+ const [showPassword, setShowPassword] = useState(false);
+ const [loading, setLoading] = useState(false);
+ const { db } = useStorage();
const {
register,
setError,
@@ -54,26 +46,24 @@ export function UnlockScreen() {
} = useForm({ resolver });
const onSubmit = async (data: { [x: string]: string }) => {
- setLoading(true);
- if (data.password.length > 3) {
- // load private in secure storage
- try {
- const privkey = await load(account.pubkey, data.password);
- setPrivkey(privkey);
- // redirect to home
- navigate('/', { replace: true });
- } catch {
- setLoading(false);
- setError('password', {
- type: 'custom',
- message: 'Wrong password',
- });
- }
- } else {
+ try {
+ setLoading(true);
+
+ const dir = await appConfigDir();
+ const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password);
+
+ if (!db.secureDB) db.secureDB = stronghold;
+
+ const privkey = await db.secureLoad(db.account.pubkey);
+
+ setPrivkey(privkey);
+ // redirect to home
+ navigate('/', { replace: true });
+ } catch (e) {
setLoading(false);
setError('password', {
type: 'custom',
- message: 'Password is required and must be greater than 3',
+ message: e,
});
}
};
@@ -84,40 +74,52 @@ export function UnlockScreen() {
Enter password to unlock
-