From 87e5041209e2a2631cbe1a76cf9f07466a066748 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 22 Feb 2024 23:03:29 -0800
Subject: use cookies for pin memory

---
 src/routes/(app)/+layout.svelte                    | 12 +++-----
 .../[username]/settings/[...tab]/_security.svelte  | 34 ++++------------------
 2 files changed, 10 insertions(+), 36 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 07f8a2a1..dce7abae 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -10,6 +10,7 @@
     passwordPrompt,
     password,
     pin,
+    user as u,
   } from "$lib/store";
   import { page } from "$app/stores";
   import { browser } from "$app/environment";
@@ -17,7 +18,7 @@
   import Invoice from "$comp/Invoice.svelte";
   import Password from "$comp/Password.svelte";
   import Request from "$comp/Request.svelte";
-  import { warning, protectedRoutes } from "$lib/utils";
+  import { getCookie, warning, protectedRoutes } from "$lib/utils";
   import { t, locale, loading } from "$lib/translations";
   import { goto, onNavigate } from "$app/navigation";
 
@@ -39,13 +40,13 @@
   $: update(data);
   let update = (data) => {
     ({ rate, user, subject, token, rates } = data);
+    if (browser) $u = user;
   };
 
   onMount(async () => {
     if (browser) {
       checkSocket();
-      let locktime = user && user.locktime ? user.locktime : 300;
-      expireTimer = setTimeout(expirePin, locktime * 1000);
+      $pin = getCookie('pin');
 
       if (window.NDEFReader && user.nfc) {
         try {
@@ -85,11 +86,6 @@
     checkTimer = setTimeout(checkSocket, 1000);
   };
 
-  let expirePin = () => {
-    $pin = null;
-    expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
-  };
-
   onDestroy(() => {
     if (browser) {
       close();
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 7a1eeac9..6b44f830 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -209,28 +209,6 @@
   {/if}
 </div>
 
-{#if user.haspin}
-  <div>
-    <label for="locktime" class="font-bold mb-1"
-      >{$t("user.settings.autoLock")}</label
-    >
-    <p class="text-secondary mb-1">
-      {$t("user.settings.autoLockDescription")}
-    </p>
-    <select
-      name="locktime"
-      class="select-styles block py-3 w-full"
-      value={parseInt(user.locktime)}
-    >
-      <option value={5 * 60}>5 {$t("user.settings.minutes")}</option>
-      <option value={10 * 60}>10 {$t("user.settings.minutes")}</option>
-      <option value={30 * 60}>30 {$t("user.settings.minutes")}</option>
-      <option value={60 * 60}>1 {$t("user.settings.hour")}</option>
-      <option value={8 * 60 * 60}>8 {$t("user.settings.hours")}</option>
-    </select>
-  </div>
-{/if}
-
 <div>
   <span class="font-bold mb-1">{$t("user.settings.twofa")}</span>
   <p class="text-secondary mb-4">
@@ -248,18 +226,18 @@
     </div>
 
     <button type="button" class="primary" on:click={startConfirming2fa}>
-      <Icon icon="mobile" style="mr-1" />
-      Confirm
+      <Icon icon="numpad" style="w-8 mr-1" />
+      <div class="my-auto">Confirm</div>
     </button>
   {:else if user.twofa}
     <button type="button" class="primary" on:click={startDisabling2fa}>
-      <Icon icon="mobile" style="mr-1" />
-      {$t("user.settings.twofaDisable")}
+      <Icon icon="mobile" style="w-8 mr-1" />
+      <div class="my-auto">{$t("user.settings.twofaDisable")}</div>
     </button>
   {:else}
     <button type="button" class="primary" on:click={startEnabling2fa}>
-      <Icon icon="mobile" style="mr-1" />
-      {$t("user.settings.twofaSetup")}
+      <Icon icon="mobile" style="w-8 mr-1" />
+      <div class="my-auto">{$t("user.settings.twofaSetup")}</div>
     </button>
   {/if}
 
-- 
cgit v1.2.3