pin expiry

3 files changed, 8 insertions, 18 deletions

diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index 86e78ac1..8f33a7f3 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -1,13 +1,11 @@
 <script>
-  import { tick } from "svelte";
+	import { tick } from 'svelte';
 	import { pin } from '$lib/store';
 	import { Pincode, PincodeInput } from 'svelte-pincode';
 	let pinCode = [];
 	let pinInput;
 
-	let loading;
-
-	$: pinInput && tick().then(pinInput.focusFirstInput);
+	$: pinInput && tick().then(pinInput && pinInput.focusFirstInput);
 	$: pinCode.length > 5 && ($pin = pinCode.join(''));
 </script>
 
@@ -29,13 +27,8 @@
 			<button
 				type="submit"
 				class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-				class:bg-black={loading}
 			>
-				{#if loading}
-					<Spinner />
-				{:else}
-					<div class="my-auto">Cancel</div>
-				{/if}
+				<div class="my-auto">Cancel</div>
 			</button>
 		</div>
 	</div>
diff --git a/src/lib/store.js b/src/lib/store.js
index c648a657..3174a86c 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -1,10 +1,8 @@
 import { get, writable } from 'svelte/store';
 import { browser } from '$app/environment';
 
-// creates a Svelte store synced to sessionStorage with the given key and default value
-const persistSession = (key, defaultValue, expiry = 60 * 5 * 1000) => {
-	if (browser && new Date() - expiry > sessionStorage.getItem(key + 'time')) {
-		console.log('expired', sessionStorage.getItem(key + 'time'));
+const persistSession = (key, defaultValue, expiry) => {
+	if (expiry && browser && new Date() - expiry > sessionStorage.getItem(key + 'time')) {
 		sessionStorage.removeItem(key);
 	}
 
@@ -14,14 +12,13 @@ const persistSession = (key, defaultValue, expiry = 60 * 5 * 1000) => {
 			: defaultValue
 	);
 
-	browser && sessionStorage.setItem(key + 'time', Date.now());
+	expiry && browser && sessionStorage.setItem(key + 'time', Date.now());
 
 	s.subscribe((v) => browser && sessionStorage.setItem(key, JSON.stringify(v)));
 
 	return s;
 };
 
-// creates a Svelte store synced to localStorage with the given key and default value
 const persistLocal = (key, defaultValue) => {
 	let s = writable(
 		browser && localStorage.getItem(key) && localStorage.getItem(key) !== 'undefined'
@@ -45,4 +42,4 @@ export const colorTheme = writable('from-primary to-gradient');
 export const tempProfileFiles = writable();
 export const avatarUpload = writable();
 export const bannerUpload = writable();
-export const pin = persistSession('pin');
+export const pin = persistSession('pin', undefined, 5 * 60 * 1000);
diff --git a/src/routes/send/[...text]/+page.server.js b/src/routes/send/[...text]/+page.server.js
index 45bb597d..b909ab4d 100644
--- a/src/routes/send/[...text]/+page.server.js
+++ b/src/routes/send/[...text]/+page.server.js
@@ -55,6 +55,6 @@ export const actions = {
 		const form = await request.formData();
 		await parse(form.get('text'));
 
-		return invalid(403, { error: 'Failed to recognize input' });
+		return invalid(403, { error: 'Does not compute, try again' });
 	}
 };