diff options
| -rw-r--r-- | src/lib/utils.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/request/+page.server.js | 10 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/+page.server.js | 8 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/_security.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/ln/[lnurl]/+page.server.js | 3 | ||||
| -rw-r--r-- | src/routes/(app)/otpsecret/+server.js | 8 |
6 files changed, 14 insertions, 19 deletions
diff --git a/src/lib/utils.js b/src/lib/utils.js index eb0d27de..25b331ed 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -82,7 +82,7 @@ export function reverseFormat(val, locale) { return Number.isNaN(reversedVal) ? 0 : +reversedVal; } -export let protectedRoutes = [/customers/, /dashboard/, /settings/, /transactions/]; +export let protectedRoutes = [/customers/, /dashboard/, /settings/, /transactions/, /\/ln\//, /request/]; export const success = (m) => { toast.pop(); diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js index 039d4235..b4a1e941 100644 --- a/src/routes/(app)/[username]/request/+page.server.js +++ b/src/routes/(app)/[username]/request/+page.server.js @@ -1,15 +1,11 @@ import { redirect } from '@sveltejs/kit'; import { auth, post } from '$lib/utils'; -export let load = ({ locals }) => { - if (!locals.user) throw redirect(307, '/login'); -}; - export const actions = { - create: async ({ cookies, locals, request, url }) => { + create: async ({ cookies, request, url }) => { let form = Object.fromEntries(await request.formData()); - let { id } = await post('/requests', form, auth(cookies)); - throw redirect(307, `/${locals.user.username}/request/${id}`); + let { id, requester } = await post('/requests', form, auth(cookies)); + throw redirect(307, `/${requester.username}/request/${id}`); }, delete: async ({ cookies, request }) => { diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js index dcaa26b4..cb642e60 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js @@ -7,13 +7,9 @@ export function load({ params, url }) { } export const actions = { - default: async ({ cookies, locals, request }) => { + default: async ({ cookies, request }) => { let form = Object.fromEntries(await request.formData()); - - let user = { - ...locals.user, - ...form - }; + let user = { ...(await get('/me', auth(cookies))), ...form }; try { ({ user } = await post(`/user`, user, auth(cookies))); diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte index f4c04329..2d880d44 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte @@ -19,6 +19,7 @@ let old; let startVerifying = () => { + if (pinCode.join("").length < 6) return; verifying = true; }; @@ -80,6 +81,7 @@ if (user.haspin) { try { pin = null; + await tick(); submit.click(); } catch (e) { console.log(e); diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js index a8079707..bb731e84 100644 --- a/src/routes/(app)/ln/[lnurl]/+page.server.js +++ b/src/routes/(app)/ln/[lnurl]/+page.server.js @@ -1,9 +1,8 @@ import { auth, get, post } from '$lib/utils'; import { error, redirect } from '@sveltejs/kit'; -export async function load({ locals, params }) { +export async function load({ params }) { try { - if (!locals.user) throw redirect(307, '/login'); let { lnurl } = params; lnurl = await get(`/decode?text=${lnurl}`); if (lnurl.tag !== 'payRequest') throw error(500, 'We can only handle lnurl pay requests'); diff --git a/src/routes/(app)/otpsecret/+server.js b/src/routes/(app)/otpsecret/+server.js index cdd050c8..f998fb17 100644 --- a/src/routes/(app)/otpsecret/+server.js +++ b/src/routes/(app)/otpsecret/+server.js @@ -2,12 +2,14 @@ import { auth, post } from '$lib/utils'; import Qr from 'qrcode-base64'; import { error } from '@sveltejs/kit'; -export async function POST({ cookies, locals, request }) { +export async function POST({ cookies, request }) { try { - let { secret } = await post('/otpsecret', await request.json(), auth(cookies)); - let uri = `otpauth://totp/coinos:${locals.user.username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`; + let body = await request.json(); + let { username, secret } = await post('/otpsecret', body, auth(cookies)); + let uri = `otpauth://totp/coinos:${username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`; return new Response(JSON.stringify({ secret, uri, qr: Qr.drawImg(uri, { size: 600 }) })); } catch (e) { + console.log(e) throw new error(500, 'Problem saving secret'); } } |