Gallardo7761/miarma-backend-vertx
Archived
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases 2 Activity

bump: backlib and all microservices to v2.0, add: decoupled auth from identity using new Credential Entity model, still ongoing changes...

Browse Source
This commit is contained in:
Jose
2025-12-21 06:03:45 +01:00
parent 18c2f0f00b
commit 5136a67fba
105 changed files with 1506 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
microservices/miarmacraft/pom.xml
View File

@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.miarma.api</groupId>
<artifactId>miarmacraft</artifactId>
<version>1.2.1</version>
<artifactId>minecraft</artifactId>
<version>2.0.0</version>
<properties>
<maven.compiler.source>23</maven.compiler.source>
@@ -20,7 +20,7 @@
<dependency>
<groupId>net.miarma.api</groupId>
<artifactId>backlib</artifactId>
<version>1.2.1</version>
<version>2.0.0</version>
</dependency>
</dependencies>

5
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/handlers/ModLogicHandler.java
View File

@@ -1,5 +0,0 @@
package net.miarma.api.microservices.miarmacraft.handlers;
public class ModLogicHandler {
}

4
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/dao/ModDAO.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/dao/ModDAO.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.dao;
package net.miarma.api.microservices.minecraft.dao;
import io.vertx.core.Future;
import io.vertx.core.Promise;
@@ -8,7 +8,7 @@ import net.miarma.api.backlib.db.DatabaseManager;
import net.miarma.api.backlib.db.QueryBuilder;
import net.miarma.api.backlib.http.QueryFilters;
import net.miarma.api.backlib.http.QueryParams;
import net.miarma.api.microservices.miarmacraft.entities.ModEntity;
import net.miarma.api.microservices.minecraft.entities.ModEntity;
import java.util.List;
import java.util.Map;

4
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/dao/PlayerDAO.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/dao/PlayerDAO.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.dao;
package net.miarma.api.microservices.minecraft.dao;
import io.vertx.core.Future;
import io.vertx.core.Promise;
@@ -8,7 +8,7 @@ import net.miarma.api.backlib.db.DatabaseManager;
import net.miarma.api.backlib.db.QueryBuilder;
import net.miarma.api.backlib.http.QueryFilters;
import net.miarma.api.backlib.http.QueryParams;
import net.miarma.api.microservices.miarmacraft.entities.PlayerEntity;
import net.miarma.api.microservices.minecraft.entities.PlayerEntity;
import java.util.List;
import java.util.Map;

4
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/dao/UserMetadataDAO.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/dao/UserMetadataDAO.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.dao;
package net.miarma.api.microservices.minecraft.dao;
import io.vertx.core.Future;
import io.vertx.core.Promise;
@@ -8,7 +8,7 @@ import net.miarma.api.backlib.db.DatabaseManager;
import net.miarma.api.backlib.db.QueryBuilder;
import net.miarma.api.backlib.http.QueryFilters;
import net.miarma.api.backlib.http.QueryParams;
import net.miarma.api.microservices.miarmacraft.entities.UserMetadataEntity;
import net.miarma.api.microservices.minecraft.entities.UserMetadataEntity;
import java.util.List;
import java.util.Map;

2
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/entities/ModEntity.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/entities/ModEntity.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.entities;
package net.miarma.api.microservices.minecraft.entities;
import io.vertx.sqlclient.Row;
import net.miarma.api.backlib.Constants.MMCModStatus;

2
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/entities/PlayerEntity.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/entities/PlayerEntity.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.entities;
package net.miarma.api.microservices.minecraft.entities;
import java.time.LocalDateTime;

2
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/entities/UserMetadataEntity.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/entities/UserMetadataEntity.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.entities;
package net.miarma.api.microservices.minecraft.entities;
import io.vertx.sqlclient.Row;
import net.miarma.api.backlib.Constants.MMCUserRole;

26
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/enums/MinecraftModStatus.java Normal file
View File

@@ -0,0 +1,26 @@
package net.miarma.api.microservices.minecraft.enums;
import net.miarma.api.backlib.interfaces.IValuableEnum;
public enum MinecraftModStatus implements IValuableEnum {
ACTIVE(0),
INACTIVE(1);
private final int value;
MinecraftModStatus(int value) {
this.value = value;
}
@Override
public int getValue() {
return value;
}
public static MinecraftModStatus fromInt(int i) {
for (MinecraftModStatus status : values()) {
if (status.value == i) return status;
}
throw new IllegalArgumentException("Invalid MinecraftModStatus value: " + i);
}
}

27
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/enums/MinecraftUserRole.java Normal file
View File

@@ -0,0 +1,27 @@
package net.miarma.api.microservices.minecraft.enums;
import net.miarma.api.backlib.interfaces.IUserRole;
import net.miarma.api.backlib.interfaces.IValuableEnum;
public enum MinecraftUserRole implements IUserRole, IValuableEnum {
PLAYER(0),
ADMIN(1);
private final int value;
MinecraftUserRole(int value) {
this.value = value;
}
@Override
public int getValue() {
return value;
}
public static MinecraftUserRole fromInt(int i) {
for (MinecraftUserRole role : values()) {
if (role.value == i) return role;
}
throw new IllegalArgumentException("Invalid MinecraftUserRole value: " + i);
}
}

