From 76b24f3f684cd43dd8ed7311da59094b7fd925cb Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Thu, 14 Dec 2023 11:46:04 +0000
Subject: [PATCH] Verify token on startup

---
 src/App.svelte                        | 17 +++++++++++++----
 src/components/RedirectRow.svelte     |  2 +-
 src/utils/api-request.ts              |  5 +++++
 src/views/CertificatesView.svelte     |  2 --
 src/views/SitesView.svelte            |  1 -
 src/views/TargetManagementView.svelte |  6 +-----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 088579c..fb8cf94 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type {SvelteComponent} from "svelte";
+  import {onMount, type SvelteComponent} from "svelte";
   import GeneralView from "./views/GeneralView.svelte";
   import RoutesView from "./views/RoutesView.svelte";
   import RedirectsView from "./views/RedirectsView.svelte";
@@ -8,6 +8,7 @@
   import {loginStore, parseJwt, type LoginStore} from "./stores/login";
   import {openLoginPopup} from "./utils/login-popup";
   import {domainOption} from "./stores/domain-option";
+  import {apiVerify} from "./utils/api-request";
 
   let sidebarOptions: Array<{name: string; view: typeof SvelteComponent<{}>}> = [
     {name: "General", view: GeneralView},
@@ -28,9 +29,13 @@
     let accessToken = login?.tokens?.access;
     if (accessToken == null) return [];
     let jwt = parseJwt(accessToken);
-    if(!jwt) return [];
+    if (!jwt) return [];
     return jwt.per.filter((x: string) => x.startsWith("domain:owns=")).map((x: string) => x.slice("domain:owns=".length));
   }
+
+  onMount(() => {
+    apiVerify().catch(() => {});
+  });
 </script>
 
 <header>
@@ -103,7 +108,9 @@
     height: 70px;
     padding: 0 32px;
     background-color: #2c2c2c;
-    box-shadow: 0 4px 8px #0003, 0 6px 20px #00000030;
+    box-shadow:
+      0 4px 8px #0003,
+      0 6px 20px #00000030;
     gap: 16px;
     z-index: 1;
     position: relative;
@@ -198,7 +205,9 @@
   footer {
     padding: 8px;
     background-color: #2c2c2c;
-    box-shadow: 0 -4px 8px #0003, 0 -6px 20px #00000030;
+    box-shadow:
+      0 -4px 8px #0003,
+      0 -6px 20px #00000030;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
diff --git a/src/components/RedirectRow.svelte b/src/components/RedirectRow.svelte
index 5255364..8a8ac4b 100644
--- a/src/components/RedirectRow.svelte
+++ b/src/components/RedirectRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type {Writable} from "svelte/store";
-  import {type CSPair, noCPair, noSPair, noPair, yesCPair} from "../types/cspair";
+  import {type CSPair, noCPair, noSPair, yesCPair} from "../types/cspair";
   import {redirectKeys, redirectEqual, type Redirect} from "../types/target";
   import Flags from "./Flags.svelte";
   import RedirectCode from "./RedirectCode.svelte";
diff --git a/src/utils/api-request.ts b/src/utils/api-request.ts
index 665c5b9..ad4bbd7 100644
--- a/src/utils/api-request.ts
+++ b/src/utils/api-request.ts
@@ -1,6 +1,7 @@
 import {get} from "svelte/store";
 import {getBearer, loginStore} from "../stores/login";
 
+const TOKEN_VERIFY_API = import.meta.env.VITE_SSO_ORIGIN + "/refresh";
 const TOKEN_REFRESH_API = import.meta.env.VITE_SSO_ORIGIN + "/refresh";
 
 export async function apiRequest(url: string, init?: RequestInit): Promise<Response> {
@@ -33,3 +34,7 @@ export async function apiRequest(url: string, init?: RequestInit): Promise<Respo
   init.headers = {...init.headers, Authorization: getBearer()};
   return await fetch(url, init);
 }
+
+export async function apiVerify() {
+  return await apiRequest(TOKEN_VERIFY_API);
+}
diff --git a/src/views/CertificatesView.svelte b/src/views/CertificatesView.svelte
index eb40cfa..9a7ed07 100644
--- a/src/views/CertificatesView.svelte
+++ b/src/views/CertificatesView.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
   import {domainOption} from "../stores/domain-option";
-  import {getBearer} from "../stores/login";
   import {type Cert, certsTable} from "../stores/certs";
   import {apiRequest} from "../utils/api-request";
-  import {onMount} from "svelte";
 
   const apiOrchid = import.meta.env.VITE_API_ORCHID;
 
diff --git a/src/views/SitesView.svelte b/src/views/SitesView.svelte
index 7fa413a..c46a905 100644
--- a/src/views/SitesView.svelte
+++ b/src/views/SitesView.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import {domainOption} from "../stores/domain-option";
-  import {getBearer} from "../stores/login";
   import {type Site, sitesTable} from "../stores/sites";
   import {apiRequest} from "../utils/api-request";
 
diff --git a/src/views/TargetManagementView.svelte b/src/views/TargetManagementView.svelte
index 5a1f149..24b1bec 100644
--- a/src/views/TargetManagementView.svelte
+++ b/src/views/TargetManagementView.svelte
@@ -6,10 +6,7 @@
 
 <script lang="ts">
   import {apiRequest} from "../utils/api-request";
-
   import {writable, type Writable} from "svelte/store";
-
-  import {getBearer} from "../stores/login";
   import type {CSPair} from "../types/cspair";
   import {domainOption} from "../stores/domain-option";
   import {type CountStats, tableCountStats} from "../stores/target";
@@ -77,9 +74,8 @@
       })
       .sort((a, _) => (a.type === "del" ? -1 : a.type === "ins" ? 1 : 0))
       .map(x => {
-        x.v.p = fetch(apiUrl, {
+        x.v.p = apiRequest(apiUrl, {
           method: x.type == "del" ? "DELETE" : "POST",
-          headers: {Authorization: getBearer()},
           body: JSON.stringify(x.type == "del" ? {src: (x.v.server as T).src} : x.v.client),
         }).then(x => {
           if (x.status !== 200) throw new Error("Unexpected status code: " + x.status);