From 117adbad7b5469b03038017fcb98fcf0d9423284 Mon Sep 17 00:00:00 2001
From: Bernd Storath <999999bst@gmail.com>
Date: Mon, 2 Sep 2024 14:12:22 +0200
Subject: [PATCH] refactor code

---
 src/server/api/cnf/[clientOneTimeLink].ts      |  2 +-
 src/server/api/remember-me.get.ts              |  1 +
 src/server/api/session.post.ts                 |  2 --
 src/server/api/ui-chart-type.get.ts            |  6 +-----
 src/server/api/ui-sort-clients.get.ts          | 12 +++++++++---
 src/server/api/wg-enable-expire-time.get.ts    |  2 +-
 src/server/api/wg-enable-one-time-links.get.ts |  2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/server/api/cnf/[clientOneTimeLink].ts b/src/server/api/cnf/[clientOneTimeLink].ts
index 79ef77e2..e8d4a1ea 100644
--- a/src/server/api/cnf/[clientOneTimeLink].ts
+++ b/src/server/api/cnf/[clientOneTimeLink].ts
@@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => {
       statusCode: 500,
       statusMessage: 'Invalid',
     });
-  if (!system.wgEnableOneTimeLinks) {
+  if (!system.oneTimeLinks.enabled) {
     throw createError({
       status: 404,
       message: 'Invalid state',
diff --git a/src/server/api/remember-me.get.ts b/src/server/api/remember-me.get.ts
index 2a2bac75..cf08d59f 100644
--- a/src/server/api/remember-me.get.ts
+++ b/src/server/api/remember-me.get.ts
@@ -1,4 +1,5 @@
 export default defineEventHandler(async (event) => {
   setHeader(event, 'Content-Type', 'application/json');
+  // TODO: enable by default
   return MAX_AGE > 0;
 });
diff --git a/src/server/api/session.post.ts b/src/server/api/session.post.ts
index d6712475..c0250ff6 100644
--- a/src/server/api/session.post.ts
+++ b/src/server/api/session.post.ts
@@ -22,8 +22,6 @@ export default defineEventHandler(async (event) => {
     });
   }
 
-  // TODO: timing against timing attack
-
   const system = await Database.getSystem();
   if (!system)
     throw createError({
diff --git a/src/server/api/ui-chart-type.get.ts b/src/server/api/ui-chart-type.get.ts
index 46bb0566..48ade476 100644
--- a/src/server/api/ui-chart-type.get.ts
+++ b/src/server/api/ui-chart-type.get.ts
@@ -7,9 +7,5 @@ export default defineEventHandler(async (event) => {
       statusMessage: 'Invalid',
     });
 
-  const number = system.trafficStats.type;
-  if (Number.isNaN(number)) {
-    return 0;
-  }
-  return number;
+  return system.trafficStats.type;
 });
diff --git a/src/server/api/ui-sort-clients.get.ts b/src/server/api/ui-sort-clients.get.ts
index 11917ebe..37262888 100644
--- a/src/server/api/ui-sort-clients.get.ts
+++ b/src/server/api/ui-sort-clients.get.ts
@@ -1,5 +1,11 @@
-export default defineEventHandler((event) => {
+export default defineEventHandler(async (event) => {
   setHeader(event, 'Content-Type', 'application/json');
-  const sort = UI_ENABLE_SORT_CLIENTS;
-  return sort === 'true' ? true : false;
+  const system = await Database.getSystem();
+  if (!system)
+    throw createError({
+      statusCode: 500,
+      statusMessage: 'Invalid',
+    });
+
+  return system.sortClients.enabled;
 });
diff --git a/src/server/api/wg-enable-expire-time.get.ts b/src/server/api/wg-enable-expire-time.get.ts
index 8d3031e7..74389a00 100644
--- a/src/server/api/wg-enable-expire-time.get.ts
+++ b/src/server/api/wg-enable-expire-time.get.ts
@@ -7,5 +7,5 @@ export default defineEventHandler(async (event) => {
       statusMessage: 'Invalid',
     });
 
-  return system.wgEnableExpiresTime;
+  return system.clientExpiration.enabled;
 });
diff --git a/src/server/api/wg-enable-one-time-links.get.ts b/src/server/api/wg-enable-one-time-links.get.ts
index 12488126..7b474c76 100644
--- a/src/server/api/wg-enable-one-time-links.get.ts
+++ b/src/server/api/wg-enable-one-time-links.get.ts
@@ -7,5 +7,5 @@ export default defineEventHandler(async (event) => {
       statusMessage: 'Invalid',
     });
 
-  return system.wgEnableOneTimeLinks;
+  return system.oneTimeLinks.enabled;
 });