8
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/handlers/ModDataHandler.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/handlers/ModDataHandler.java
View File

@@ -1,13 +1,13 @@
package net.miarma.api.microservices.miarmacraft.handlers;
package net.miarma.api.microservices.minecraft.handlers;
import io.vertx.ext.web.RoutingContext;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.ConfigManager;
import net.miarma.api.backlib.Constants;
import net.miarma.api.backlib.config.ConfigManager;
import net.miarma.api.backlib.http.ApiStatus;
import net.miarma.api.microservices.miarmacraft.entities.ModEntity;
import net.miarma.api.microservices.miarmacraft.services.ModService;
import net.miarma.api.backlib.util.JsonUtil;
import net.miarma.api.microservices.minecraft.entities.ModEntity;
import net.miarma.api.microservices.minecraft.services.ModService;
import java.nio.file.Files;
import java.nio.file.Path;

5
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/handlers/ModLogicHandler.java Normal file
View File

@@ -0,0 +1,5 @@
package net.miarma.api.microservices.minecraft.handlers;
public class ModLogicHandler {
}

6
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/handlers/PlayerDataHandler.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/handlers/PlayerDataHandler.java
View File

@@ -1,12 +1,12 @@
package net.miarma.api.microservices.miarmacraft.handlers;
package net.miarma.api.microservices.minecraft.handlers;
import io.vertx.ext.web.RoutingContext;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.Constants;
import net.miarma.api.backlib.http.ApiStatus;
import net.miarma.api.microservices.miarmacraft.entities.PlayerEntity;
import net.miarma.api.microservices.miarmacraft.services.PlayerService;
import net.miarma.api.backlib.util.JsonUtil;
import net.miarma.api.microservices.minecraft.entities.PlayerEntity;
import net.miarma.api.microservices.minecraft.services.PlayerService;
public class PlayerDataHandler {
private final PlayerService playerService;

2
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/handlers/PlayerLogicHandler.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/handlers/PlayerLogicHandler.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.handlers;
package net.miarma.api.microservices.minecraft.handlers;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;

10
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/routing/MMCDataRouter.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/routing/MMCDataRouter.java
View File

@@ -1,14 +1,14 @@
package net.miarma.api.microservices.miarmacraft.routing;
package net.miarma.api.microservices.minecraft.routing;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.Constants.MMCUserRole;
import net.miarma.api.microservices.miarmacraft.handlers.ModDataHandler;
import net.miarma.api.microservices.miarmacraft.handlers.PlayerDataHandler;
import net.miarma.api.microservices.miarmacraft.routing.middlewares.MMCAuthGuard;
import net.miarma.api.microservices.miarmacraft.services.PlayerService;
import net.miarma.api.microservices.minecraft.handlers.ModDataHandler;
import net.miarma.api.microservices.minecraft.handlers.PlayerDataHandler;
import net.miarma.api.microservices.minecraft.routing.middlewares.MMCAuthGuard;
import net.miarma.api.microservices.minecraft.services.PlayerService;
public class MMCDataRouter {
public static void mount(Router router, Vertx vertx, Pool pool) {

2
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/routing/MMCEndpoints.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/routing/MMCEndpoints.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.routing;
package net.miarma.api.microservices.minecraft.routing;
import net.miarma.api.backlib.Constants;

8
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/routing/MMCLogicRouter.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/routing/MMCLogicRouter.java
View File

@@ -1,12 +1,12 @@
package net.miarma.api.microservices.miarmacraft.routing;
package net.miarma.api.microservices.minecraft.routing;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.sqlclient.Pool;
import net.miarma.api.microservices.miarmacraft.handlers.PlayerLogicHandler;
import net.miarma.api.microservices.miarmacraft.routing.middlewares.MMCAuthGuard;
import net.miarma.api.microservices.miarmacraft.services.PlayerService;
import net.miarma.api.microservices.minecraft.handlers.PlayerLogicHandler;
import net.miarma.api.microservices.minecraft.routing.middlewares.MMCAuthGuard;
import net.miarma.api.microservices.minecraft.services.PlayerService;
public class MMCLogicRouter {
public static void mount(Router router, Vertx vertx, Pool pool) {

6
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/routing/middlewares/MMCAuthGuard.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/routing/middlewares/MMCAuthGuard.java
View File

@@ -1,12 +1,12 @@
package net.miarma.api.microservices.miarmacraft.routing.middlewares;
package net.miarma.api.microservices.minecraft.routing.middlewares;
import java.util.function.Consumer;
import io.vertx.ext.web.RoutingContext;
import net.miarma.api.backlib.Constants.MMCUserRole;
import net.miarma.api.backlib.middlewares.AbstractAuthGuard;
import net.miarma.api.microservices.miarmacraft.entities.PlayerEntity;
import net.miarma.api.microservices.miarmacraft.services.PlayerService;
import net.miarma.api.microservices.minecraft.entities.PlayerEntity;
import net.miarma.api.microservices.minecraft.services.PlayerService;
public class MMCAuthGuard extends AbstractAuthGuard<PlayerEntity, MMCUserRole> {
private final PlayerService playerService;

8
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/services/ModService.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/services/ModService.java
View File

@@ -1,16 +1,16 @@
package net.miarma.api.microservices.miarmacraft.services;
package net.miarma.api.microservices.minecraft.services;
import com.eduardomcb.discord.webhook.WebhookClient;
import com.eduardomcb.discord.webhook.WebhookManager;
import com.eduardomcb.discord.webhook.models.Message;
import io.vertx.core.Future;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.ConfigManager;
import net.miarma.api.backlib.Constants;
import net.miarma.api.backlib.config.ConfigManager;
import net.miarma.api.backlib.exceptions.NotFoundException;
import net.miarma.api.backlib.http.QueryParams;
import net.miarma.api.microservices.miarmacraft.dao.ModDAO;
import net.miarma.api.microservices.miarmacraft.entities.ModEntity;
import net.miarma.api.microservices.minecraft.dao.ModDAO;
import net.miarma.api.microservices.minecraft.entities.ModEntity;
import java.util.List;

10
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/services/PlayerService.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/services/PlayerService.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.services;
package net.miarma.api.microservices.minecraft.services;
import io.vertx.core.Future;
import io.vertx.core.json.JsonObject;
@@ -13,13 +13,13 @@ import net.miarma.api.backlib.exceptions.NotFoundException;
import net.miarma.api.backlib.http.QueryParams;
import net.miarma.api.backlib.security.JWTManager;
import net.miarma.api.backlib.security.PasswordHasher;
import net.miarma.api.microservices.minecraft.dao.PlayerDAO;
import net.miarma.api.microservices.minecraft.dao.UserMetadataDAO;
import net.miarma.api.microservices.minecraft.entities.PlayerEntity;
import net.miarma.api.microservices.minecraft.entities.UserMetadataEntity;
import net.miarma.api.backlib.core.dao.UserDAO;
import net.miarma.api.backlib.core.entities.UserEntity;
import net.miarma.api.backlib.core.services.UserService;
import net.miarma.api.microservices.miarmacraft.dao.PlayerDAO;
import net.miarma.api.microservices.miarmacraft.dao.UserMetadataDAO;
import net.miarma.api.microservices.miarmacraft.entities.PlayerEntity;
import net.miarma.api.microservices.miarmacraft.entities.UserMetadataEntity;
import java.util.List;

8
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/verticles/MMCDataVerticle.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/verticles/MMCDataVerticle.java
View File

@@ -1,4 +1,4 @@
package net.miarma.api.microservices.miarmacraft.verticles;
package net.miarma.api.microservices.minecraft.verticles;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise;
@@ -6,15 +6,15 @@ import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.ConfigManager;
import net.miarma.api.backlib.Constants;
import net.miarma.api.backlib.Constants.MMCUserRole;
import net.miarma.api.backlib.Constants.MMCUserStatus;
import net.miarma.api.backlib.config.ConfigManager;
import net.miarma.api.backlib.db.DatabaseProvider;
import net.miarma.api.backlib.util.EventBusUtil;
import net.miarma.api.backlib.util.RouterUtil;
import net.miarma.api.microservices.miarmacraft.routing.MMCDataRouter;
import net.miarma.api.microservices.miarmacraft.services.PlayerService;
import net.miarma.api.microservices.minecraft.routing.MMCDataRouter;
import net.miarma.api.microservices.minecraft.services.PlayerService;
public class MMCDataVerticle extends AbstractVerticle {
private ConfigManager configManager;

6
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/verticles/MMCLogicVerticle.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/verticles/MMCLogicVerticle.java
View File

@@ -1,14 +1,14 @@
package net.miarma.api.microservices.miarmacraft.verticles;
package net.miarma.api.microservices.minecraft.verticles;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.sqlclient.Pool;
import net.miarma.api.backlib.ConfigManager;
import net.miarma.api.backlib.config.ConfigManager;
import net.miarma.api.backlib.db.DatabaseProvider;
import net.miarma.api.backlib.util.RouterUtil;
import net.miarma.api.microservices.miarmacraft.routing.MMCLogicRouter;
import net.miarma.api.microservices.minecraft.routing.MMCLogicRouter;
public class MMCLogicVerticle extends AbstractVerticle {
private ConfigManager configManager;

6
microservices/miarmacraft/src/main/java/net/miarma/api/microservices/miarmacraft/verticles/MMCMainVerticle.java → microservices/miarmacraft/src/main/java/net/miarma/api/microservices/minecraft/verticles/MMCMainVerticle.java
View File

@@ -1,10 +1,10 @@
package net.miarma.api.microservices.miarmacraft.verticles;
package net.miarma.api.microservices.minecraft.verticles;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise;
import net.miarma.api.backlib.ConfigManager;
import net.miarma.api.backlib.Constants;
import net.miarma.api.backlib.LogAccumulator;
import net.miarma.api.backlib.config.ConfigManager;
import net.miarma.api.backlib.log.LogAccumulator;
import net.miarma.api.backlib.util.DeploymentUtil;
public class MMCMainVerticle extends AbstractVerticle {