From eba4fe12dfa75b1bfe3f0e14f5ac792cc322210d Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 23 Apr 2025 21:14:16 -0400
Subject: [PATCH 01/10] feat: run tasks at startup

---
 server/server/plugins/01.system-init.ts                    | 2 +-
 .../plugins/{02.system-setup.ts => 02.setup-admin.ts}      | 2 +-
 server/server/plugins/04.tasks.ts                          | 7 +++++++
 server/server/tasks/cleanup/invitations.ts                 | 3 +++
 server/server/tasks/cleanup/sessions.ts                    | 5 +++--
 5 files changed, 15 insertions(+), 4 deletions(-)
 rename server/server/plugins/{02.system-setup.ts => 02.setup-admin.ts} (91%)
 create mode 100644 server/server/plugins/04.tasks.ts

diff --git a/server/server/plugins/01.system-init.ts b/server/server/plugins/01.system-init.ts
index bb01ed93..1193ec55 100644
--- a/server/server/plugins/01.system-init.ts
+++ b/server/server/plugins/01.system-init.ts
@@ -1,4 +1,4 @@
-import prisma from "../internal/db/database";
+import prisma from "~/server/internal/db/database";
 
 export default defineNitroPlugin(async (_nitro) => {
   // Ensure system user exists
diff --git a/server/server/plugins/02.system-setup.ts b/server/server/plugins/02.setup-admin.ts
similarity index 91%
rename from server/server/plugins/02.system-setup.ts
rename to server/server/plugins/02.setup-admin.ts
index e568a696..1d4a1283 100644
--- a/server/server/plugins/02.system-setup.ts
+++ b/server/server/plugins/02.setup-admin.ts
@@ -1,4 +1,4 @@
-import prisma from "../internal/db/database";
+import prisma from "~/server/internal/db/database";
 
 export default defineNitroPlugin(async (_nitro) => {
   const userCount = await prisma.user.count({
diff --git a/server/server/plugins/04.tasks.ts b/server/server/plugins/04.tasks.ts
new file mode 100644
index 00000000..3c8dde47
--- /dev/null
+++ b/server/server/plugins/04.tasks.ts
@@ -0,0 +1,7 @@
+export default defineNitroPlugin(async (_nitro) => {
+  // all tasks we should run on server boot
+  await Promise.all([
+    runTask("cleanup:invitations"),
+    runTask("cleanup:sessions"),
+  ]);
+});
diff --git a/server/server/tasks/cleanup/invitations.ts b/server/server/tasks/cleanup/invitations.ts
index 965731f8..b2afc454 100644
--- a/server/server/tasks/cleanup/invitations.ts
+++ b/server/server/tasks/cleanup/invitations.ts
@@ -5,6 +5,8 @@ export default defineTask({
     name: "cleanup:invitations",
   },
   async run() {
+    console.log("[Task cleanup:invitations]: Cleaning invitations");
+
     const now = new Date();
 
     await prisma.invitation.deleteMany({
@@ -15,6 +17,7 @@ export default defineTask({
       },
     });
 
+    console.log("[Task cleanup:invitations]: Done");
     return { result: true };
   },
 });
diff --git a/server/server/tasks/cleanup/sessions.ts b/server/server/tasks/cleanup/sessions.ts
index d2f48944..b613a72a 100644
--- a/server/server/tasks/cleanup/sessions.ts
+++ b/server/server/tasks/cleanup/sessions.ts
@@ -2,11 +2,12 @@ import sessionHandler from "~/server/internal/session";
 
 export default defineTask({
   meta: {
-    name: "cleanup:invitations",
+    name: "cleanup:sessions",
   },
   async run() {
+    console.log("[Task cleanup:sessions]: Cleaning up sessions");
     await sessionHandler.cleanupSessions();
-
+    console.log("[Task cleanup:sessions]: Done");
     return { result: true };
   },
 });

From 7987bd0a77524036d4b5f461676b80a4f5b86dad Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Thu, 24 Apr 2025 18:34:20 -0400
Subject: [PATCH 02/10] chore: remove redundant omitApi prisma option

---
 server/prisma/schema.prisma | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 814bed45..9613cf33 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -3,7 +3,7 @@
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["prismaSchemaFolder", "omitApi", "fullTextSearchPostgres"]
+  previewFeatures = ["prismaSchemaFolder", "fullTextSearchPostgres"]
 }
 
 datasource db {

From e1c919a7dc7549fe229f1185affd7b57a229b1bc Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 18:42:13 -0400
Subject: [PATCH 03/10] refactor: homepage link in header

---
 server/components/UserHeader.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/components/UserHeader.vue b/server/components/UserHeader.vue
index d9d14e1a..cef97f8e 100644
--- a/server/components/UserHeader.vue
+++ b/server/components/UserHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="hidden lg:flex bg-zinc-950 flex-row px-12 xl:px-48 py-5">
     <div class="grow inline-flex items-center gap-x-20">
-      <NuxtLink to="/store">
+      <NuxtLink :to="homepageURL">
         <DropWordmark class="h-8" />
       </NuxtLink>
       <nav class="inline-flex items-center">
@@ -62,7 +62,10 @@
   <div
     class="sticky lg:hidden top-0 z-40 flex h-16 justify-between items-center gap-x-4 border-b border-zinc-700 bg-zinc-950 px-4 shadow-sm sm:gap-x-6 sm:px-6 lg:px-8"
   >
+    <NuxtLink :to="homepageURL">
     <DropWordmark class="mb-0.5" />
+    </NuxtLink>
+
     <div class="flex gap-x-4 lg:gap-x-6">
       <div class="flex items-center gap-x-3">
         <!-- Profile dropdown -->
@@ -132,7 +135,7 @@
               class="flex grow flex-col gap-y-5 overflow-y-auto bg-zinc-950 px-6 pb-4"
             >
               <div class="flex shrink-0 h-16 items-center justify-between">
-                <NuxtLink to="/store">
+                <NuxtLink :to="homepageURL">
                   <DropLogo class="h-8 w-auto" />
                 </NuxtLink>
 
@@ -180,7 +183,11 @@
 </template>
 
 <script setup lang="ts">
-import { BellIcon, UserGroupIcon } from "@heroicons/vue/16/solid";
+import {
+  BellIcon,
+  UserGroupIcon,
+  ArrowDownTrayIcon,
+} from "@heroicons/vue/16/solid";
 import {
   Dialog,
   DialogPanel,
@@ -196,6 +203,7 @@ import { XMarkIcon } from "@heroicons/vue/24/solid";
 
 const router = useRouter();
 
+const homepageURL = "/store";
 const navigation: Array<NavigationItem> = [
   {
     prefix: "/store",

From 7566617e740a7dfb4daf2778ea589ad3f368d18b Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 18:50:21 -0400
Subject: [PATCH 04/10] fix: eslint error and server plugin name

---
 server/server/plugins/04.auth-init.ts           | 5 +++--
 server/server/plugins/{04.tasks.ts => tasks.ts} | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename server/server/plugins/{04.tasks.ts => tasks.ts} (100%)

diff --git a/server/server/plugins/04.auth-init.ts b/server/server/plugins/04.auth-init.ts
index 6b561eb1..7369de23 100644
--- a/server/server/plugins/04.auth-init.ts
+++ b/server/server/plugins/04.auth-init.ts
@@ -9,7 +9,7 @@ export const enabledAuthManagers: {
 };
 
 const initFunctions: {
-  [K in keyof typeof enabledAuthManagers]: () => Promise<any>;
+  [K in keyof typeof enabledAuthManagers]: () => Promise<unknown>;
 } = {
   oidc: OIDCManager.prototype.create,
   simple: async () => {
@@ -18,11 +18,12 @@ const initFunctions: {
   },
 };
 
-export default defineNitroPlugin(async (nitro) => {
+export default defineNitroPlugin(async (_nitro) => {
   for (const [key, init] of Object.entries(initFunctions)) {
     try {
       const object = await init();
       if (!object) break;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (enabledAuthManagers as any)[key] = object;
       console.log(`enabled auth: ${key}`);
     } catch (e) {
diff --git a/server/server/plugins/04.tasks.ts b/server/server/plugins/tasks.ts
similarity index 100%
rename from server/server/plugins/04.tasks.ts
rename to server/server/plugins/tasks.ts

From 1b11427300e103b1bd23467c965abaad9c1a5074 Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 21:45:13 -0400
Subject: [PATCH 05/10] docs: why timeline was disabled

---
 server/nuxt.config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/nuxt.config.ts b/server/nuxt.config.ts
index 7b96d005..5fb4b93c 100644
--- a/server/nuxt.config.ts
+++ b/server/nuxt.config.ts
@@ -9,7 +9,8 @@ export default defineNuxtConfig({
     enabled: true,
     telemetry: false,
     timeline: {
-      // seems to break things
+      // this seems to be the tracking issue, composables not registered
+      // https://github.com/nuxt/devtools/issues/662
       enabled: false,
     },
   },

From 9adbc157abea8ec9500ac35f854266ca46714746 Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 22:13:22 -0400
Subject: [PATCH 06/10] feat: unified cache handler

---
 server/nuxt.config.ts                        | 14 +++++++
 server/package.json                          |  4 +-
 server/server/internal/cache/cacheHandler.ts | 33 ++++++++++++++++
 server/server/internal/cache/index.ts        |  4 ++
 server/server/internal/objects/fsBackend.ts  | 40 ++++++++++----------
 server/server/internal/session/db.ts         | 15 +++-----
 server/server/internal/userlibrary/index.ts  | 10 +++--
 7 files changed, 86 insertions(+), 34 deletions(-)
 create mode 100644 server/server/internal/cache/cacheHandler.ts
 create mode 100644 server/server/internal/cache/index.ts

diff --git a/server/nuxt.config.ts b/server/nuxt.config.ts
index 5fb4b93c..e4e014d3 100644
--- a/server/nuxt.config.ts
+++ b/server/nuxt.config.ts
@@ -48,6 +48,20 @@ export default defineNuxtConfig({
     },
 
     compressPublicAssets: true,
+
+    storage: {
+      appCache: {
+        driver: "lru-cache",
+      },
+    },
+
+    devStorage: {
+      appCache: {
+        // store cache on fs to handle dev server restarts
+        driver: "fs",
+        base: "./.data/appCache",
+      },
+    },
   },
 
   typescript: {
diff --git a/server/package.json b/server/package.json
index 5489fb35..ea7fe5bc 100644
--- a/server/package.json
+++ b/server/package.json
@@ -31,7 +31,6 @@
     "fast-fuzzy": "^1.12.0",
     "file-type-mime": "^0.4.3",
     "jdenticon": "^3.3.0",
-    "lru-cache": "^11.1.0",
     "luxon": "^3.6.1",
     "micromark": "^4.0.1",
     "nuxt": "^3.16.2",
@@ -40,6 +39,7 @@
     "sharp": "^0.33.5",
     "stream-mime-type": "^2.0.0",
     "turndown": "^7.2.0",
+    "unstorage": "^1.15.0",
     "vue": "latest",
     "vue-router": "latest",
     "vue3-carousel": "^0.15.0",
@@ -75,4 +75,4 @@
   "prisma": {
     "schema": "./prisma"
   }
-}
+}
\ No newline at end of file
diff --git a/server/server/internal/cache/cacheHandler.ts b/server/server/internal/cache/cacheHandler.ts
new file mode 100644
index 00000000..c42c072b
--- /dev/null
+++ b/server/server/internal/cache/cacheHandler.ts
@@ -0,0 +1,33 @@
+import { prefixStorage, type StorageValue, type Storage } from "unstorage";
+
+export interface CacheProviderOptions {
+  /**
+   * Max number of items in the cache
+   */
+  max?: number;
+
+  /**
+   * Time to live (in ms)
+   */
+  ttl?: number;
+}
+
+/**
+ * Creates and manages the lifecycles of various caches
+ */
+export class CacheHandler {
+  private caches = new Map<string, Storage<StorageValue>>();
+
+  /**
+   * Create a new cache
+   * @param name
+   * @returns
+   */
+  createCache<V extends StorageValue>(name: string) {
+    // will allow us to dynamicing use redis in the future just by changing the storage used
+    const provider = prefixStorage<V>(useStorage<V>("appCache"), name);
+    // hack to let ts have us store cache
+    this.caches.set(name, provider as unknown as Storage<StorageValue>);
+    return provider;
+  }
+}
diff --git a/server/server/internal/cache/index.ts b/server/server/internal/cache/index.ts
new file mode 100644
index 00000000..6a6035d5
--- /dev/null
+++ b/server/server/internal/cache/index.ts
@@ -0,0 +1,4 @@
+import { CacheHandler } from "./cacheHandler";
+
+export const cacheHandler = new CacheHandler();
+export default cacheHandler;
diff --git a/server/server/internal/objects/fsBackend.ts b/server/server/internal/objects/fsBackend.ts
index 4f3aaaea..05566227 100644
--- a/server/server/internal/objects/fsBackend.ts
+++ b/server/server/internal/objects/fsBackend.ts
@@ -1,12 +1,12 @@
 import type { ObjectMetadata, ObjectReference, Source } from "./objectHandler";
 import { ObjectBackend } from "./objectHandler";
 
-import { LRUCache } from "lru-cache";
 import fs from "fs";
 import path from "path";
 import { Readable } from "stream";
 import { createHash } from "crypto";
 import prisma from "../db/database";
+import cacheHandler from "../cache";
 
 export class FsObjectBackend extends ObjectBackend {
   private baseObjectPath: string;
@@ -34,7 +34,7 @@ export class FsObjectBackend extends ObjectBackend {
     if (!fs.existsSync(objectPath)) return false;
 
     // remove item from cache
-    this.hashStore.delete(id);
+    await this.hashStore.delete(id);
 
     if (source instanceof Readable) {
       const outputStream = fs.createWriteStream(objectPath);
@@ -54,7 +54,7 @@ export class FsObjectBackend extends ObjectBackend {
     const objectPath = path.join(this.baseObjectPath, id);
     if (!fs.existsSync(objectPath)) return undefined;
     // remove item from cache
-    this.hashStore.delete(id);
+    await this.hashStore.delete(id);
     return fs.createWriteStream(objectPath);
   }
   async create(
@@ -99,7 +99,7 @@ export class FsObjectBackend extends ObjectBackend {
     if (!fs.existsSync(objectPath)) return true;
     fs.rmSync(objectPath);
     // remove item from cache
-    this.hashStore.delete(id);
+    await this.hashStore.delete(id);
     return true;
   }
   async fetchMetadata(
@@ -121,36 +121,35 @@ export class FsObjectBackend extends ObjectBackend {
   }
   async fetchHash(id: ObjectReference): Promise<string | undefined> {
     const cacheResult = await this.hashStore.get(id);
-    if (cacheResult !== undefined) return cacheResult;
+    if (cacheResult !== null) return cacheResult;
 
     const obj = await this.fetch(id);
     if (obj === undefined) return;
 
-    // local variable to point to object
-    const cache = this.hashStore;
-
     // hash object
     const hash = createHash("md5");
     hash.setEncoding("hex");
 
+    // local variable to point to object
+    const store = this.hashStore;
+
     // read obj into hash
     obj.pipe(hash);
     await new Promise<void>((r) => {
-      obj.on("end", function () {
+      obj.on("end", async function () {
         hash.end();
-        cache.save(id, hash.read());
+        await store.save(id, hash.read());
         r();
       });
     });
 
-    return await this.hashStore.get(id);
+    const result = await this.hashStore.get(id);
+    return result === null ? undefined : result;
   }
 }
 
 class FsHashStore {
-  private cache = new LRUCache<string, string>({
-    max: 1000, // number of items
-  });
+  private cache = cacheHandler.createCache<string>("ObjectHashStore");
 
   /**
    * Gets hash of object
@@ -158,8 +157,11 @@ class FsHashStore {
    * @returns
    */
   async get(id: ObjectReference) {
-    const cacheRes = this.cache.get(id);
-    if (cacheRes !== undefined) return cacheRes;
+    const cacheRes = await this.cache.get(id);
+    if (cacheRes !== null) {
+      console.log("object cache hit");
+      return cacheRes;
+    }
 
     const objectHash = await prisma.objectHash.findUnique({
       where: {
@@ -170,7 +172,7 @@ class FsHashStore {
       },
     });
     if (objectHash === null) return undefined;
-    this.cache.set(id, objectHash.hash);
+    await this.cache.set(id, objectHash.hash);
     return objectHash.hash;
   }
 
@@ -191,7 +193,7 @@ class FsHashStore {
         hash,
       },
     });
-    this.cache.set(id, hash);
+    await this.cache.set(id, hash);
   }
 
   /**
@@ -199,7 +201,7 @@ class FsHashStore {
    * @param id
    */
   async delete(id: ObjectReference) {
-    this.cache.delete(id);
+    await this.cache.remove(id);
 
     try {
       // need to catch in case the object doesn't exist
diff --git a/server/server/internal/session/db.ts b/server/server/internal/session/db.ts
index 58f52a83..5b8fd2e4 100644
--- a/server/server/internal/session/db.ts
+++ b/server/server/internal/session/db.ts
@@ -1,16 +1,13 @@
-import { LRUCache } from "lru-cache";
 import prisma from "../db/database";
 import type { Session, SessionProvider } from "./types";
+import cacheHandler from "../cache";
 
 export default function createDBSessionHandler(): SessionProvider {
-  const cache = new LRUCache<string, Session>({
-    max: 50, // number of items
-    ttl: 30 * 100, // 30s (in ms)
-  });
+  const cache = cacheHandler.createCache<Session>("DBSession");
 
   return {
     async setSession(token, session) {
-      cache.set(token, session);
+      await cache.set(token, session);
 
       //   const strData = JSON.stringify(data);
       await prisma.session.upsert({
@@ -29,8 +26,8 @@ export default function createDBSessionHandler(): SessionProvider {
       return await this.setSession(token, data);
     },
     async getSession<T extends Session>(token: string) {
-      const cached = cache.get(token);
-      if (cached !== undefined) return cached as T;
+      const cached = await cache.get(token);
+      if (cached !== null) return cached as T;
 
       const result = await prisma.session.findUnique({
         where: {
@@ -45,7 +42,7 @@ export default function createDBSessionHandler(): SessionProvider {
       return result as unknown as T;
     },
     async removeSession(token) {
-      cache.delete(token);
+      await cache.remove(token);
       await prisma.session.delete({
         where: {
           token,
diff --git a/server/server/internal/userlibrary/index.ts b/server/server/internal/userlibrary/index.ts
index 537ac8fa..16db484b 100644
--- a/server/server/internal/userlibrary/index.ts
+++ b/server/server/internal/userlibrary/index.ts
@@ -2,15 +2,17 @@
 Handles managing collections
 */
 
+import cacheHandler from "../cache";
 import prisma from "../db/database";
 
 class UserLibraryManager {
   // Caches the user's core library
-  private userCoreLibraryCache: { [key: string]: string } = {};
+  private coreLibraryCache =
+    cacheHandler.createCache<string>("UserCoreLibrary");
 
   private async fetchUserLibrary(userId: string) {
-    if (this.userCoreLibraryCache[userId])
-      return this.userCoreLibraryCache[userId];
+    const cached = await this.coreLibraryCache.get(userId);
+    if (cached !== null) return cached;
 
     let collection = await prisma.collection.findFirst({
       where: {
@@ -28,7 +30,7 @@ class UserLibraryManager {
         },
       });
 
-    this.userCoreLibraryCache[userId] = collection.id;
+    await this.coreLibraryCache.set(userId, collection.id);
 
     return collection.id;
   }

From 4d54b977058559b9d9706162dca49a862267b273 Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 22:29:10 -0400
Subject: [PATCH 07/10] fix: edgecase where object hash isn't read

---
 server/server/internal/objects/fsBackend.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/server/internal/objects/fsBackend.ts b/server/server/internal/objects/fsBackend.ts
index 05566227..1bc5aea2 100644
--- a/server/server/internal/objects/fsBackend.ts
+++ b/server/server/internal/objects/fsBackend.ts
@@ -132,19 +132,27 @@ export class FsObjectBackend extends ObjectBackend {
 
     // local variable to point to object
     const store = this.hashStore;
+    let hashResult = "";
 
-    // read obj into hash
-    obj.pipe(hash);
-    await new Promise<void>((r) => {
+    const objEnd = new Promise<void>((r) => {
       obj.on("end", async function () {
         hash.end();
-        await store.save(id, hash.read());
+        hashResult = hash.read();
         r();
       });
     });
+    // read obj into hash
+    obj.pipe(hash);
+    await objEnd;
 
-    const result = await this.hashStore.get(id);
-    return result === null ? undefined : result;
+    console.log("object hash: ", hashResult);
+
+    // if hash isn't a string somehow, mark as unknown hash
+    if (typeof hashResult !== "string") {
+      return undefined;
+    }
+    await store.save(id, hashResult);
+    return typeof hashResult;
   }
 }
 

From f4bbbbf334087781cc331bcbd0e09f467b534920 Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Wed, 7 May 2025 22:32:24 -0400
Subject: [PATCH 08/10] chore: remove fsbackend console logs

---
 server/server/internal/objects/fsBackend.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/server/internal/objects/fsBackend.ts b/server/server/internal/objects/fsBackend.ts
index 1bc5aea2..a3e33fe6 100644
--- a/server/server/internal/objects/fsBackend.ts
+++ b/server/server/internal/objects/fsBackend.ts
@@ -145,8 +145,6 @@ export class FsObjectBackend extends ObjectBackend {
     obj.pipe(hash);
     await objEnd;
 
-    console.log("object hash: ", hashResult);
-
     // if hash isn't a string somehow, mark as unknown hash
     if (typeof hashResult !== "string") {
       return undefined;
@@ -167,7 +165,6 @@ class FsHashStore {
   async get(id: ObjectReference) {
     const cacheRes = await this.cache.get(id);
     if (cacheRes !== null) {
-      console.log("object cache hit");
       return cacheRes;
     }
 

From 255bb4f3e1d473ac35a64eaa3d89c7473b22ea68 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Thu, 8 May 2025 15:29:50 +1000
Subject: [PATCH 09/10] feat: add oidc to admin panel

---
 server/components/Icons/SSOLogo.vue           | 11 +++++++++
 server/components/UserHeader/UserWidget.vue   |  2 +-
 server/pages/admin/users/auth/index.vue       | 24 +++++++++++++------
 server/pages/auth/signin.vue                  | 10 +++++---
 server/prisma/app.prisma                      |  1 -
 .../migration.sql                             |  8 +++++++
 server/server/api/v1/admin/auth/index.get.ts  | 13 +++++-----
 server/server/api/v1/auth/index.get.ts        |  2 +-
 .../server/api/v1/auth/signin/simple.post.ts  |  2 +-
 server/server/internal/clients/ca-store.ts    |  1 +
 .../config/application-configuration.ts       |  2 --
 server/server/internal/notifications/index.ts |  4 +++-
 server/server/internal/oidc/index.ts          | 23 ++++++++++++++----
 server/server/plugins/03.metadata-init.ts     |  1 -
 server/server/plugins/04.auth-init.ts         | 19 ++++++++-------
 .../server/routes/auth/callback/oidc.get.ts   |  5 ++--
 server/server/routes/auth/oidc.get.ts         |  4 ++--
 17 files changed, 89 insertions(+), 43 deletions(-)
 create mode 100644 server/components/Icons/SSOLogo.vue
 create mode 100644 server/prisma/migrations/20250507223112_remove_authentication_option_from_applicationsettings/migration.sql

diff --git a/server/components/Icons/SSOLogo.vue b/server/components/Icons/SSOLogo.vue
new file mode 100644
index 00000000..2426be44
--- /dev/null
+++ b/server/components/Icons/SSOLogo.vue
@@ -0,0 +1,11 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+  >
+    <path
+      fill="currentColor"
+      d="M9.41 20H6.5c-1.5 0-2.82-.5-3.89-1.57C1.54 17.38 1 16.09 1 14.58q0-1.95 1.17-3.48a5.25 5.25 0 0 1 3.08-1.95c.42-1.53 1.25-2.77 2.5-3.72C9 4.5 10.42 4 12 4c1.95 0 3.61.68 4.96 2.04C18.32 7.39 19 9.05 19 11c1.15.13 2.11.63 2.86 1.5c.64.73 1 1.56 1.1 2.5H18a5.01 5.01 0 0 0-4-2c-2.8 0-5 2.2-5 5c0 .72.15 1.39.41 2M23 17v2h-2v2h-2v-2h-2.2c-.4 1.2-1.5 2-2.8 2c-1.7 0-3-1.3-3-3s1.3-3 3-3c1.3 0 2.4.8 2.8 2zm-8 1c0-.5-.4-1-1-1s-1 .5-1 1s.4 1 1 1s1-.5 1-1"
+    />
+  </svg>
+</template>
diff --git a/server/components/UserHeader/UserWidget.vue b/server/components/UserHeader/UserWidget.vue
index 8bf8185f..827b633e 100644
--- a/server/components/UserHeader/UserWidget.vue
+++ b/server/components/UserHeader/UserWidget.vue
@@ -58,7 +58,7 @@
                 {{ nav.label }}
               </button>
             </MenuItem>
-            <MenuItem v-slot="{ active, close }" hydrate-on-visible as="div">
+            <MenuItem v-slot="{ active }" hydrate-on-visible as="div">
               <!-- TODO: think this would work better as a NuxtLink instead of a button -->
               <a
                 :class="[
diff --git a/server/pages/admin/users/auth/index.vue b/server/pages/admin/users/auth/index.vue
index 88464908..5aa3b799 100644
--- a/server/pages/admin/users/auth/index.vue
+++ b/server/pages/admin/users/auth/index.vue
@@ -32,7 +32,7 @@
           <div class="text-sm/6 font-medium text-zinc-100">
             {{ authMech.name }}
           </div>
-          <Menu as="div" class="relative ml-auto">
+          <Menu v-if="authMech.route" as="div" class="relative ml-auto">
             <MenuButton
               class="-m-2.5 block p-2.5 text-gray-400 hover:text-gray-500"
             >
@@ -81,10 +81,10 @@
             <div
               v-for="[key, value] in Object.entries(authMech.settings)"
               :key="key"
-              class="flex justify-between gap-x-4 py-2"
+              class="flex flex-nowrap justify-between gap-x-4 py-2"
             >
               <dt class="text-zinc-400">{{ key }}</dt>
-              <dd class="text-gray-500">
+              <dd class="text-gray-500 truncate">
                 {{ value }}
               </dd>
             </div>
@@ -96,7 +96,7 @@
 </template>
 
 <script setup lang="ts">
-import { IconsSimpleAuthenticationLogo } from "#components";
+import { IconsSimpleAuthenticationLogo, IconsSSOLogo } from "#components";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import { EllipsisHorizontalIcon } from "@heroicons/vue/20/solid";
 import { CheckIcon, XMarkIcon } from "@heroicons/vue/24/solid";
@@ -117,9 +117,9 @@ const authenticationMechanisms: Array<{
   name: string;
   mec: AuthMec;
   icon: Component;
-  route: string;
+  route?: string;
   enabled: boolean;
-  settings?: { [key: string]: string };
+  settings?: { [key: string]: string | undefined } | undefined | boolean;
 }> = [
   {
     name: "Simple (username/password)",
@@ -127,5 +127,15 @@ const authenticationMechanisms: Array<{
     icon: IconsSimpleAuthenticationLogo,
     route: "/admin/users/auth/simple",
   },
-].map((e) => ({ ...e, enabled: enabledMechanisms.includes(e.mec) }));
+  {
+    name: "OpenID Connect",
+    mec: "OpenID" as AuthMec,
+    icon: IconsSSOLogo,
+  },
+].map((e) => ({
+  ...e,
+  enabled: !!enabledMechanisms[e.mec],
+  settings:
+    typeof enabledMechanisms[e.mec] === "object" && enabledMechanisms[e.mec],
+}));
 </script>
diff --git a/server/pages/auth/signin.vue b/server/pages/auth/signin.vue
index d833a4c4..0c5ef244 100644
--- a/server/pages/auth/signin.vue
+++ b/server/pages/auth/signin.vue
@@ -18,13 +18,16 @@
 
         <div class="mt-10">
           <div>
-            <AuthSimple v-if="enabledAuths.includes('simple')" />
-            <div v-if="enabledAuths.length > 1" class="py-4 flex flex-row items-center justify-center gap-x-4 font-bold text-sm text-zinc-600">
+            <AuthSimple v-if="enabledAuths.includes(AuthMec.Simple)" />
+            <div
+              v-if="enabledAuths.length > 1"
+              class="py-4 flex flex-row items-center justify-center gap-x-4 font-bold text-sm text-zinc-600"
+            >
               <span class="h-[1px] grow bg-zinc-600" />
               OR
               <span class="h-[1px] grow bg-zinc-600" />
             </div>
-            <AuthOpenID v-if="enabledAuths.includes('oidc')" />
+            <AuthOpenID v-if="enabledAuths.includes(AuthMec.OpenID)" />
           </div>
         </div>
       </div>
@@ -40,6 +43,7 @@
 </template>
 
 <script setup lang="ts">
+import { AuthMec } from "@prisma/client";
 import DropLogo from "~/components/DropLogo.vue";
 
 const enabledAuths = await $dropFetch("/api/v1/auth");
diff --git a/server/prisma/app.prisma b/server/prisma/app.prisma
index f87bf8a3..492c2654 100644
--- a/server/prisma/app.prisma
+++ b/server/prisma/app.prisma
@@ -1,7 +1,6 @@
 model ApplicationSettings {
     timestamp DateTime @id @default(now())
 
-    enabledAuthencationMechanisms AuthMec[]
     metadataProviders             String[]
 
     saveSlotCountLimit   Int   @default(5)
diff --git a/server/prisma/migrations/20250507223112_remove_authentication_option_from_applicationsettings/migration.sql b/server/prisma/migrations/20250507223112_remove_authentication_option_from_applicationsettings/migration.sql
new file mode 100644
index 00000000..0397f5f0
--- /dev/null
+++ b/server/prisma/migrations/20250507223112_remove_authentication_option_from_applicationsettings/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `enabledAuthencationMechanisms` on the `ApplicationSettings` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "ApplicationSettings" DROP COLUMN "enabledAuthencationMechanisms";
diff --git a/server/server/api/v1/admin/auth/index.get.ts b/server/server/api/v1/admin/auth/index.get.ts
index 0f8380b8..d29828ed 100644
--- a/server/server/api/v1/admin/auth/index.get.ts
+++ b/server/server/api/v1/admin/auth/index.get.ts
@@ -1,14 +1,15 @@
-import type { AuthMec } from "@prisma/client";
+import { AuthMec } from "@prisma/client";
 import aclManager from "~/server/internal/acls";
-import { applicationSettings } from "~/server/internal/config/application-configuration";
+import { enabledAuthManagers } from "~/server/plugins/04.auth-init";
 
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["auth:read"]);
   if (!allowed) throw createError({ statusCode: 403 });
 
-  const enabledMechanisms: AuthMec[] = await applicationSettings.get(
-    "enabledAuthencationMechanisms",
-  );
+  const authData = {
+    [AuthMec.Simple]: enabledAuthManagers.Simple,
+    [AuthMec.OpenID]: enabledAuthManagers.OpenID && enabledAuthManagers.OpenID.generateConfiguration(),
+  }
 
-  return enabledMechanisms;
+  return authData;
 });
diff --git a/server/server/api/v1/auth/index.get.ts b/server/server/api/v1/auth/index.get.ts
index 34e71cae..1bf368d9 100644
--- a/server/server/api/v1/auth/index.get.ts
+++ b/server/server/api/v1/auth/index.get.ts
@@ -1,6 +1,6 @@
 import { enabledAuthManagers } from "~/server/plugins/04.auth-init";
 
-export default defineEventHandler((h3) => {
+export default defineEventHandler(() => {
   const authManagers = Object.entries(enabledAuthManagers)
     .filter((e) => !!e[1])
     .map((e) => e[0]);
diff --git a/server/server/api/v1/auth/signin/simple.post.ts b/server/server/api/v1/auth/signin/simple.post.ts
index 04f3f7f8..9b54ad2d 100644
--- a/server/server/api/v1/auth/signin/simple.post.ts
+++ b/server/server/api/v1/auth/signin/simple.post.ts
@@ -16,7 +16,7 @@ const signinValidator = type({
 });
 
 export default defineEventHandler(async (h3) => {
-  if (!enabledAuthManagers.simple)
+  if (!enabledAuthManagers.Simple)
     throw createError({
       statusCode: 403,
       statusMessage: "Sign in method not enabled",
diff --git a/server/server/internal/clients/ca-store.ts b/server/server/internal/clients/ca-store.ts
index fc7f1c65..317515bc 100644
--- a/server/server/internal/clients/ca-store.ts
+++ b/server/server/internal/clients/ca-store.ts
@@ -80,6 +80,7 @@ export const dbCertificateStore = () => {
           },
         });
       } finally {
+        /* empty */
       }
     },
     async checkBlacklistCertificate(name: string): Promise<boolean> {
diff --git a/server/server/internal/config/application-configuration.ts b/server/server/internal/config/application-configuration.ts
index 0bd73fc4..13038996 100644
--- a/server/server/internal/config/application-configuration.ts
+++ b/server/server/internal/config/application-configuration.ts
@@ -1,5 +1,4 @@
 import type { ApplicationSettings } from "@prisma/client";
-import { AuthMec } from "@prisma/client";
 import prisma from "../db/database";
 
 class ApplicationConfiguration {
@@ -38,7 +37,6 @@ class ApplicationConfiguration {
   async initialiseConfiguration() {
     const initialState = await prisma.applicationSettings.create({
       data: {
-        enabledAuthencationMechanisms: [AuthMec.Simple],
         metadataProviders: [],
       },
     });
diff --git a/server/server/internal/notifications/index.ts b/server/server/internal/notifications/index.ts
index 69c95094..223367d8 100644
--- a/server/server/internal/notifications/index.ts
+++ b/server/server/internal/notifications/index.ts
@@ -57,9 +57,11 @@ class NotificationSystem {
   }
 
   async push(userId: string, notificationCreateArgs: NotificationCreateArgs) {
+    if (!notificationCreateArgs.nonce)
+      throw new Error("No nonce in notificationCreateArgs");
     const notification = await prisma.notification.upsert({
       where: {
-        nonce: notificationCreateArgs.nonce!!
+        nonce: notificationCreateArgs.nonce,
       },
       update: {
         userId: userId,
diff --git a/server/server/internal/oidc/index.ts b/server/server/internal/oidc/index.ts
index dbcf7a84..0919f8b5 100644
--- a/server/server/internal/oidc/index.ts
+++ b/server/server/internal/oidc/index.ts
@@ -1,8 +1,8 @@
 import { randomUUID } from "crypto";
 import prisma from "../db/database";
-import { AuthMec, Prisma } from "@prisma/client";
+import { AuthMec } from "@prisma/client";
 import objectHandler from "../objects";
-import { Readable } from "stream";
+import type { Readable } from "stream";
 import * as jdenticon from "jdenticon";
 
 interface OIDCWellKnown {
@@ -39,7 +39,8 @@ export class OIDCManager {
 
   private adminGroup?: string = process.env.OIDC_ADMIN_GROUP;
   private usernameClaim: keyof OIDCUserInfo =
-    (process.env.OIDC_USERNAME_CLAIM as any) ?? "preferred_username";
+    (process.env.OIDC_USERNAME_CLAIM as keyof OIDCUserInfo) ??
+    "preferred_username";
 
   private signinStateTable: { [key: string]: OIDCAuthSession } = {};
 
@@ -121,6 +122,16 @@ export class OIDCManager {
     return new OIDCManager(configuration, clientId, clientSecret, externalUrl);
   }
 
+  generateConfiguration() {
+    return {
+      authorizationUrl: this.oidcConfiguration.authorization_endpoint,
+      scopes: this.oidcConfiguration.scopes_supported.join(", "),
+      adminGroup: this.adminGroup,
+      usernameClaim: this.usernameClaim,
+      externalUrl: this.externalUrl,
+    };
+  }
+
   generateAuthSession(): OIDCAuthSession {
     const stateKey = randomUUID();
 
@@ -226,11 +237,12 @@ export class OIDCManager {
     const userId = randomUUID();
     const profilePictureId = randomUUID();
 
-    if (userinfo.picture) {
+    const picture = userinfo.picture;
+    if (picture) {
       await objectHandler.createFromSource(
         profilePictureId,
         async () =>
-          await $fetch<Readable>(userinfo.picture!!, {
+          await $fetch<Readable>(picture, {
             responseType: "stream",
           }),
         {},
@@ -269,6 +281,7 @@ export class OIDCManager {
             },
           },
         },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         credentials: creds as any, // Prisma converts this to the Json type for us
       },
       include: {
diff --git a/server/server/plugins/03.metadata-init.ts b/server/server/plugins/03.metadata-init.ts
index dbac7deb..b3201847 100644
--- a/server/server/plugins/03.metadata-init.ts
+++ b/server/server/plugins/03.metadata-init.ts
@@ -27,7 +27,6 @@ export default defineNitroPlugin(async (_nitro) => {
     }
   }
 
-
   // Add providers based on their position in the application settings
   const configuredProviderList =
     await applicationSettings.get("metadataProviders");
diff --git a/server/server/plugins/04.auth-init.ts b/server/server/plugins/04.auth-init.ts
index 7369de23..c712a967 100644
--- a/server/server/plugins/04.auth-init.ts
+++ b/server/server/plugins/04.auth-init.ts
@@ -1,24 +1,25 @@
+import { AuthMec } from "@prisma/client";
 import { OIDCManager } from "../internal/oidc";
 
 export const enabledAuthManagers: {
-  simple: boolean;
-  oidc: OIDCManager | undefined;
+  [AuthMec.Simple]: boolean;
+  [AuthMec.OpenID]: OIDCManager | undefined;
 } = {
-  simple: false,
-  oidc: undefined,
+  [AuthMec.Simple]: false,
+  [AuthMec.OpenID]: undefined,
 };
 
 const initFunctions: {
   [K in keyof typeof enabledAuthManagers]: () => Promise<unknown>;
 } = {
-  oidc: OIDCManager.prototype.create,
-  simple: async () => {
+  [AuthMec.OpenID]: OIDCManager.prototype.create,
+  [AuthMec.Simple]: async () => {
     const disabled = process.env.DISABLE_SIMPLE_AUTH as string | undefined;
     return !disabled;
   },
 };
 
-export default defineNitroPlugin(async (_nitro) => {
+export default defineNitroPlugin(async () => {
   for (const [key, init] of Object.entries(initFunctions)) {
     try {
       const object = await init();
@@ -32,7 +33,7 @@ export default defineNitroPlugin(async (_nitro) => {
   }
 
   // Add every other auth mechanism here, and fall back to simple if none of them are enabled
-  if (!enabledAuthManagers.oidc) {
-    enabledAuthManagers.simple = true;
+  if (!enabledAuthManagers[AuthMec.OpenID]) {
+    enabledAuthManagers[AuthMec.Simple] = true;
   }
 });
diff --git a/server/server/routes/auth/callback/oidc.get.ts b/server/server/routes/auth/callback/oidc.get.ts
index 8d2d5ad3..e2a6854c 100644
--- a/server/server/routes/auth/callback/oidc.get.ts
+++ b/server/server/routes/auth/callback/oidc.get.ts
@@ -2,9 +2,9 @@ import sessionHandler from "~/server/internal/session";
 import { enabledAuthManagers } from "~/server/plugins/04.auth-init";
 
 export default defineEventHandler(async (h3) => {
-  if (!enabledAuthManagers.oidc) return sendRedirect(h3, "/auth/signin");
+  if (!enabledAuthManagers.OpenID) return sendRedirect(h3, "/auth/signin");
 
-  const manager = enabledAuthManagers.oidc;
+  const manager = enabledAuthManagers.OpenID;
 
   const query = getQuery(h3);
   const code = query.code?.toString();
@@ -29,7 +29,6 @@ export default defineEventHandler(async (h3) => {
       statusMessage: `Failed to sign in: "${user}". Please try again.`,
     });
 
-
   await sessionHandler.signin(h3, user.id, true);
 
   return sendRedirect(h3, "/");
diff --git a/server/server/routes/auth/oidc.get.ts b/server/server/routes/auth/oidc.get.ts
index dda26d68..be3cf947 100644
--- a/server/server/routes/auth/oidc.get.ts
+++ b/server/server/routes/auth/oidc.get.ts
@@ -1,9 +1,9 @@
 import { enabledAuthManagers } from "~/server/plugins/04.auth-init";
 
 export default defineEventHandler((h3) => {
-  if (!enabledAuthManagers.oidc) return sendRedirect(h3, "/auth/signin");
+  if (!enabledAuthManagers.OpenID) return sendRedirect(h3, "/auth/signin");
 
-  const manager = enabledAuthManagers.oidc;
+  const manager = enabledAuthManagers.OpenID;
   const { redirectUrl } = manager.generateAuthSession();
 
   return sendRedirect(h3, redirectUrl);

From 6c2778592eb433b9cacf2dc446e4241a5f7784b5 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Thu, 8 May 2025 15:50:29 +1000
Subject: [PATCH 10/10] fix: convert socket sessions to cacheHandler

---
 server/server/api/v1/notifications/ws.get.ts | 10 +++++-----
 server/server/api/v1/task/index.get.ts       | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/server/api/v1/notifications/ws.get.ts b/server/server/api/v1/notifications/ws.get.ts
index 58db068f..0bb24847 100644
--- a/server/server/api/v1/notifications/ws.get.ts
+++ b/server/server/api/v1/notifications/ws.get.ts
@@ -1,9 +1,9 @@
 import notificationSystem from "~/server/internal/notifications";
 import aclManager from "~/server/internal/acls";
+import cacheHandler from "~/server/internal/cache";
 
-// TODO add web socket sessions for horizontal scaling
 // Peer ID to user ID
-const socketSessions = new Map<string, string>();
+const socketSessions = cacheHandler.createCache<string>("notificationSocketSessions");
 
 export default defineWebSocketHandler({
   async open(peer) {
@@ -23,7 +23,7 @@ export default defineWebSocketHandler({
       userIds.push("system");
     }
 
-    socketSessions.set(peer.id, userId);
+    await socketSessions.set(peer.id, userId);
 
     for (const listenUserId of userIds) {
       notificationSystem.listen(listenUserId, peer.id, (notification) => {
@@ -32,7 +32,7 @@ export default defineWebSocketHandler({
     }
   },
   async close(peer, _details) {
-    const userId = socketSessions.get(peer.id);
+    const userId = await socketSessions.get(peer.id);
     if (!userId) {
       console.log(`skipping websocket close for ${peer.id}`);
       return;
@@ -40,6 +40,6 @@ export default defineWebSocketHandler({
 
     notificationSystem.unlisten(userId, peer.id);
     notificationSystem.unlisten("system", peer.id); // In case we were listening as 'system'
-    socketSessions.delete(peer.id);
+    await socketSessions.remove(peer.id);
   },
 });
diff --git a/server/server/api/v1/task/index.get.ts b/server/server/api/v1/task/index.get.ts
index 6f25a531..8770e227 100644
--- a/server/server/api/v1/task/index.get.ts
+++ b/server/server/api/v1/task/index.get.ts
@@ -1,9 +1,9 @@
 import taskHandler from "~/server/internal/tasks";
 import type { MinimumRequestObject } from "~/server/h3";
+import cacheHandler from "~/server/internal/cache";
 
-// TODO add web socket sessions for horizontal scaling
 // ID to admin
-const socketHeaders = new Map<string, MinimumRequestObject>();
+const socketHeaders = cacheHandler.createCache<MinimumRequestObject>("taskSocketHeaders");
 
 export default defineWebSocketHandler({
   async open(peer) {
@@ -13,15 +13,15 @@ export default defineWebSocketHandler({
       return;
     }
 
-    socketHeaders.set(peer.id, {
+    await socketHeaders.set(peer.id, {
       headers: request.headers ?? new Headers(),
     });
     peer.send(`connect`);
   },
-  message(peer, message) {
+  async message(peer, message) {
     if (!peer.id) return;
-    const headers = socketHeaders.get(peer.id);
-    if (headers === undefined) return;
+    const headers = await socketHeaders.get(peer.id);
+    if (!headers) return;
     const text = message.text();
     if (text.startsWith("connect/")) {
       const id = text.substring("connect/".length);
@@ -29,10 +29,10 @@ export default defineWebSocketHandler({
       return;
     }
   },
-  close(peer, _details) {
+  async close(peer, _details) {
     if (!peer.id) return;
     if (!socketHeaders.has(peer.id)) return;
-    socketHeaders.delete(peer.id);
+    await socketHeaders.remove(peer.id);
 
     taskHandler.disconnectAll(peer.id);
   },