Skip to content

NGAFID API Start Statistics and User API Routes Port #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: aidan_cu/main_july2025
Choose a base branch
from
Draft

NGAFID API Start Statistics and User API Routes Port #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb46bd4
ACcount routes stubbed class
AarC10 Oct 7, 2025
ff376db
delete email unsubscribe
AarC10 Oct 7, 2025
f40c27f
doc
AarC10 Oct 7, 2025
d335d2f
notes on porting
AarC10 Oct 7, 2025
be72e9f
Merge branch 'aidan_cu/main_july2025' into aaron/feature/AccountRoutes
AarC10 Nov 4, 2025
a0416c2
Routes for start status and stats
AarC10 Nov 4, 2025
ac31e05
boostrapfor start api
AarC10 Nov 4, 2025
eb30a93
Fix null assertion with id in user routes deleteEmailUnsubscribe
AarC10 Nov 4, 2025
7b06b0a
Formatting
AarC10 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 49 additions & 92 deletions ngafid-www/src/main/java/org/ngafid/www/JavalinWebServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.ngafid.core.Database;
import org.ngafid.core.accounts.FleetAccess;

import org.ngafid.core.accounts.User;
import org.ngafid.www.routes.*;
import org.ngafid.www.routes.api.*;
import org.ngafid.www.routes.Role;

import java.io.File;
import java.sql.Connection;
Expand All @@ -29,36 +27,6 @@
import java.util.Set;
import java.util.logging.Logger;

import org.eclipse.jetty.server.session.DatabaseAdaptor;
import org.eclipse.jetty.server.session.DefaultSessionCache;
import org.eclipse.jetty.server.session.FileSessionDataStore;
import org.eclipse.jetty.server.session.JDBCSessionDataStore;
import org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory;
import org.eclipse.jetty.server.session.SessionCache;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.ngafid.core.Database;
import org.ngafid.core.accounts.User;
import org.ngafid.www.routes.AccountJavalinRoutes;
import org.ngafid.www.routes.AircraftFleetTailsJavalinRoutes;
import org.ngafid.www.routes.AirsyncJavalinRoutes;
import org.ngafid.www.routes.AnalysisJavalinRoutes;
import org.ngafid.www.routes.BugReportJavalinRoutes;
import org.ngafid.www.routes.CesiumDataJavalinRoutes;
import org.ngafid.www.routes.DataJavalinRoutes;
import org.ngafid.www.routes.DoubleSeriesJavalinRoutes;
import org.ngafid.www.routes.EventJavalinRoutes;
import org.ngafid.www.routes.FlightsJavalinRoutes;
import org.ngafid.www.routes.ImportUploadJavalinRoutes;

import org.ngafid.www.routes.StartPageJavalinRoutes;
import org.ngafid.www.routes.StatisticsJavalinRoutes;
import org.ngafid.www.routes.StatusJavalinRoutes;

import io.javalin.Javalin;
import io.javalin.http.staticfiles.Location;
import io.javalin.json.JavalinGson;

public class JavalinWebServer extends WebServer {
private static final Logger LOG = Logger.getLogger(JavalinWebServer.class.getName());
private Javalin app;
Expand All @@ -68,6 +36,47 @@ public JavalinWebServer(int port, String staticFilesLocation) {
LOG.info("Using static files location: " + staticFilesLocation);
}

private static SessionHandler createSessionHandler() {
SessionHandler sessionHandler = new SessionHandler();
SessionCache sessionCache = new DefaultSessionCache(sessionHandler);
// sessionCache.setSessionDataStore(createFileSessionDataStore());
sessionCache.setSessionDataStore(Objects.requireNonNull(createJDBCDataStore()).getSessionDataStore(sessionHandler));
sessionHandler.setSessionCache(sessionCache);
sessionHandler.setHttpOnly(true);
return sessionHandler;
}

private static FileSessionDataStore createFileSessionDataStore() {
FileSessionDataStore fileSessionDataStore = new FileSessionDataStore();
File baseDir = new File(System.getProperty("java.io.tmpdir"));
File storeDir = new File(baseDir, "javalin-session-store");
storeDir.mkdir();
fileSessionDataStore.setStoreDir(storeDir);
return fileSessionDataStore;
}

private static JDBCSessionDataStoreFactory createJDBCDataStore() {
DatabaseAdaptor databaseAdaptor = new DatabaseAdaptor();

try (Connection connection = Database.getConnection()) {
DatabaseMetaData metaData = connection.getMetaData();
databaseAdaptor.setDriverInfo(metaData.getDriverName(), metaData.getURL());
databaseAdaptor.setDatasource(Database.getDataSource());

JDBCSessionDataStore.SessionTableSchema schema = new JDBCSessionDataStore.SessionTableSchema();
schema.setTableName("jetty_sessions");

JDBCSessionDataStoreFactory jdbcSessionDataStoreFactory = new JDBCSessionDataStoreFactory();
jdbcSessionDataStoreFactory.setDatabaseAdaptor(databaseAdaptor);
jdbcSessionDataStoreFactory.setSessionTableSchema(schema);

return jdbcSessionDataStoreFactory;
} catch (SQLException e) {
LOG.severe("Failed to get database connection for persistent logins.");
}
return null;
}

public void start() {
app.start();
}
Expand All @@ -90,25 +99,18 @@ protected void preInitialize() {
UploadRoutes.INSTANCE.bind(config);
UserRoutes.INSTANCE.bind(config);

StartApiRoutes.INSTANCE.bind(config);
StatisticsApiRoutes.INSTANCE.bind(config);
StatusApiRoutes.INSTANCE.bind(config);

});

}

