aboutsummaryrefslogtreecommitdiffstats
path: root/src/routes
diff options
context:
space:
mode:
Diffstat (limited to 'src/routes')
-rw-r--r--src/routes/(app)/[username]/generate/+page.svelte6
-rw-r--r--src/routes/(app)/[username]/settings/[...tab]/+page.svelte8
-rw-r--r--src/routes/(app)/login/+server.js6
-rw-r--r--src/routes/(app)/password/+server.js8
4 files changed, 21 insertions, 7 deletions
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 559d0d14..330ccedb 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -7,7 +7,7 @@
import * as ecc from 'tiny-secp256k1';
import { bip32, stretch, post } from '$lib/utils';
import { goto, invalidate } from '$app/navigation';
- import { loginRedirect } from '$lib/store';
+ import { loginRedirect, password } from '$lib/store';
import { Pin } from '$comp';
import { pin } from '$lib/store';
@@ -16,7 +16,7 @@
const { encode, toWords } = bech32m;
- let loaded, mnemonic, key, password, seed, entropy, cipher, pubkey, salt, child;
+ let loaded, mnemonic, key, seed, entropy, cipher, pubkey, salt, child;
onMount(async () => {
setTimeout(() => (loaded = true), 50);
@@ -35,7 +35,7 @@
let bytes = new Uint8Array(
await crypto.subtle.encrypt(
{ name: 'AES-GCM', iv: new Uint8Array(16) },
- await stretch(password, salt),
+ await stretch($password, salt),
Uint8Array.from(Buffer.from(entropy, 'hex'))
)
);
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index d47ce0de..3b213a11 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -28,10 +28,10 @@
$: form?.success && success('Settings saved!');
- // $: if (form?.message?.startsWith('Pin')) {
- // failure('Wrong pin, try again');
- // $pin = '';
- // }
+ $: if (form?.message?.startsWith('Pin')) {
+ failure('Wrong pin, try again');
+ $pin = '';
+ }
let tabs = [
{ name: 'account', key: 'ACCOUNT', comp: Account },
diff --git a/src/routes/(app)/login/+server.js b/src/routes/(app)/login/+server.js
new file mode 100644
index 00000000..e08356a0
--- /dev/null
+++ b/src/routes/(app)/login/+server.js
@@ -0,0 +1,6 @@
+import { json } from "@sveltejs/kit";
+import { post } from "$lib/utils";
+
+export async function POST({ request }) {
+ return json(await post('/checkPassword', await request.json()));
+}
diff --git a/src/routes/(app)/password/+server.js b/src/routes/(app)/password/+server.js
new file mode 100644
index 00000000..ed9b4dbb
--- /dev/null
+++ b/src/routes/(app)/password/+server.js
@@ -0,0 +1,8 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+ let result = await post('/checkPassword', await request.json(), auth(cookies));
+ return json(result);
+}
+