Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 25 additions & 24 deletions bot/src/main/java/de/chojo/gamejam/api/Api.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,34 +57,36 @@ public Api(Configuration configuration, ShardManager shardManager, Guilds guilds

private void build() {
app = Javalin.create(config -> {
config.useVirtualThreads = true;
config.concurrency.useVirtualThreads = true;
config.requestLogger.http((ctx, executionTimeMs) -> {
log.debug("{}: {} in {}ms\nHeaders:\n{}\nBody:\n{}",
ctx.method(), ctx.path(), executionTimeMs,
headers(ctx),
ctx.body().substring(0, Math.min(100, ctx.body().length())));
});
config.router.apiBuilder(this::routes);
config.routes.apiBuilder(this::routes);
config.registerPlugin(openApi());
config.registerPlugin(swagger());
}).start(configuration.api().host(), configuration.api().port());

app.exception(InterruptException.class, (exception, ctx) -> {
ctx.status(exception.status()).result(exception.getMessage());
});

app.beforeMatched(ctx -> {
for (String path : unauthorized) {
if(ctx.path().startsWith(path)) return;
}

var token = ctx.req().getHeader("authorization");
if (token == null) {
throw new UnauthorizedResponse();
} else if (!token.equals(configuration.api().token())) {
throw new UnauthorizedResponse();
}
});
config.routes.exception(InterruptException.class, (exception, ctx) -> {
ctx.status(exception.status()).result(exception.getMessage());
});

config.routes.beforeMatched(ctx -> {
for (String path : unauthorized) {
if(ctx.path().startsWith(path)) return;
}

var token = ctx.req().getHeader("authorization");
if (token == null) {
throw new UnauthorizedResponse();
} else if (!token.equals(configuration.api().token())) {
throw new UnauthorizedResponse();
}
});

}).start(configuration.api().host(), configuration.api().port());
}

private void routes() {
Expand All @@ -111,23 +113,22 @@ private OpenApiPlugin openApi() {
return new OpenApiPlugin(config ->
config.withDocumentationPath("/api/openapi.json")
.withDefinitionConfiguration((version, definition) ->
definition.withInfo(info ->
definition.info(info ->
info.description("Plugin Jam Bot")
.license("AGPL-3.0")
)
.withServer(server ->
.server(server ->
server.description("Lyna Backend")
.url(configuration.api().url()))
.withSecurity(security ->
security.withApiKeyAuth("Authorization", "Authorization"))
.withApiKeyAuth("Authorization", "Authorization")
)
);
}

private SwaggerPlugin swagger() {
return new SwaggerPlugin(conf -> {
conf.setUiPath("/api/swagger");
conf.setDocumentationPath("/api/openapi.json");
conf.withUiPath("/api/swagger");
conf.withDocumentationPath("/api/openapi.json");
});
}

Expand Down
4 changes: 2 additions & 2 deletions plugin-paper/src/main/java/de/chojo/pluginjam/api/Api.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ private void ignite() {
var classLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(PluginJam.class.getClassLoader());
javalin = Javalin.create(config -> {
config.useVirtualThreads = true;
config.router.apiBuilder(this::routes);
config.concurrency.useVirtualThreads = true;
config.routes.apiBuilder(this::routes);
});
javalin.start("0.0.0.0", Integer.parseInt(System.getProperty("javalin.port", "30000")));
Thread.currentThread().setContextClassLoader(classLoader);
Expand Down
4 changes: 2 additions & 2 deletions plugin-velocity/src/main/java/de/chojo/pluginjam/web/Api.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ private void ignite() {
var classLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(PluginJam.class.getClassLoader());
javalin = Javalin.create(config -> {
config.useVirtualThreads = true;
config.router.apiBuilder(this::routes);
config.concurrency.useVirtualThreads = true;
config.routes.apiBuilder(this::routes);
});
int port = Integer.parseInt(System.getProperty("javalin.port", "30000"));
javalin.start("0.0.0.0", port);
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencyResolutionManagement {
bundle("logging", listOf("slf4j", "log4j-core", "log4j-slf4j2"))


version("javalin", "6.7.0")
version("javalin", "7.0.0")
library("javalin-core", "io.javalin", "javalin").versionRef("javalin")
library("javalin-bundle", "io.javalin", "javalin-bundle").versionRef("javalin")
library("javalin-annotation", "io.javalin.community.openapi", "openapi-annotation-processor").versionRef("javalin")
Expand Down