Add a nice type import in getRouteDescriptions, update security map in openapi

2 files changed, 15 insertions, 10 deletions

diff --git a/scripts/openapi.js b/scripts/openapi.js

index 64c7babb..91cc7d26 100644
--- a/scripts/openapi.js
+++ b/scripts/openapi.js
@@ -25,7 +25,6 @@ require("module-alias/register");
 const getRouteDescriptions = require("./util/getRouteDescriptions");
 const path = require("path");
 const fs = require("fs");
-const { NO_AUTHORIZATION_ROUTES } = require("../dist/api/middlewares/Authentication");
 const { bgRedBright, bgYellow, black, bgYellowBright, blue, white } = require("picocolors");
 
 const openapiPath = path.join(__dirname, "..", "assets", "openapi.json");
@@ -119,6 +118,12 @@ function getTag(key) {
     return key.match(/\/([\w-]+)/)[1];
 }
 
+const authTypes = {
+    required: [{ bearer: [] }],
+    optional: [{ bearer: [] }, {}],
+    never: [{}],
+};
+
 function apiRoutes(missingRoutes) {
     const routes = getRouteDescriptions();
 
@@ -141,14 +146,7 @@ function apiRoutes(missingRoutes) {
         obj["x-permission-required"] = route.permission;
         obj["x-fires-event"] = route.event;
 
-        if (
-            !NO_AUTHORIZATION_ROUTES.some((x) => {
-                if (typeof x === "string") return (method.toUpperCase() + " " + path).startsWith(x);
-                return x.test(method.toUpperCase() + " " + path);
-            })
-        ) {
-            obj.security = [{ bearer: [] }];
-        }
+        obj.security = authTypes[route.authentication ?? "required"];
 
         if (route.description) obj.description = route.description;
         if (route.summary) obj.summary = route.summary;
diff --git a/scripts/util/getRouteDescriptions.js b/scripts/util/getRouteDescriptions.js

index 7ba0ec77..a89c4e27 100644
--- a/scripts/util/getRouteDescriptions.js
+++ b/scripts/util/getRouteDescriptions.js
@@ -1,10 +1,17 @@
 const express = require("express");
 const path = require("path");
 const { traverseDirectory } = require("lambert-server");
-const RouteUtility = require("../../dist/api/util/handlers/route.js");
+const RouteUtility = require("../../dist/api/middlewares/Route.js");
 const { greenBright, yellowBright, blueBright, redBright, underline, bgYellow, black } = require("picocolors");
 
 const methods = ["get", "post", "put", "delete", "patch"];
+/**
+ * @import { RouteOptions } from "../../src/api/middlewares/Route";
+ */
+/**
+ * Discovered routes
+ * @type {Map<string, RouteOptions>}
+ */
 const routes = new Map();
 let currentFile = "";
 let currentPath = "";