private void configureSwagger(JavalinConfig config) {
final String deprecatedDocsPath = "/api/openapi.json"; // by default it's /openapi
config.registerPlugin(new OpenApiPlugin(openApiConfig -> {
openApiConfig
.withDocumentationPath("/openapi.json")
.withDefinitionConfiguration((version, openApiDefinition) ->
openApiDefinition
.withServer(openApiServer ->
openApiServer
.description("Server description goes here")
.url("http://localhost:{port}/{basePath}")
.variable("port", "Server's port", "8111", "8112", "7070")
.variable("/swagger", "Base path of the server", "", "", "v1")
)
);
openApiConfig.withDocumentationPath("/openapi.json").withDefinitionConfiguration((version, openApiDefinition) -> openApiDefinition.withServer(openApiServer -> openApiServer.description("Server description goes here").url("http://localhost:{port}/{basePath}").variable("port", "Server's port", "8111", "8112", "7070").variable("/swagger", "Base path of the server", "", "", "v1")));
}));

config.registerPlugin(new SwaggerPlugin(swaggerConfiguration -> {
Expand Down Expand Up @@ -203,8 +205,7 @@ protected void configureAuthChecks() {
String accessType = user.getFleetAccessType();

if (roles.contains(Role.MANAGER_ONLY)) {
if (!accessType.equals(FleetAccess.MANAGER))
throw new UnauthorizedResponse("Manager access is required.");
if (!accessType.equals(FleetAccess.MANAGER)) throw new UnauthorizedResponse("Manager access is required.");
}

if (roles.contains(Role.UPLOADER_ONLY)) {
Expand All @@ -213,8 +214,7 @@ protected void configureAuthChecks() {
}

if (roles.contains(Role.ADMIN_ONLY)) {
if (!user.isAdmin())
throw new UnauthorizedResponse("Admin access is required.");
if (!user.isAdmin()) throw new UnauthorizedResponse("Admin access is required.");
}
}
});
Expand Down Expand Up @@ -270,49 +270,6 @@ protected void configureExceptions() {

@Override
protected void configurePersistentSessions() {
app.unsafeConfig().jetty.modifyServletContextHandler(
handler -> handler.setSessionHandler(createSessionHandler())
);
}

private static SessionHandler createSessionHandler() {
SessionHandler sessionHandler = new SessionHandler();
SessionCache sessionCache = new DefaultSessionCache(sessionHandler);
// sessionCache.setSessionDataStore(createFileSessionDataStore());
sessionCache.setSessionDataStore(Objects.requireNonNull(createJDBCDataStore()).getSessionDataStore(sessionHandler));
sessionHandler.setSessionCache(sessionCache);
sessionHandler.setHttpOnly(true);
return sessionHandler;
}

private static FileSessionDataStore createFileSessionDataStore() {
FileSessionDataStore fileSessionDataStore = new FileSessionDataStore();
File baseDir = new File(System.getProperty("java.io.tmpdir"));
File storeDir = new File(baseDir, "javalin-session-store");
storeDir.mkdir();
fileSessionDataStore.setStoreDir(storeDir);
return fileSessionDataStore;
}

private static JDBCSessionDataStoreFactory createJDBCDataStore() {
DatabaseAdaptor databaseAdaptor = new DatabaseAdaptor();

try (Connection connection = Database.getConnection()) {
DatabaseMetaData metaData = connection.getMetaData();
databaseAdaptor.setDriverInfo(metaData.getDriverName(), metaData.getURL());
databaseAdaptor.setDatasource(Database.getDataSource());

JDBCSessionDataStore.SessionTableSchema schema = new JDBCSessionDataStore.SessionTableSchema();
schema.setTableName("jetty_sessions");

JDBCSessionDataStoreFactory jdbcSessionDataStoreFactory = new JDBCSessionDataStoreFactory();
jdbcSessionDataStoreFactory.setDatabaseAdaptor(databaseAdaptor);
jdbcSessionDataStoreFactory.setSessionTableSchema(schema);

return jdbcSessionDataStoreFactory;
} catch (SQLException e) {
LOG.severe("Failed to get database connection for persistent logins.");
}
return null;
app.unsafeConfig().jetty.modifyServletContextHandler(handler -> handler.setSessionHandler(createSessionHandler()));
}
}
2 changes: 0 additions & 2 deletions ngafid-www/src/main/java/org/ngafid/www/routes/AccountJavalinRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import java.util.*;
import java.util.logging.Logger;

import org.apache.kafka.streams.processor.ConnectedStoreProvider;

import static org.ngafid.www.WebServer.gson;

public class AccountJavalinRoutes {
Expand Down
Loading