Add .gitattributes

3 files changed, 16 insertions, 9 deletions

diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte
index ed35a84..005eb34 100644
--- a/app/src/routes/+page.svelte
+++ b/app/src/routes/+page.svelte
@@ -27,6 +27,10 @@
         await refreshSB1Token();
         getTokenExpires().refresh();
     }
+
+    async function initActual() {
+        await initActual()
+    }
 </script>
 
 <main>
@@ -37,7 +41,7 @@
             <pre>accessToken: {tokens.accessToken.created.add({ seconds: tokens.accessToken.expires }).toLocaleString()}
 refreshToken: {tokens.refreshToken.created.add({ seconds: tokens.refreshToken.expires }).toLocaleString()}</pre>
             <ul>
-                {#each accounts.accounts as account}
+                {#each accounts?.accounts as account}
                     {@const transactions = await getTransactions(account.key)}
                     <li>{account.name}</li>
                     <ul>
@@ -47,9 +51,9 @@ refreshToken: {tokens.refreshToken.created.add({ seconds: tokens.refreshToken.ex
                     </ul>
                 {/each}
             </ul>
-        {:else}
             <Button onclick={clearAuth}>Slett autorisasjon</Button>
             <Button onclick={refreshAuth}>Oppdater autorisasjon</Button>
+            <Button></Button>
         {/if}
     {:else}
         <Button onclick={authorize} loading={navigating}>Autentisér hos Sparebanken 1</Button>
diff --git a/app/src/routes/actual.remote.ts b/app/src/routes/actual.remote.ts
index bcf5d37..535e387 100644
--- a/app/src/routes/actual.remote.ts
+++ b/app/src/routes/actual.remote.ts
@@ -1,10 +1,10 @@
-import { command } from "$app/server";
+import { command, query } from "$app/server";
 import { ACTUAL_HOST, ACTUAL_PASS } from "$env/static/private";
 import * as actual from "@actual-app/api"
 import { existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 
-export const initActual = command(async () => {
+async function initActual() {
     const dataDir = path.resolve(__dirname, "actualDataDir");
 
     if (!existsSync(dataDir)) mkdirSync(dataDir);
@@ -14,4 +14,10 @@ export const initActual = command(async () => {
         serverURL: ACTUAL_HOST,
         dataDir: dataDir
     })
+}
+
+export const getActualMeta = query(async () => {
+    await initActual()
+    const accounts = await actual.getAccounts()
+    return
 })
\ No newline at end of file
diff --git a/app/src/routes/sb1.remote.ts b/app/src/routes/sb1.remote.ts
index 3d5763e..17e1ead 100644
--- a/app/src/routes/sb1.remote.ts
+++ b/app/src/routes/sb1.remote.ts
@@ -31,7 +31,7 @@ async function createSb1Auth() {
 
 export const getAccounts = query(async () => {
     const token = await getSb1AccessToken()
-    if (!token) return []
+    if (!token) return undefined
     const url = new URL(
         "https://api.sparebank1.no/personal/banking/accounts",
     );
@@ -41,9 +41,7 @@ export const getAccounts = query(async () => {
         },
     });
     if (response.ok) {
-        const json = await response.json()
-        console.log(json)
-        return json
+        return await response.json() as { accounts: Array<any> }
     }
     else console.error(await response.text())
 })
@@ -55,7 +53,6 @@ export const getTransactions = query(v.string(), async (accountKey: string) => {
         "https://api.sparebank1.no/personal/banking/transactions",
     );
     url.searchParams.set("accountKey", accountKey);
-    console.log(token)
     const response = await fetch(url, {
         headers: {
             Authorization: `Bearer ${token}`,