Overhauled Website internals, cleaned everything up.

Author: RealMangorage

src/main/java/module-info.java

@@ -13,6 +13,8 @@
 
     // Files
     opens templates;
+    opens templates.general;
+
 
     // TODO: Deal with it
     exports org.mangorage.mangobotsite.website.servlet.data;
@@ -22,8 +24,6 @@
 
     exports org.mangorage.mangobotsite;
 
-    exports org.mangorage.mangobotsite.website.file;
-
     exports org.mangorage.mangobotsite.website.filters to org.eclipse.jetty.server;
     exports org.mangorage.mangobotsite.website.servlet to org.eclipse.jetty.server;
 
@@ -35,6 +35,7 @@
 
     opens org.mangorage.mangobotsite.website.servlet to freemarker, com.google.gson;
 
+
     provides org.mangorage.mangobotcore.api.plugin.v1.Plugin with org.mangorage.mangobotsite.MangoBotSite;
     uses org.mangorage.mangobotcore.api.plugin.v1.Plugin;
 }

src/main/java/org/mangorage/mangobotsite/Helper.java

@@ -6,24 +6,15 @@
 import org.mangorage.mangobotcore.api.plugin.v1.PluginManager;
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 import org.mangorage.mangobotsite.website.WebServer;
-import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.util.ObjectMap;
-import org.mangorage.mangobotsite.website.util.WebConstants;
-
-import java.nio.file.Path;
 
 @MangoBotPlugin(id = MangoBotSite.ID)
 public final class MangoBotSite implements Plugin {
     public static final String ID = "mangobotsite";
 
-    private final FileUploadManager fileUploadManager = new FileUploadManager(Path.of("webpage-root/uploads"));
-
     public MangoBotSite() {
     }
 
-    public FileUploadManager getFileUploadManager() {
-        return fileUploadManager;
-    }
 
     @Override
     public String getId() {
@@ -37,7 +28,6 @@ public void load() {
         ObjectMap objectMap = new ObjectMap();
         objectMap.put("trickManager", pl.getTrickManager());
         objectMap.put("jda", pl.getJDA());
-        objectMap.put(WebConstants.FILE_MANAGER, fileUploadManager);
 
         WebServer.startWebServerSafely(objectMap);
     }

src/main/java/org/mangorage/mangobotsite/MangoBotSite.java

@@ -1,9 +1,6 @@
 package org.mangorage.mangobotsite.website;
 
-
-
 import jakarta.servlet.DispatcherType;
-import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.HandlerCollection;
@@ -12,8 +9,8 @@
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.jetbrains.annotations.NotNull;
+import org.mangorage.mangobotcore.api.plugin.MangoBotCore;
 import org.mangorage.mangobotcore.api.util.log.LogHelper;
-import org.mangorage.mangobotsite.Helper;
 import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
 import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
 import org.mangorage.mangobotsite.website.servlet.CommandsServlet;
@@ -23,9 +20,7 @@
 import org.mangorage.mangobotsite.website.util.ResolveString;
 import org.mangorage.mangobotsite.website.util.ServletContextHandlerBuilder;
 import org.mangorage.mangobotsite.website.util.WebConstants;
-
 import java.util.EnumSet;
-import java.util.Set;
 
 public final class WebServer {
     public static final ResolveString WEBPAGE_INTERNAL = new ResolveString("webpage-internal");
@@ -49,23 +44,17 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
 
         var builder = configureBuilders(objectMap);
         var contextHandler = builder.getServletContextHandler();
-        var securityHandler = builder.getConstraintSecurityHandler();
 
         // Combine the handlers (file, jar resource handlers, and security)
         HandlerCollection handlers = new HandlerCollection();
         handlers.addHandler(configureInternalResourceHandler());
         handlers.addHandler(configureExternalResourceHandler());
         handlers.addHandler(contextHandler);
 
-        securityHandler.setHandler(handlers);
-        server.setHandler(securityHandler);
-
 
         ServerConnector connector = getServerConnector(server);
         server.addConnector(connector);
-
-        objectMap.put(WebConstants.LOGIN_SERVICE, securityHandler);
-        objectMap.put("auth", securityHandler.getAuthenticator());
+        server.setHandler(handlers);
 
         server.start();
         LogHelper.info("Webserver Started");
@@ -95,33 +84,23 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
         builder
                 .setContextPath("/")
                 .setResourceBase(WEBPAGE_PAGE.value())
-                .dynamic(h -> {
-                    h.setErrorHandler(new DefaultErrorHandler());
-                })
 
+                .dynamic(handler -> {
+                    handler.setErrorHandler(new DefaultErrorHandler());
+                })
 
                 .addHttpServlet(HomeServlet.class, "/home")
-                .addServlet(TricksServlet.class, "/tricks")
-                .addServlet(CommandsServlet.class, "/commands")
+                .addHttpServlet(TricksServlet.class, "/tricks")
+                .addHttpServlet(CommandsServlet.class, "/commands")
 
                 .setAttribute(WebConstants.WEB_OBJECT_ID, objectMap)
-                .addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST))
-                .configureLoginBuilder(security -> {
-                    security
-                            .setFullValidate(true)
-                            .setAuthenticator(new BasicAuthenticator())
-                            .addUser("admin", "pass", Set.of("admin"))
-                            .lock(
-                                Set.of("admin"),
-                                "/testAuth"
-                            );
-                });
+                .addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
 
         return builder;
     }
 
     private static @NotNull ServerConnector getServerConnector(Server server) {
-        if (Helper.isDevMode()) {
+        if (!MangoBotCore.isDevMode()) {
             SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
             sslContextFactory.setTrustAll(true);