fix: remove console.logs

Author: virtual-designer

blazebuild/bun.lockb

@@ -53,29 +53,28 @@ export default async function RequireAuthMiddleware(
     try {
         const info = jwt.verify(token, process.env.JWT_SECRET!, {
             issuer: process.env.JWT_ISSUER ?? "SudoBot",
-            subject: "Temporary API token for authenticated user",
             complete: true
         });
 
         const payload = info.payload as {
-            userId: number;
+            id: number;
         };
 
         application.logger.debug(info, payload);
 
-        if (!payload?.userId) {
+        if (!payload?.id) {
             throw new Error("ID not found");
         }
 
         if (!fetchUser) {
-            request.userId = payload.userId;
+            request.userId = payload.id;
             next();
             return;
         }
 
         const user = await application.prisma.user.findFirst({
             where: {
-                id: payload.userId,
+                id: payload.id,
                 token
             }
         });

src/framework/typescript/api/middleware/RequireAuthMiddleware.ts

@@ -0,0 +1,101 @@
+import { Action } from "@framework/api/decorators/Action";
+import { RequireAuth } from "@framework/api/decorators/RequireAuth";
+import { Validate } from "@framework/api/decorators/Validate";
+import Controller from "@framework/api/http/Controller";
+import type Request from "@framework/api/http/Request";
+import { Inject } from "@framework/container/Inject";
+import { GuildConfigSchema } from "@main/schemas/GuildConfigSchema";
+import type ConfigurationManager from "@main/services/ConfigurationManager";
+import { ZodError, z } from "zod";
+
+class ConfigController extends Controller {
+    @Inject("configManager")
+    private readonly configManager!: ConfigurationManager;
+
+    private _saveQueueTimeout?: ReturnType<typeof setTimeout>;
+
+    @Action("GET", "/guilds/:id/config")
+    @RequireAuth(true)
+    public async view(request: Request) {
+        const { id } = request.params;
+        const guild = this.application.client.guilds.cache.get(id);
+
+        if (!guild) {
+            return this.error(404, {
+                message: "Guild not found."
+            });
+        }
+
+        if (!request.user?.guilds.includes(guild.id)) {
+            return this.error(403, {
+                message: "You do not have permission to view this guild's configuration."
+            });
+        }
+
+        return this.configManager.getOrDefault(guild.id);
+    }
+
+    @Action("PATCH", "/guilds/:id/config")
+    @RequireAuth(true)
+    @Validate(z.record(z.string(), z.any()))
+    public async update(request: Request) {
+        const { id } = request.params;
+        const guild = this.application.client.guilds.cache.get(id);
+
+        if (!guild) {
+            return this.error(404, {
+                success: false,
+                message: "Guild not found."
+            });
+        }
+
+        if (!request.user?.guilds.includes(guild.id)) {
+            return this.error(403, {
+                success: false,
+                message: "You do not have permission to update this guild's configuration."
+            });
+        }
+
+        const config = request.parsedBody;
+
+        if (!config) {
+            return this.error(400, {
+                success: false,
+                message: "No configuration provided."
+            });
+        }
+
+        if (typeof config !== "object" || !config) {
+            return this.error(400, {
+                success: false,
+                message: "Invalid configuration provided."
+            });
+        }
+
+        try {
+            this.configManager.config[guild.id] = GuildConfigSchema.parse({
+                ...this.configManager.config[guild.id],
+                ...config
+            });
+        } catch (error) {
+            return this.error(400, {
+                success: false,
+                message: "Invalid configuration provided.",
+                errors: error instanceof ZodError ? error.errors : undefined
+            });
+        }
+
+        this._saveQueueTimeout ??= setTimeout(() => {
+            this.configManager.write({ guild: true, system: false });
+            this.configManager.load();
+            this._saveQueueTimeout = undefined;
+        }, 10_000);
+
+        return {
+            success: true,
+            message: "Successfully updated the guild configuration."
+        };
+    }
+}
+
+export default ConfigController;

src/main/typescript/api/controllers/ConfigController.ts

@@ -109,11 +109,7 @@ class VerificationController extends Controller {
                 throw new Error("Invalid token response");
             }
 
-            // FIXME: Remove this
-            console.log(oauthData);
-
             const { access_token, token_type } = oauthData as Record<string, string>;
-
             const userResponse = await undici.request("https://discord.com/api/users/@me", {
                 method: "GET",
                 headers: {

src/main/typescript/api/controllers/VerificationController.ts

@@ -190,6 +190,10 @@ export default class ConfigurationManager
         return this.config[guildId] as T | undefined;
     }
 
+    public getOrDefault<T extends GuildConfig = GuildConfig>(guildId: Snowflake): T {
+        return this.config[guildId] as T ?? this.guildConfigSchema.parse({});
+    }
+
     public set(guildId: Snowflake, value: GuildConfig) {
         this.config[guildId] = value;
     }